summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-01-15 14:59:10 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-01-18 01:22:30 +0900
commit26b09c022ab6304deb8e8316bcb6dd8d5b5d40f0 (patch)
tree43f78b4dc85f4803d4b4f5ec0d77ac1aa89c404e /arch/arm/mach-uniphier/Makefile
parenta8e6300d483d85f9eff211220db582cf6a403c0b (diff)
downloadu-boot-imx-26b09c022ab6304deb8e8316bcb6dd8d5b5d40f0.zip
u-boot-imx-26b09c022ab6304deb8e8316bcb6dd8d5b5d40f0.tar.gz
u-boot-imx-26b09c022ab6304deb8e8316bcb6dd8d5b5d40f0.tar.bz2
ARM: uniphier: move SBC and Support Card init code to U-Boot proper
Initialize SBC and Support Card in U-Boot proper instead of SPL. We may run different firmware (ex. ARM Trusted Firmware) before U-Boot, and basic SoC initialization may be done there. In that case, SPL may not be used. The motivation for preparing SBC and Support Card in SPL was to use LED for early debugging, but this is not mandatory to boot SoCs. With this commit, LED will be unavailable in SPL, but we can use a debug serial instead. So, this change will not be a big deal. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/Makefile')
-rw-r--r--arch/arm/mach-uniphier/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index 7f1abd0..ab2c6dc 100644
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -7,7 +7,6 @@ ifdef CONFIG_SPL_BUILD
obj-y += spl_board_init.o
obj-y += memconf.o
obj-y += bcu/
-obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
else
@@ -17,6 +16,9 @@ obj-y += board_init.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-y += reset.o
+obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o
+obj-y += pinctrl-glue.o
+
endif
obj-y += boards.o
@@ -24,9 +26,7 @@ obj-y += soc_info.o
obj-y += boot-mode/
obj-y += clk/
obj-y += dram/
-obj-y += pinctrl-glue.o
-obj-$(CONFIG_MICRO_SUPPORT_CARD) += micro-support-card.o
obj-$(CONFIG_DEBUG_UART_UNIPHIER) += debug-uart/
obj-$(CONFIG_CPU_V7) += arm32/