[U-Boot] [PATCH 3/3] arm64: zynqmp: Remove board config files

Michal Simek michal.simek at xilinx.com
Wed Feb 13 13:22:19 UTC 2019


All options have been moved to Kconfig and there is no need to have
board header files. Mini configurations require them that's why they are
still there.

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

 configs/avnet_ultra96_rev1_defconfig             |  1 -
 configs/xilinx_zynqmp_zc1275_revB_defconfig      |  1 -
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  1 -
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig |  1 -
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig |  1 -
 configs/xilinx_zynqmp_zcu100_revC_defconfig      |  1 -
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    |  1 -
 configs/xilinx_zynqmp_zcu102_revA_defconfig      |  1 -
 configs/xilinx_zynqmp_zcu102_revB_defconfig      |  1 -
 configs/xilinx_zynqmp_zcu104_revA_defconfig      |  1 -
 configs/xilinx_zynqmp_zcu104_revC_defconfig      |  1 -
 configs/xilinx_zynqmp_zcu106_revA_defconfig      |  1 -
 configs/xilinx_zynqmp_zcu111_revA_defconfig      |  1 -
 include/configs/xilinx_zynqmp_zc1275_revB.h      | 13 -------------
 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 14 --------------
 include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h | 14 --------------
 include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 15 ---------------
 include/configs/xilinx_zynqmp_zcu100.h           | 14 --------------
 include/configs/xilinx_zynqmp_zcu102.h           | 14 --------------
 include/configs/xilinx_zynqmp_zcu104.h           | 14 --------------
 include/configs/xilinx_zynqmp_zcu104_revC.h      | 14 --------------
 include/configs/xilinx_zynqmp_zcu106.h           | 14 --------------
 include/configs/xilinx_zynqmp_zcu111.h           | 14 --------------
 23 files changed, 153 deletions(-)
 delete mode 100644 include/configs/xilinx_zynqmp_zc1275_revB.h
 delete mode 100644 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
 delete mode 100644 include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
 delete mode 100644 include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
 delete mode 100644 include/configs/xilinx_zynqmp_zcu100.h
 delete mode 100644 include/configs/xilinx_zynqmp_zcu102.h
 delete mode 100644 include/configs/xilinx_zynqmp_zcu104.h
 delete mode 100644 include/configs/xilinx_zynqmp_zcu104_revC.h
 delete mode 100644 include/configs/xilinx_zynqmp_zcu106.h
 delete mode 100644 include/configs/xilinx_zynqmp_zcu111.h

diff --git a/configs/avnet_ultra96_rev1_defconfig b/configs/avnet_ultra96_rev1_defconfig
index b0d416e52c4d..15a682789350 100644
--- a/configs/avnet_ultra96_rev1_defconfig
+++ b/configs/avnet_ultra96_rev1_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu100"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zc1275_revB_defconfig b/configs/xilinx_zynqmp_zc1275_revB_defconfig
index 7e0f618ed0bc..aa44f0424337 100644
--- a/configs/xilinx_zynqmp_zc1275_revB_defconfig
+++ b/configs/xilinx_zynqmp_zc1275_revB_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1275_revB"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
index 5e419822465a..bf141c5e168a 100644
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
index d91d511a3af0..439f89e50f3c 100644
--- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm017_dc3"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
index d14d6c4972b7..f1970aadf417 100644
--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm019_dc5"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig b/configs/xilinx_zynqmp_zcu100_revC_defconfig
index 2a0ec272a01d..6e0767164c7e 100644
--- a/configs/xilinx_zynqmp_zcu100_revC_defconfig
+++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu100"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
index ba0f6b2aeb3a..371e6363db2f 100644
--- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
index 2e1e3c2bf50c..a0fb6c3586cc 100644
--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index 78ab9465d858..db7c093d5ebc 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu104_revA_defconfig b/configs/xilinx_zynqmp_zcu104_revA_defconfig
index 4e649ae6a2ca..eacf75d9f8e2 100644
--- a/configs/xilinx_zynqmp_zcu104_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu104"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig b/configs/xilinx_zynqmp_zcu104_revC_defconfig
index d451cb039376..1c9a6d6f1ec4 100644
--- a/configs/xilinx_zynqmp_zcu104_revC_defconfig
+++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu104_revC"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu106_revA_defconfig b/configs/xilinx_zynqmp_zcu106_revA_defconfig
index cf25e760a37b..1b685ca04925 100644
--- a/configs/xilinx_zynqmp_zcu106_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu106"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/configs/xilinx_zynqmp_zcu111_revA_defconfig b/configs/xilinx_zynqmp_zcu111_revA_defconfig
index eacd88e007ed..74106d7ea8fa 100644
--- a/configs/xilinx_zynqmp_zcu111_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu111"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
diff --git a/include/configs/xilinx_zynqmp_zc1275_revB.h b/include/configs/xilinx_zynqmp_zc1275_revB.h
deleted file mode 100644
index 244f61edd181..000000000000
--- a/include/configs/xilinx_zynqmp_zc1275_revB.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zc1275 RevB
- *
- * (C) Copyright 2018 Xilinx, Inc.
- */
-
-#ifndef __CONFIG_ZYNQMP_ZC1275_REVB_H
-#define __CONFIG_ZYNQMP_ZC1275_REVB_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZC1275_REVB_H */
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
deleted file mode 100644
index cd72e6f419b3..000000000000
--- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zc1751 XM015 DC1
- *
- * (C) Copyright 2015 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
-#define __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H */
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
deleted file mode 100644
index dbacfde151df..000000000000
--- a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zc1751 XM017 DC3
- *
- * (C) Copyright 2015 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H
-#define __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H */
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
deleted file mode 100644
index 0b525c88b7d6..000000000000
--- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zc1751 XM019 DC5
- *
- * (C) Copyright 2015 Xilinx, Inc.
- * Siva Durga Prasad <siva.durga.paladugu at xilinx.com>
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
-#define __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H */
diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h
deleted file mode 100644
index 409dcb2651d7..000000000000
--- a/include/configs/xilinx_zynqmp_zcu100.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zcu100
- *
- * (C) Copyright 2015 - 2016 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZCU100_H
-#define __CONFIG_ZYNQMP_ZCU100_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZCU100_H */
diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
deleted file mode 100644
index 9ebf0b5ed79e..000000000000
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zcu102
- *
- * (C) Copyright 2015 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZCU102_H
-#define __CONFIG_ZYNQMP_ZCU102_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZCU102_H */
diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h
deleted file mode 100644
index a8303756e5ea..000000000000
--- a/include/configs/xilinx_zynqmp_zcu104.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zcu104
- *
- * (C) Copyright 2017 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZCU104_H
-#define __CONFIG_ZYNQMP_ZCU104_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZCU104_H */
diff --git a/include/configs/xilinx_zynqmp_zcu104_revC.h b/include/configs/xilinx_zynqmp_zcu104_revC.h
deleted file mode 100644
index e3059a921e65..000000000000
--- a/include/configs/xilinx_zynqmp_zcu104_revC.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zcu104
- *
- * (C) Copyright 2018 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZCU104_REVC_H
-#define __CONFIG_ZYNQMP_ZCU104_REVC_H
-
-#include <configs/xilinx_zynqmp_zcu104.h>
-
-#endif /* __CONFIG_ZYNQMP_ZCU104_REVC_H */
diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h
deleted file mode 100644
index bb5cf677cb78..000000000000
--- a/include/configs/xilinx_zynqmp_zcu106.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zcu106
- *
- * (C) Copyright 2016 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZCU106_H
-#define __CONFIG_ZYNQMP_ZCU106_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZCU106_H */
diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h
deleted file mode 100644
index 507aee9332c2..000000000000
--- a/include/configs/xilinx_zynqmp_zcu111.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Xilinx ZynqMP zcu111
- *
- * (C) Copyright 2017 Xilinx, Inc.
- * Michal Simek <michal.simek at xilinx.com>
- */
-
-#ifndef __CONFIG_ZYNQMP_ZCU111_H
-#define __CONFIG_ZYNQMP_ZCU111_H
-
-#include <configs/xilinx_zynqmp.h>
-
-#endif /* __CONFIG_ZYNQMP_ZCU111_H */
-- 
1.9.1



More information about the U-Boot mailing list