Commit 323d1f9d5bebfe55e97e23c8094055685665afef
1 parent
5451b777de
Exists in
v2017.01-smarct4x
and in
30 other branches
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>
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 109 changed files with 3116 additions and 2524 deletions Side-by-side Diff
- arch/arm/mach-uniphier/Kconfig
- arch/arm/mach-uniphier/Makefile
- arch/arm/mach-uniphier/bcu/Makefile
- arch/arm/mach-uniphier/bcu/bcu-ph1-ld4.c
- arch/arm/mach-uniphier/bcu/bcu-ph1-sld3.c
- arch/arm/mach-uniphier/board_early_init_f.c
- arch/arm/mach-uniphier/boards.c
- arch/arm/mach-uniphier/boot-mode/Makefile
- arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c
- arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c
- arch/arm/mach-uniphier/boot-mode/boot-mode.c
- arch/arm/mach-uniphier/clk/Makefile
- arch/arm/mach-uniphier/clk/clk-ph1-ld4.c
- arch/arm/mach-uniphier/clk/clk-ph1-pro4.c
- arch/arm/mach-uniphier/cmd_pinmon.c
- arch/arm/mach-uniphier/ddrphy/Makefile
- arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-ld4.c
- arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-pro4.c
- arch/arm/mach-uniphier/ddrphy/ddrphy-ph1-sld8.c
- arch/arm/mach-uniphier/ddrphy/ddrphy-training.c
- arch/arm/mach-uniphier/ddrphy_training.c
- arch/arm/mach-uniphier/early-clk/Makefile
- arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c
- arch/arm/mach-uniphier/early-pinctrl/Makefile
- arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c
- 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
- arch/arm/mach-uniphier/include/mach/sg-regs.h
- arch/arm/mach-uniphier/include/mach/soc_info.h
- arch/arm/mach-uniphier/init/Makefile
- arch/arm/mach-uniphier/init/init-ph1-ld4.c
- arch/arm/mach-uniphier/init/init-ph1-pro4.c
- arch/arm/mach-uniphier/init/init-ph1-sld3.c
- arch/arm/mach-uniphier/init/init-ph1-sld8.c
- arch/arm/mach-uniphier/init/init.c
- arch/arm/mach-uniphier/memconf.c
- arch/arm/mach-uniphier/memconf/Makefile
- arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
- arch/arm/mach-uniphier/memconf/memconf.c
- arch/arm/mach-uniphier/ph1-ld4/Makefile
- arch/arm/mach-uniphier/ph1-ld4/bcu_init.c
- arch/arm/mach-uniphier/ph1-ld4/boot-mode.c
- arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
- arch/arm/mach-uniphier/ph1-ld4/ddrphy_init.c
- arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c
- arch/arm/mach-uniphier/ph1-ld4/pinctrl.c
- arch/arm/mach-uniphier/ph1-ld4/pll_init.c
- arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c
- arch/arm/mach-uniphier/ph1-ld4/sbc_init.c
- arch/arm/mach-uniphier/ph1-ld4/umc_init.c
- arch/arm/mach-uniphier/ph1-pro4/Makefile
- arch/arm/mach-uniphier/ph1-pro4/boot-mode.c
- arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
- arch/arm/mach-uniphier/ph1-pro4/ddrphy_init.c
- arch/arm/mach-uniphier/ph1-pro4/early_clkrst_init.c
- arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
- arch/arm/mach-uniphier/ph1-pro4/pll_init.c
- arch/arm/mach-uniphier/ph1-pro4/pll_spectrum.c
- arch/arm/mach-uniphier/ph1-pro4/sbc_init.c
- arch/arm/mach-uniphier/ph1-pro4/umc_init.c
- arch/arm/mach-uniphier/ph1-sld3/Makefile
- arch/arm/mach-uniphier/ph1-sld3/bcu_init.c
- arch/arm/mach-uniphier/ph1-sld3/boot-mode.c
- arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c
- arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c
- arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c
- arch/arm/mach-uniphier/ph1-sld3/memconf.c
- arch/arm/mach-uniphier/ph1-sld3/pinctrl.c
- arch/arm/mach-uniphier/ph1-sld3/pll_init.c
- arch/arm/mach-uniphier/ph1-sld3/pll_spectrum.c
- arch/arm/mach-uniphier/ph1-sld3/sbc_init.c
- arch/arm/mach-uniphier/ph1-sld3/sg_init.c
- arch/arm/mach-uniphier/ph1-sld3/umc_init.c
- arch/arm/mach-uniphier/ph1-sld8/Makefile
- arch/arm/mach-uniphier/ph1-sld8/bcu_init.c
- arch/arm/mach-uniphier/ph1-sld8/boot-mode.c
- arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c
- arch/arm/mach-uniphier/ph1-sld8/ddrphy_init.c
- arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c
- arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
- arch/arm/mach-uniphier/ph1-sld8/pll_init.c
- arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c
- arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
- arch/arm/mach-uniphier/ph1-sld8/umc_init.c
- arch/arm/mach-uniphier/pinctrl/Makefile
- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c
- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
- arch/arm/mach-uniphier/pll/Makefile
- arch/arm/mach-uniphier/pll/pll-init-ph1-ld4.c
- arch/arm/mach-uniphier/pll/pll-init-ph1-pro4.c
- arch/arm/mach-uniphier/pll/pll-init-ph1-sld3.c
- arch/arm/mach-uniphier/pll/pll-init-ph1-sld8.c
- arch/arm/mach-uniphier/pll/pll-spectrum-ph1-ld4.c
- arch/arm/mach-uniphier/pll/pll-spectrum-ph1-sld3.c
- arch/arm/mach-uniphier/sbc/Makefile
- arch/arm/mach-uniphier/sbc/sbc-ph1-ld4.c
- arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c
- arch/arm/mach-uniphier/sbc/sbc-ph1-sld3.c
- arch/arm/mach-uniphier/soc_info.c
- arch/arm/mach-uniphier/spl.c
- arch/arm/mach-uniphier/umc/Makefile
- arch/arm/mach-uniphier/umc/umc-ph1-ld4.c
- arch/arm/mach-uniphier/umc/umc-ph1-pro4.c
- arch/arm/mach-uniphier/umc/umc-ph1-sld8.c
- configs/ph1_pro4_defconfig
- include/configs/uniphier.h