]> git.dujemihanovic.xyz Git - u-boot.git/commit
ARM: uniphier: allow to enable multiple SoCs
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 21 Sep 2015 15:27:39 +0000 (00:27 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 24 Sep 2015 15:58:38 +0000 (00:58 +0900)
commit323d1f9d5bebfe55e97e23c8094055685665afef
tree4fe6b5ffd3aab68a945de9750d145514271d2321
parent5451b777de392043c03626f6cbbc3940c49c3417
ARM: uniphier: allow to enable multiple SoCs

Before this commit, the Kconfig menu in mach-uniphier only allowed us
to choose one SoC to be compiled.  Each SoC has its own defconfig file
for the build-test coverage.  Consequently, some defconfig files are
duplicated with only the difference in CONFIG_DEFAULT_DEVICE_TREE and
CONFIG_{SOC_NAME}=y.

Now, most of board-specific parameters have been moved to device trees,
so it makes sense to include init code of multiple SoCs into a single
image as long as the SoCs have similar architecture.  In fact, some
SoCs of UniPhier family are very similar:
 - PH1-LD4 and PH1-sLD8
 - PH1-LD6b and ProXstream2 (will be added in the upcoming commit)

This commit will be helpful to merge some defconfig files for better
maintainability.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
80 files changed:
arch/arm/mach-uniphier/Kconfig
arch/arm/mach-uniphier/Makefile
arch/arm/mach-uniphier/bcu/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/bcu/bcu-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/bcu_init.c with 84% similarity]
arch/arm/mach-uniphier/bcu/bcu-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/bcu_init.c with 84% similarity]
arch/arm/mach-uniphier/board_early_init_f.c
arch/arm/mach-uniphier/boards.c [new file with mode: 0644]
arch/arm/mach-uniphier/boot-mode/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-pro4/boot-mode.c with 88% similarity]
arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/boot-mode.c with 89% similarity]
arch/arm/mach-uniphier/boot-mode/boot-mode.c [new file with mode: 0644]
arch/arm/mach-uniphier/clk/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/clk/clk-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c with 94% similarity]
arch/arm/mach-uniphier/clk/clk-ph1-pro4.c [moved from arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c with 96% similarity]
arch/arm/mach-uniphier/cmd_pinmon.c
arch/arm/mach-uniphier/ddrphy/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/ddrphy_init.c with 95% similarity]
arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-pro4.c [moved from arch/arm/mach-uniphier/ph1-pro4/ddrphy_init.c with 95% similarity]
arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-sld8.c [moved from arch/arm/mach-uniphier/ph1-sld8/ddrphy_init.c with 95% similarity]
arch/arm/mach-uniphier/ddrphy/ddrphy-training.c [moved from arch/arm/mach-uniphier/ddrphy_training.c with 100% similarity]
arch/arm/mach-uniphier/early-clk/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-pro4/early_clkrst_init.c with 86% similarity]
arch/arm/mach-uniphier/early-pinctrl/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c with 82% similarity]
arch/arm/mach-uniphier/include/mach/boot-device.h
arch/arm/mach-uniphier/include/mach/ddrphy-regs.h
arch/arm/mach-uniphier/include/mach/init.h [new file with mode: 0644]
arch/arm/mach-uniphier/include/mach/sg-regs.h
arch/arm/mach-uniphier/include/mach/soc_info.h [new file with mode: 0644]
arch/arm/mach-uniphier/init/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/init/init-ph1-ld4.c [moved from arch/arm/mach-uniphier/spl.c with 50% similarity]
arch/arm/mach-uniphier/init/init-ph1-pro4.c [new file with mode: 0644]
arch/arm/mach-uniphier/init/init-ph1-sld3.c [new file with mode: 0644]
arch/arm/mach-uniphier/init/init-ph1-sld8.c [new file with mode: 0644]
arch/arm/mach-uniphier/init/init.c [new file with mode: 0644]
arch/arm/mach-uniphier/memconf.c [deleted file]
arch/arm/mach-uniphier/memconf/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c [new file with mode: 0644]
arch/arm/mach-uniphier/memconf/memconf.c [new file with mode: 0644]
arch/arm/mach-uniphier/ph1-ld4/Makefile [deleted file]
arch/arm/mach-uniphier/ph1-ld4/boot-mode.c [deleted file]
arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c [deleted file]
arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c [deleted file]
arch/arm/mach-uniphier/ph1-pro4/Makefile [deleted file]
arch/arm/mach-uniphier/ph1-sld3/Makefile [deleted file]
arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld3/memconf.c [deleted file]
arch/arm/mach-uniphier/ph1-sld3/sg_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld3/umc_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/Makefile [deleted file]
arch/arm/mach-uniphier/ph1-sld8/bcu_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/boot-mode.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/sbc_init.c [deleted file]
arch/arm/mach-uniphier/pinctrl/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/pinctrl.c with 97% similarity]
arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c [moved from arch/arm/mach-uniphier/ph1-pro4/pinctrl.c with 97% similarity]
arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/pinctrl.c with 91% similarity]
arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c [moved from arch/arm/mach-uniphier/ph1-sld8/pinctrl.c with 96% similarity]
arch/arm/mach-uniphier/pll/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/pll/pll-init-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/pll_init.c with 90% similarity]
arch/arm/mach-uniphier/pll/pll-init-ph1-pro4.c [moved from arch/arm/mach-uniphier/ph1-pro4/pll_init.c with 88% similarity]
arch/arm/mach-uniphier/pll/pll-init-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/pll_init.c with 62% similarity]
arch/arm/mach-uniphier/pll/pll-init-ph1-sld8.c [moved from arch/arm/mach-uniphier/ph1-sld8/pll_init.c with 97% similarity]
arch/arm/mach-uniphier/pll/pll-spectrum-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-pro4/pll_spectrum.c with 72% similarity]
arch/arm/mach-uniphier/pll/pll-spectrum-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/pll_spectrum.c with 73% similarity]
arch/arm/mach-uniphier/sbc/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/sbc/sbc-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/sbc_init.c with 92% similarity]
arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c [moved from arch/arm/mach-uniphier/ph1-pro4/sbc_init.c with 91% similarity]
arch/arm/mach-uniphier/sbc/sbc-ph1-sld3.c [moved from arch/arm/mach-uniphier/ph1-sld3/sbc_init.c with 92% similarity]
arch/arm/mach-uniphier/soc_info.c [new file with mode: 0644]
arch/arm/mach-uniphier/umc/Makefile [new file with mode: 0644]
arch/arm/mach-uniphier/umc/umc-ph1-ld4.c [moved from arch/arm/mach-uniphier/ph1-ld4/umc_init.c with 88% similarity]
arch/arm/mach-uniphier/umc/umc-ph1-pro4.c [moved from arch/arm/mach-uniphier/ph1-pro4/umc_init.c with 85% similarity]
arch/arm/mach-uniphier/umc/umc-ph1-sld8.c [moved from arch/arm/mach-uniphier/ph1-sld8/umc_init.c with 87% similarity]
configs/ph1_pro4_defconfig
include/configs/uniphier.h