Enable CONFIG_SPL_DM and CONFIG_SPL_SERIAL_SUPPORT, which provide Driver Model UART support on SPL.
CONFIG_SYS_SPL_MALLOC_{START,SIZE} should be dropped because simple malloc is preferred on SPL. Dlmalloc requires some static variables on .data section that is not available yet for NOR boot mode etc.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/spl.c | 13 ++++++++++--- configs/ph1_ld4_defconfig | 1 + configs/ph1_pro4_defconfig | 1 + configs/ph1_sld8_defconfig | 1 + include/configs/uniphier.h | 4 +--- 5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c index a0d0f04..a34d3a1 100644 --- a/arch/arm/mach-uniphier/spl.c +++ b/arch/arm/mach-uniphier/spl.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2013-2015 Panasonic Corporation - * Author: Masahiro Yamada yamada.m@jp.panasonic.com + * Copyright (C) 2015 Socionext Inc. + * Author: Masahiro Yamada yamada.masahiro@socionext.com * * SPDX-License-Identifier: GPL-2.0+ */ @@ -52,6 +53,12 @@ void spl_board_init(void)
led_write(L, 3, , );
+#ifdef CONFIG_SPL_SERIAL_SUPPORT + preloader_console_init(); +#endif + + led_write(L, 4, , ); + { int res;
@@ -61,9 +68,9 @@ void spl_board_init(void) ; } } - led_write(L, 4, , ); + led_write(L, 5, , );
enable_dpll_ssc();
- led_write(L, 5, , ); + led_write(L, 6, , ); } diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index 292f2ca..aa1805b 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_DM=y CONFIG_DM_SERIAL=y +CONFIG_SPL_DM=y CONFIG_DM_I2C=y CONFIG_MACH_PH1_LD4=y CONFIG_PFC_MICRO_SUPPORT_CARD=y diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index 2021862..194f7a5 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_DM=y CONFIG_DM_SERIAL=y +CONFIG_SPL_DM=y CONFIG_DM_I2C=y CONFIG_MACH_PH1_PRO4=y CONFIG_PFC_MICRO_SUPPORT_CARD=y diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index cf229ae..e7e7fff 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_DM=y CONFIG_DM_SERIAL=y +CONFIG_SPL_DM=y CONFIG_DM_I2C=y CONFIG_MACH_PH1_SLD8=y CONFIG_PFC_MICRO_SUPPORT_CARD=y diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 58608ca..c27010a 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -280,9 +280,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif
-#define CONFIG_SYS_SPL_MALLOC_START (0x0ff00000) -#define CONFIG_SYS_SPL_MALLOC_SIZE (0x00004000) - #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_INIT_SP_ADDR (0x0ff08000) #else @@ -292,6 +289,7 @@ #define CONFIG_PANIC_HANG
#define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_LIBCOMMON_SUPPORT /* for mem_malloc_init */