[U-Boot] [PATCH 1/3] ti_omap4_common.h: Switch to CONFIG_OMAP_SERIAL for non-SPL DM_SERIAL
Tested on Pandaboard Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/ti_omap4_common.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 1cd7dae..741f71f 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -58,11 +58,15 @@ * Hardware drivers */ #define CONFIG_SYS_NS16550 +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE +#else +#define CONFIG_OMAP_SERIAL +#endif +#define CONFIG_CONS_INDEX 3
/* TWL6030 */ #ifndef CONFIG_SPL_BUILD
Tested on J6Eco EVM Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/ti_omap5_common.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 189ea7e..9fc33aa 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -51,9 +51,13 @@ * Hardware drivers */ #define CONFIG_SYS_NS16550 +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK 48000000 +#else +#define CONFIG_OMAP_SERIAL +#endif
/* * Environment setup
On Thu, Sep 17, 2015 at 04:47:04PM -0400, Tom Rini wrote:
Tested on J6Eco EVM Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Tested on J6Eco EVM. Signed-off-by: Tom Rini trini@konsulko.com --- configs/dra72_evm_defconfig | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 3205e72..dbf65d0 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_DRA7XX_EVM=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="dra72-evm" CONFIG_SPL=y CONFIG_SPL_STACK_R=y @@ -14,4 +15,5 @@ CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y +CONFIG_DM_SERIAL=y CONFIG_DM_GPIO=y
On Friday 18 September 2015 02:17 AM, Tom Rini wrote:
Tested on J6Eco EVM. Signed-off-by: Tom Rini trini@konsulko.com
Tried on my DRA72-evm.
Tested-by: Lokesh Vutla lokeshvutla@ti.com
Thanks and regards, Lokesh
configs/dra72_evm_defconfig | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 3205e72..dbf65d0 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_DRA7XX_EVM=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="dra72-evm" CONFIG_SPL=y CONFIG_SPL_STACK_R=y @@ -14,4 +15,5 @@ CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y +CONFIG_DM_SERIAL=y CONFIG_DM_GPIO=y
On Thu, Sep 17, 2015 at 04:47:05PM -0400, Tom Rini wrote:
Tested on J6Eco EVM. Signed-off-by: Tom Rini trini@konsulko.com Tested-by: Lokesh Vutla lokeshvutla@ti.com
Applied to u-boot/master, thanks!
On Thu, Sep 17, 2015 at 04:47:03PM -0400, Tom Rini wrote:
Tested on Pandaboard Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Lokesh Vutla -
Tom Rini