diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
| commit | 5ed28948a3ffe6c735386e59c132989869beaa3e (patch) | |
| tree | cbb940a4fa90b89abdd57d6b13d64351cfce839c /include/configs/k2hk_evm.h | |
| parent | e6607cffef965011ef0ddc0fbe6f4b7c0d53aeec (diff) | |
| parent | 83bad1026b9e3a4f6b7783cc1cbb434c1bbd3fa2 (diff) | |
| download | blackbird-obmc-uboot-5ed28948a3ffe6c735386e59c132989869beaa3e.tar.gz blackbird-obmc-uboot-5ed28948a3ffe6c735386e59c132989869beaa3e.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/k2hk_evm.h')
| -rw-r--r-- | include/configs/k2hk_evm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index dde73298fc..6ba7e62e55 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -71,7 +71,8 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_NS16550_REG_SIZE -4 -#define CONFIG_SYS_NS16550_COM1 K2HK_UART0_BASE +#define CONFIG_SYS_NS16550_COM1 KS2_UART0_BASE +#define CONFIG_SYS_NS16550_COM2 KS2_UART1_BASE #define CONFIG_SYS_NS16550_CLK clk_get_rate(K2HK_CLK1_6) #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 @@ -130,6 +131,7 @@ /* NAND Configuration */ #define CONFIG_NAND_DAVINCI +#define CONFIG_CMD_NAND_ECCLAYOUT #define CONFIG_SYS_NAND_CS 2 #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST |
