ARM: uniphier: merge board init functions into board_init()
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 13 Sep 2016 16:06:08 +0000 (01:06 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Wed, 14 Sep 2016 13:54:20 +0000 (22:54 +0900)
commitb291671232a28220b74fa49c744e209f67c234ef
tree16ffdc0ab997e989daf9d0bf8635e6afd489c5d1
parent43a8cc905d575aadec48248de32828975882b43d
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>
arch/arm/mach-uniphier/Makefile
arch/arm/mach-uniphier/board_common.c [deleted file]
arch/arm/mach-uniphier/board_early_init_r.c [deleted file]
arch/arm/mach-uniphier/board_init.c [moved from arch/arm/mach-uniphier/board_early_init_f.c with 88% similarity]
arch/arm/mach-uniphier/init.h
include/configs/uniphier.h