summaryrefslogtreecommitdiffstats
path: root/board/xilinx
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-31 07:10:55 +0900
committerTom Rini <trini@ti.com>2014-08-30 21:19:32 -0400
commit44dcb4036b793acc7b5b384f5b572b4fe6e6be76 (patch)
treec64380d2c2c2d3867c99a4c29037a683f3b3df86 /board/xilinx
parenteeadd3fe0f3efaf020994a27d4394b02a6270e39 (diff)
downloadblackbird-obmc-uboot-44dcb4036b793acc7b5b384f5b572b4fe6e6be76.tar.gz
blackbird-obmc-uboot-44dcb4036b793acc7b5b384f5b572b4fe6e6be76.zip
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 <yamada.m@jp.panasonic.com> Tested-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'board/xilinx')
-rw-r--r--board/xilinx/zynq/Kconfig95
-rw-r--r--board/xilinx/zynq/MAINTAINERS12
2 files changed, 2 insertions, 105 deletions
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 <monstr@monstr.eu>
M: Jagannadha Sutradharudu Teki <jaganna@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
OpenPOWER on IntegriCloud