This commit allows to build Panasonic UniPhier family: PH1-LD4, PH1-Pro4, PH1-sLD8
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
Changes in v5: - Add Denali config options to defconfigs
Changes in v4: None Changes in v3: - Rebase on the current u-boot/master
Changes in v2: - Rebase on the current u-boot/master
arch/arm/Kconfig | 5 +++++ arch/arm/cpu/armv7/uniphier/Kconfig | 32 ++++++++++++++++++++++++++++++++ configs/ph1_ld4_defconfig | 8 ++++++++ configs/ph1_pro4_defconfig | 8 ++++++++ configs/ph1_sld8_defconfig | 8 ++++++++ 5 files changed, 61 insertions(+) create mode 100644 arch/arm/cpu/armv7/uniphier/Kconfig create mode 100644 configs/ph1_ld4_defconfig create mode 100644 configs/ph1_pro4_defconfig create mode 100644 configs/ph1_sld8_defconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3efede2..43ba33a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -521,6 +521,9 @@ config TARGET_COLIBRI_PXA270 config TARGET_JORNADA bool "Support jornada"
+config ARCH_UNIPHIER + bool "Panasonic UniPhier platform" + endchoice
source "arch/arm/cpu/armv8/Kconfig" @@ -549,6 +552,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/tegra-common/Kconfig"
+source "arch/arm/cpu/armv7/uniphier/Kconfig" + source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
source "arch/arm/cpu/armv7/zynq/Kconfig" diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig new file mode 100644 index 0000000..34f5496 --- /dev/null +++ b/arch/arm/cpu/armv7/uniphier/Kconfig @@ -0,0 +1,32 @@ +menu "Panasonic UniPhier platform" + depends on ARCH_UNIPHIER + +config SYS_CPU + string + default "armv7" + +config SYS_SOC + string + default "uniphier" + +config SYS_CONFIG_NAME + string + default "ph1_pro4" if MACH_PH1_PRO4 + default "ph1_ld4" if MACH_PH1_LD4 + default "ph1_sld8" if MACH_PH1_SLD8 + +choice + prompt "UniPhier SoC select" + +config MACH_PH1_PRO4 + bool "PH1-Pro4" + +config MACH_PH1_LD4 + bool "PH1-LD4" + +config MACH_PH1_SLD8 + bool "PH1-sLD8" + +endchoice + +endmenu diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig new file mode 100644 index 0000000..53f3126 --- /dev/null +++ b/configs/ph1_ld4_defconfig @@ -0,0 +1,8 @@ +CONFIG_SPL=y ++S:CONFIG_ARM=y ++S:CONFIG_ARCH_UNIPHIER=y ++S:CONFIG_MACH_PH1_LD4=y +CONFIG_NAND_DENALI=y +CONFIG_SYS_NAND_DENALI_64BIT=y +CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 +S:CONFIG_SPL_NAND_DENALI=y diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig new file mode 100644 index 0000000..209466e --- /dev/null +++ b/configs/ph1_pro4_defconfig @@ -0,0 +1,8 @@ +CONFIG_SPL=y ++S:CONFIG_ARM=y ++S:CONFIG_ARCH_UNIPHIER=y ++S:CONFIG_MACH_PH1_PRO4=y +CONFIG_NAND_DENALI=y +CONFIG_SYS_NAND_DENALI_64BIT=y +CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 +S:CONFIG_SPL_NAND_DENALI=y diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig new file mode 100644 index 0000000..658977b --- /dev/null +++ b/configs/ph1_sld8_defconfig @@ -0,0 +1,8 @@ +CONFIG_SPL=y ++S:CONFIG_ARM=y ++S:CONFIG_ARCH_UNIPHIER=y ++S:CONFIG_MACH_PH1_SLD8=y +CONFIG_NAND_DENALI=y +CONFIG_SYS_NAND_DENALI_64BIT=y +CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 +S:CONFIG_SPL_NAND_DENALI=y