From: Masahiro Yamada Date: Sat, 30 Aug 2014 22:10:55 +0000 (+0900) Subject: zynq: kconfig: move board select menu and common settings X-Git-Tag: v2014.10-rc2~20 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44dcb4036b793acc7b5b384f5b572b4fe6e6be76;p=u-boot zynq: kconfig: move board select menu and common settings 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 Tested-by: Michal Simek --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 71757e783c..cac9143f21 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -668,17 +668,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" @@ -784,6 +775,7 @@ config TARGET_JORNADA endchoice +source "arch/arm/cpu/armv7/zynq/Kconfig" source "board/8dtech/eco5pk/Kconfig" source "board/aristainetos/Kconfig" source "board/Barix/ipam390/Kconfig" @@ -1012,7 +1004,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 0000000000..6b88f1841b --- /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 3b72a5f21d..0000000000 --- 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 e167816a2e..382e921e70 100644 --- a/board/xilinx/zynq/MAINTAINERS +++ b/board/xilinx/zynq/MAINTAINERS @@ -3,13 +3,5 @@ M: Michal Simek M: Jagannadha Sutradharudu Teki 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 14024d0412..3aedb350f6 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 d2e79a542c..04c8defaef 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 e9f9c4b1f1..1178b40bad 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 78f1fe68ca..52c21219d9 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 d96e8ffd00..836809a17c 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 abf7e8236f..233790664e 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 d57e9d5bbe..875cb43f15 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