summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-09-14 01:06:08 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-09-14 22:54:20 +0900
commitb291671232a28220b74fa49c744e209f67c234ef (patch)
tree16ffdc0ab997e989daf9d0bf8635e6afd489c5d1 /arch/arm/mach-uniphier/Makefile
parent43a8cc905d575aadec48248de32828975882b43d (diff)
ARM: uniphier: merge board init functions into board_init()
Currently, the UniPhier platform calls several init functions in the following order: [1] spl_board_init() [2] board_early_init_f() [3] board_init() [4] board_early_init_r() [5] board_late_init() The serial console is not ready at the point of [2], so we want to avoid using [2] from the view point of debuggability. Fortunately, all of the initialization in [2] can be delayed until [3]. I see no good reason to split into [3] and [4]. So, merge [2] through [4]. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/Makefile')
-rw-r--r--arch/arm/mach-uniphier/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index 2e92e15581..1fe5199a3a 100644
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -9,11 +9,9 @@ obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
else
-obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
obj-y += dram_init.o
-obj-y += board_common.o
-obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o
+obj-y += board_init.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-y += reset.o