ARM64: zynqmp: Select SYS_CONFIG_NAME via Kconfig

This option enable adding new platform suport just by adding defconfig
and DTS file which will target generic configuration for SoC.
Make no sense to extend Kconfig just create a pointer between DTS and
configuration file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 95323e22def57af4ff55634afc28e21d6b76b207..f8f7b85d38de751e4399aef5a0e0abec42b9b965 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -1,28 +1,5 @@
 if ARCH_ZYNQMP
 
-choice
-       prompt "Xilinx ZynqMP board select"
-
-config TARGET_ZYNQMP_EP
-       bool "ZynqMP EP Board"
-
-config TARGET_ZYNQMP_MINI
-       bool "ZynqMP MINI"
-
-config TARGET_ZYNQMP_ZCU102
-       bool "ZynqMP ZCU102"
-
-config TARGET_ZYNQMP_ZC1751_XM015_DC1
-       bool "ZynqMP ZC1751 XM015 DC1"
-
-config TARGET_ZYNQMP_ZC1751_XM016_DC2
-       bool "ZynqMP ZC1751 XM016 DC2"
-
-config TARGET_ZYNQMP_ZC1751_XM019_DC5
-       bool "ZynqMP ZC1751 XM019 DC5"
-
-endchoice
-
 config SYS_BOARD
        default "zynqmp"
 
@@ -33,12 +10,12 @@ config SYS_SOC
        default "zynqmp"
 
 config SYS_CONFIG_NAME
-       default "xilinx_zynqmp_ep" if TARGET_ZYNQMP_EP
-       default "xilinx_zynqmp_mini" if TARGET_ZYNQMP_MINI
-       default "xilinx_zynqmp_zcu102" if TARGET_ZYNQMP_ZCU102
-       default "xilinx_zynqmp_zc1751_xm015_dc1" if TARGET_ZYNQMP_ZC1751_XM015_DC1
-       default "xilinx_zynqmp_zc1751_xm016_dc2" if TARGET_ZYNQMP_ZC1751_XM016_DC2
-       default "xilinx_zynqmp_zc1751_xm019_dc5" if TARGET_ZYNQMP_ZC1751_XM019_DC5
+       string "Board configuration name"
+       default "xilinx_zynqmp"
+       help
+         This option contains information about board configuration name.
+         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
+         will be used for board configuration.
 
 config ZYNQMP_QSPI
        bool "Configure ZynqMP QSPI"

diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index cf8b56186540a87dec1c8b6cd25eaf7cfb38c6e1..1505d61ebc47917e50d2de5698442bd90d2e0a92 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_ep"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_DM_GPIO=y

diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig
index e508dd7eda1fc9169d371b713b9ae7cba0ca3f75..098df6ba060efa8224f88f7c4594b46b59f229cc 100644 (file)
--- a/configs/xilinx_zynqmp_mini_nand_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
 CONFIG_ARCH_ZYNQMP=y
-CONFIG_TARGET_ZYNQMP_MINI=y
 CONFIG_NAND_ARASAN=y
 CONFIG_SYS_TEXT_BASE=0x10000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"

diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index c76222705bcf1ca575d0d24839d6e929e7f6e667..00612de57cff92e38585ee32b96d7698df7f7efe 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
 CONFIG_ARCH_ZYNQMP=y
-CONFIG_TARGET_ZYNQMP_MINI=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi"

diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 2375e9b3b61417c8693ef760f1da30f6a5481f84..359d7dc7b36f7f2aeff6b8107a03af0246354596 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_DM_GPIO=y
-CONFIG_TARGET_ZYNQMP_ZC1751_XM015_DC1=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
 CONFIG_SYS_TEXT_BASE=0x8000000

diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index dd317841da5fef31d1131648f6500c5e795d30e8..197de6215fdd0f2e3be126e51dc6860358804ffb 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm016_dc2"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_DM_GPIO=y
-CONFIG_TARGET_ZYNQMP_ZC1751_XM016_DC2=y
 CONFIG_NAND_ARASAN=y
 CONFIG_ZYNQMP_USB=y
 CONFIG_SYS_TEXT_BASE=0x8000000

diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index be86c4dc7c56b53ef1855b763c554ced0e6235cc..296fd66f9fb08f69d31e730d739f4e835ae9671f 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm019_dc5"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_DM_GPIO=y
-CONFIG_TARGET_ZYNQMP_ZC1751_XM019_DC5=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5"
 CONFIG_FIT=y

diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig
index 74e25014552c2817a2b410920ca066e9b22ba694..1cec270c34db41bfe52c50c91496f5e8a3f03f7e 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_DM_GPIO=y
-CONFIG_TARGET_ZYNQMP_ZCU102=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
 CONFIG_SYS_TEXT_BASE=0x8000000

diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index 542a24a8d5b467484f41019a8a4e8924412c0a2c..3499d8cec9abc727ecc4a3002ce5fe7533e5058d 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_DM_GPIO=y
-CONFIG_TARGET_ZYNQMP_ZCU102=y
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
 CONFIG_SYS_TEXT_BASE=0x8000000