diff options
author | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
commit | 41341221d12341a2ecfb280142d6478071738fc2 (patch) | |
tree | 850a87b274b572b65a579474a0aad5e590ca6d61 /include/configs/omap5_uevm.h | |
parent | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 (diff) | |
parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR
Conflicts:
arch/arm/include/asm/arch-omap5/omap.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/omap5_uevm.h')
-rw-r--r-- | include/configs/omap5_uevm.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 9e0339b31b..dea05bc911 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -35,10 +35,9 @@ #include <configs/omap5_common.h> -/* TWL6035 */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_PALMAS_POWER -#endif +#define CONFIG_CONS_INDEX 3 +#define CONFIG_SYS_NS16550_COM3 UART3_BASE +#define CONFIG_BAUDRATE 115200 /* MMC ENV related defines */ #define CONFIG_ENV_IS_IN_MMC |