diff options
author | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
commit | 84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 (patch) | |
tree | 3b2bf1b3689e9aad0d20f5a69ada168cae3cc769 /include/configs/uniphier-common.h | |
parent | c69ecd9722af22d50295eff81d0b9cd5b8adc2e0 (diff) | |
parent | c2ded962d4703a3f9522553004db4a6fe540f7e6 (diff) | |
download | blackbird-obmc-uboot-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.gz blackbird-obmc-uboot-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.zip |
Merge git://git.denx.de/u-boot-dm
Fix a trivial conflict over adding <dm.h>
Conflicts:
arch/arm/cpu/armv7/omap3/board.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/uniphier-common.h')
-rw-r--r-- | include/configs/uniphier-common.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h index 18fe277cad..b18ae6dfae 100644 --- a/include/configs/uniphier-common.h +++ b/include/configs/uniphier-common.h @@ -33,18 +33,17 @@ are defined. Select only one of them." # define CONFIG_SUPPORT_CARD_UART_BASE (CONFIG_SUPPORT_CARD_BASE + 0x00200000) #endif +#ifdef CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_COM1 CONFIG_SUPPORT_CARD_UART_BASE #define CONFIG_SYS_NS16550_CLK 12288000 #define CONFIG_SYS_NS16550_REG_SIZE -2 +#endif #define CONFIG_SMC911X_BASE CONFIG_SUPPORT_CARD_ETHER_BASE #define CONFIG_SMC911X_32_BIT -#define CONFIG_SYS_UNIPHIER_SERIAL_BASE0 0x54006800 -#define CONFIG_SYS_UNIPHIER_SERIAL_BASE1 0x54006900 -#define CONFIG_SYS_UNIPHIER_SERIAL_BASE2 0x54006a00 -#define CONFIG_SYS_UNIPHIER_SERIAL_BASE3 0x54006b00 +#define CONFIG_SYS_MALLOC_F_LEN 0x7000 /*----------------------------------------------------------------------- * MMU and Cache Setting |