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>

diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 011c6d9f2d6d561b86308a2d1bae757ec17e5273..36b7f11fbeb7fb28db48ed8257d05b1294115843 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -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

diff --git a/arch/arm/cpu/armv7/uniphier/board_postclk_init.c b/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
index 3db336fc3e12cae5a6397c1a1ee8491ec44a81c6..89e44bb95be9e04cf436fe8fb6ff9f73714238b9 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
+++ b/arch/arm/cpu/armv7/uniphier/board_postclk_init.c
@@ -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, , );

diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile
index 4f42aec49a2411f1992a06e96abd36c09dd72786..fba1cc7498c2ecaefef564f389798ad0e4ddf9e9 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile
+++ b/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile
@@ -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

diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile
index 527fd36e0a3f43ef4d91c493692989ccc8ab4033..74129bc86ad2d8452426579deb15f565dd760174 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile
+++ b/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile
@@ -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

diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile
index 4f42aec49a2411f1992a06e96abd36c09dd72786..fba1cc7498c2ecaefef564f389798ad0e4ddf9e9 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile
+++ b/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile
@@ -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

diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h
index 45becc1795312ab204cb0a138af023905dbdd931..7c4dba0387e126f72f7de1d49ebb4829fe2560ad 100644 (file)
--- a/include/configs/uniphier-common.h
+++ b/include/configs/uniphier-common.h
@@ -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