LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: UniPhier: enable Driver Model and UART on SPL 

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>
This commit is contained in:
Masahiro Yamada 2015-03-23 00:07:25 +09:00
parent a286039b13
commit 499785b970
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-uniphier/spl.c
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2013-2015 Panasonic Corporation * 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+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -52,6 +53,12 @@ void spl_board_init(void)
led_write(L, 3, , ); led_write(L, 3, , );
#ifdef CONFIG_SPL_SERIAL_SUPPORT
preloader_console_init();
#endif
led_write(L, 4, , );
{ {
int res; int res;
@ -61,9 +68,9 @@ void spl_board_init(void)
; ;
} }
} }
led_write(L, 4, , ); led_write(L, 5, , );
enable_dpll_ssc(); enable_dpll_ssc();
led_write(L, 5, , ); led_write(L, 6, , );
} }

1
configs/ph1_ld4_defconfig
View File

@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_MACH_PH1_LD4=y CONFIG_MACH_PH1_LD4=y
CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_PFC_MICRO_SUPPORT_CARD=y

1
configs/ph1_pro4_defconfig
View File

@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_MACH_PH1_PRO4=y CONFIG_MACH_PH1_PRO4=y
CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_PFC_MICRO_SUPPORT_CARD=y

1
configs/ph1_sld8_defconfig
View File

@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_MACH_PH1_SLD8=y CONFIG_MACH_PH1_SLD8=y
CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_PFC_MICRO_SUPPORT_CARD=y

4
include/configs/uniphier.h
View File

@ -280,9 +280,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#endif #endif
#define CONFIG_SYS_SPL_MALLOC_START (0x0ff00000)
#define CONFIG_SYS_SPL_MALLOC_SIZE (0x00004000)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_INIT_SP_ADDR (0x0ff08000) #define CONFIG_SYS_INIT_SP_ADDR (0x0ff08000)
#else #else
@ -292,6 +289,7 @@
#define CONFIG_PANIC_HANG #define CONFIG_PANIC_HANG
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_LIBCOMMON_SUPPORT /* for mem_malloc_init */ #define CONFIG_SPL_LIBCOMMON_SUPPORT /* for mem_malloc_init */