[U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and common settings
Masahiro Yamada
yamada.m at jp.panasonic.com
Wed Aug 6 05:17:50 CEST 2014
Becuase the board select menu in arch/arm/Kconfig is too big,
move the Zynq board select menu to zynq/Kconfig.
Consolidate also common settings (CONFIG_SYS_CPU="armv7" and
CONFIG_SYS_SOC="zynq").
Refactor board/xilinx/zynq/MAINTAINERS too.
Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Michal Simek <michal.simek at xilinx.com>
---
Changes in v2: None
arch/arm/Kconfig | 15 ++----
arch/arm/cpu/armv7/zynq/Kconfig | 43 +++++++++++++++++
board/xilinx/zynq/Kconfig | 95 --------------------------------------
board/xilinx/zynq/MAINTAINERS | 12 +----
configs/zynq_microzed_defconfig | 1 +
configs/zynq_zc70x_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
include/configs/zynq-common.h | 1 -
11 files changed, 54 insertions(+), 118 deletions(-)
create mode 100644 arch/arm/cpu/armv7/zynq/Kconfig
delete mode 100644 board/xilinx/zynq/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e97f94d..f4faffc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -656,17 +656,8 @@ config TARGET_U8500_HREF
config TARGET_VF610TWR
bool "Support vf610twr"
-config TARGET_ZYNQ_MICROZED
- bool "Support zynq_microzed"
-
-config TARGET_ZYNQ_ZC70X
- bool "Support zynq_zc70x"
-
-config TARGET_ZYNQ_ZC770
- bool "Support zynq_zc770"
-
-config TARGET_ZYNQ_ZED
- bool "Support zynq_zed"
+config ZYNQ
+ bool "Xilinx Zynq Platform"
config TARGET_MEDCOM_WIDE
bool "Support medcom-wide"
@@ -769,6 +760,7 @@ config TARGET_JORNADA
endchoice
+source "arch/arm/cpu/armv7/zynq/Kconfig"
source "board/8dtech/eco5pk/Kconfig"
source "board/Barix/ipam390/Kconfig"
source "board/BuR/kwb/Kconfig"
@@ -992,7 +984,6 @@ source "board/vpac270/Kconfig"
source "board/wandboard/Kconfig"
source "board/woodburn/Kconfig"
source "board/xaeniax/Kconfig"
-source "board/xilinx/zynq/Kconfig"
source "board/zipitz2/Kconfig"
endmenu
diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig
new file mode 100644
index 0000000..6b88f18
--- /dev/null
+++ b/arch/arm/cpu/armv7/zynq/Kconfig
@@ -0,0 +1,43 @@
+if ZYNQ
+
+choice
+ prompt "Xilinx Zynq board select"
+
+config TARGET_ZYNQ_ZED
+ bool "Zynq ZedBoard"
+
+config TARGET_ZYNQ_MICROZED
+ bool "Zynq MicroZed"
+
+config TARGET_ZYNQ_ZC70X
+ bool "Zynq ZC702/ZC706 Board"
+
+config TARGET_ZYNQ_ZC770
+ bool "Zynq ZC770 Board"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "armv7"
+
+config SYS_BOARD
+ string
+ default "zynq"
+
+config SYS_VENDOR
+ string
+ default "xilinx"
+
+config SYS_SOC
+ string
+ default "zynq"
+
+config SYS_CONFIG_NAME
+ string
+ default "zynq_zed" if TARGET_ZYNQ_ZED
+ default "zynq_microzed" if TARGET_ZYNQ_MICROZED
+ default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
+ default "zynq_zc770" if TARGET_ZYNQ_ZC770
+
+endif
diff --git a/board/xilinx/zynq/Kconfig b/board/xilinx/zynq/Kconfig
deleted file mode 100644
index 3b72a5f..0000000
--- a/board/xilinx/zynq/Kconfig
+++ /dev/null
@@ -1,95 +0,0 @@
-if TARGET_ZYNQ_MICROZED
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_microzed"
-
-endif
-
-if TARGET_ZYNQ_ZC70X
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_zc70x"
-
-endif
-
-if TARGET_ZYNQ_ZC770
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_zc770"
-
-endif
-
-if TARGET_ZYNQ_ZED
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_zed"
-
-endif
diff --git a/board/xilinx/zynq/MAINTAINERS b/board/xilinx/zynq/MAINTAINERS
index e167816..382e921 100644
--- a/board/xilinx/zynq/MAINTAINERS
+++ b/board/xilinx/zynq/MAINTAINERS
@@ -3,13 +3,5 @@ M: Michal Simek <monstr at monstr.eu>
M: Jagannadha Sutradharudu Teki <jaganna at xilinx.com>
S: Maintained
F: board/xilinx/zynq/
-F: include/configs/zynq_microzed.h
-F: configs/zynq_microzed_defconfig
-F: include/configs/zynq_zc70x.h
-F: configs/zynq_zc70x_defconfig
-F: include/configs/zynq_zc770.h
-F: configs/zynq_zc770_xm010_defconfig
-F: configs/zynq_zc770_xm012_defconfig
-F: configs/zynq_zc770_xm013_defconfig
-F: include/configs/zynq_zed.h
-F: configs/zynq_zed_defconfig
+F: include/configs/zynq*.h
+F: configs/zynq_*_defconfig
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 14024d0..3aedb35 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index d2e79a5..04c8def 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index e9f9c4b..1178b40 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -1,4 +1,5 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 78f1fe6..52c2121 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -1,4 +1,5 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index d96e8ff..836809a 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -1,4 +1,5 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index abf7e82..2337906 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZED=y
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index d57e9d5..875cb43 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -12,7 +12,6 @@
/* High Level configuration Options */
#define CONFIG_ARMV7
-#define CONFIG_ZYNQ
/* CPU clock */
#ifndef CONFIG_CPU_FREQ_HZ
--
1.9.1
More information about the U-Boot
mailing list