mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-17 15:27:00 +00:00
ARM: UniPhier: call pin_init() also in the normal boot
CONFIG_UNIPHIER_SERIAL has been moved to Kconfig and it is defined in ./.config but not in spl/.config, so pin_init() should be called from the normal image so that UART works correctly. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
parent
4f25481b83
commit
b67932e3e7
6 changed files with 16 additions and 9 deletions
|
@ -32,6 +32,10 @@ config CMD_PINMON
|
|||
The boot mode pins are latched when the system reset is deasserted
|
||||
and determine which device the system should load a boot image from.
|
||||
|
||||
config SOC_INIT
|
||||
bool
|
||||
default SPL_BUILD
|
||||
|
||||
config DRAM_INIT
|
||||
bool
|
||||
default SPL_BUILD
|
||||
|
|
|
@ -20,6 +20,7 @@ void clkrst_init(void);
|
|||
|
||||
int board_postclk_init(void)
|
||||
{
|
||||
#ifdef CONFIG_SOC_INIT
|
||||
bcu_init();
|
||||
|
||||
sbc_init();
|
||||
|
@ -37,7 +38,7 @@ int board_postclk_init(void)
|
|||
clkrst_init();
|
||||
|
||||
led_write(B, 2, , );
|
||||
|
||||
#endif
|
||||
pin_init();
|
||||
|
||||
led_write(B, 3, , );
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
|
||||
obj-y += platdevice.o
|
||||
obj-y += boot-mode.o
|
||||
obj-$(CONFIG_BOARD_POSTCLK_INIT) += bcu_init.o sbc_init.o sg_init.o \
|
||||
pll_init.o clkrst_init.o pinctrl.o
|
||||
obj-$(CONFIG_SOC_INIT) += bcu_init.o sbc_init.o sg_init.o pll_init.o \
|
||||
clkrst_init.o
|
||||
obj-$(CONFIG_BOARD_POSTCLK_INIT) += pinctrl.o
|
||||
obj-$(CONFIG_DRAM_INIT) += pll_spectrum.o umc_init.o
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
|
||||
obj-y += platdevice.o
|
||||
obj-y += boot-mode.o
|
||||
obj-$(CONFIG_BOARD_POSTCLK_INIT) += sbc_init.o sg_init.o \
|
||||
pll_init.o clkrst_init.o pinctrl.o
|
||||
obj-$(CONFIG_SOC_INIT) += sbc_init.o sg_init.o pll_init.o clkrst_init.o
|
||||
obj-$(CONFIG_BOARD_POSTCLK_INIT) += pinctrl.o
|
||||
obj-$(CONFIG_DRAM_INIT) += pll_spectrum.o umc_init.o
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
|
||||
obj-y += platdevice.o
|
||||
obj-y += boot-mode.o
|
||||
obj-$(CONFIG_BOARD_POSTCLK_INIT) += bcu_init.o sbc_init.o sg_init.o \
|
||||
pll_init.o clkrst_init.o pinctrl.o
|
||||
obj-$(CONFIG_SOC_INIT) += bcu_init.o sbc_init.o sg_init.o pll_init.o \
|
||||
clkrst_init.o
|
||||
obj-$(CONFIG_BOARD_POSTCLK_INIT) += pinctrl.o
|
||||
obj-$(CONFIG_DRAM_INIT) += pll_spectrum.o umc_init.o
|
||||
|
|
|
@ -248,9 +248,9 @@ are defined. Select only one of them."
|
|||
|
||||
#define CONFIG_SYS_TEXT_BASE 0x84000000
|
||||
|
||||
#if defined(CONFIG_SPL_BUILD)
|
||||
#define CONFIG_BOARD_POSTCLK_INIT
|
||||
#else
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_SKIP_LOWLEVEL_INIT
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue