Xilinx: ARM: Move common elements to zynq_common.h

The CPU and the SoC should always be the same
The CPU is supposed to be CONFIG_ARMV7
General CONFIG_SYS should usually be the same
Always need BOARD_LATE_INIT

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 2d4851e591e568cda7443fac2f132398042bdbf4..63e1036c83b269111d8fbb4783abce1cacc9339b 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -6,6 +6,12 @@
 #ifndef __CONFIG_ZYNQ_COMMON_H
 #define __CONFIG_ZYNQ_COMMON_H
 
+/*
+ * High Level Configuration Options
+ */
+#define CONFIG_ARMV7 /* CPU */
+#define CONFIG_ZYNQ /* SoC */
+
 #include <asm/arch/xparameters.h>
 
 #define CONFIG_SYS_TEXT_BASE 0x04000000
@@ -100,6 +106,12 @@
                                        CONFIG_SYS_INIT_RAM_SIZE - \
                                        GENERATED_GBL_DATA_SIZE)
 
+#define CONFIG_ENV_SIZE 0x10000
+#define CONFIG_SYS_MALLOC_LEN 0x400000
+#define CONFIG_SYS_MAXARGS 16
+#define CONFIG_SYS_CBSIZE 2048
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+
 #undef CONFIG_SKIP_RELOCATE_UBOOT
 /* Because (at least at first) we're going to be loaded via JTAG_Tcl */
 /* #define CONFIG_SKIP_LOWLEVEL_INIT */
@@ -123,4 +135,6 @@
 
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT 1
 
+#define BOARD_LATE_INIT
+
 #endif /* __CONFIG_ZYNQ_COMMON_H */

diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index d819e06bbe625e31aff930a41d8fff7c2227c8aa..36e10c8e444c80978e1ee0f8cd638ce069842f9b 100644 (file)
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -7,8 +7,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARM1176 /* CPU */
-#define CONFIG_ZYNQ /* SoC? */
 
 #include <configs/zynq_common.h>
 
@@ -119,11 +117,7 @@
  */
 //#define CONFIG_ENV_SIZE                      4096
 #define CONFIG_ENV_SIZE                            896
-#define CONFIG_SYS_MALLOC_LEN          0x4000 // 16KB
 #define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* phycore */
 
 /*
  * SPI Settings
@@ -163,6 +157,4 @@
 #define CONFIG_DOS_PARTITION
 #endif
 
-#define BOARD_LATE_INIT        1
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index aa19c86609f7e1ac0d668c2b3cd74f220cf9e53f..3e6c40454bd7f96a97b4cf115c9b24479ff38ba8 100644 (file)
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -11,8 +11,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARM1176         1 /* CPU */
-#define CONFIG_ZYNQ            1 /* SoC? */
 #define CONFIG_EP107           1 /* Board */
 
 #include <configs/zynq_common.h>
@@ -79,13 +77,7 @@
 /*
  * These were lifted straight from imx31_phycore, and may well be very wrong.
  */
-//#define CONFIG_ENV_SIZE                      4096
-#define CONFIG_ENV_SIZE                        0x10000
 #define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_MALLOC_LEN          0x400000
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* phycore */
 
 /*
  * SPI Settings
@@ -132,6 +124,4 @@
 #define CONFIG_DOS_PARTITION
 #endif
 
-#define BOARD_LATE_INIT        1
-
 #endif /* __CONFIG_ZYNQ_EP107_H */

diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h
index a1f3b765a8506959f2701c66d8b485c684ac73f8..248e3475ea2a54f5132c6636809e17b11977160e 100644 (file)
--- a/include/configs/zynq_zc702.h
+++ b/include/configs/zynq_zc702.h
@@ -11,8 +11,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARM1176         1 /* CPU */
-#define CONFIG_ZYNQ            1 /* SoC? */
 #define CONFIG_ZC702           1 /* Board */
 
 #include <configs/zynq_common.h>
@@ -55,12 +53,6 @@
 /*
  * These were lifted straight from imx31_phycore, and may well be very wrong.
  */
-//#define CONFIG_ENV_SIZE                      4096
-#define CONFIG_ENV_SIZE                        0x10000
-#define CONFIG_SYS_MALLOC_LEN          0x400000
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* phycore */
 
 /*
  * SPI Settings
@@ -94,6 +86,4 @@
 #define CONFIG_DOS_PARTITION
 #endif
 
-#define BOARD_LATE_INIT        1
-
 #endif /* __CONFIG_ZYNQ_ZC702_H */

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index ab714f177e19f2f80c7b02ad4d0522d9db7b910e..746ea5ea0c05c14c2a387d0748cd8e8e7c0a6c79 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -11,8 +11,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_ARM1176         1 /* CPU */
-#define CONFIG_ZYNQ            1 /* SoC? */
 #define CONFIG_ZC770           1 /* Board */
 
 #include <configs/zynq_common.h>
@@ -80,12 +78,6 @@
 /*
  * These were lifted straight from imx31_phycore, and may well be very wrong.
  */
-//#define CONFIG_ENV_SIZE                      4096
-#define CONFIG_ENV_SIZE                        0x10000
-#define CONFIG_SYS_MALLOC_LEN          0x400000
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* phycore */
 
 #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM011) \
        || defined(CONFIG_ZC770_XM012)
@@ -160,6 +152,4 @@
 #endif
 #endif
 
-#define BOARD_LATE_INIT        1
-
 #endif /* __CONFIG_ZYNQ_ZC770_H */

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index b93ed2b1377f9a054580f5ef0b813466faf1f53d..d297be15e5868ee6f53f0f23d8103d5abcd55f39 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -1,8 +1,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_ARM1176         1 /* CPU */
-#define CONFIG_PELE            1 /* SoC? */
 #define CONFIG_ZED             1 /* Community Board */
 
 #include <configs/zynq_common.h>
@@ -101,13 +99,7 @@
 /*
  * These were lifted straight from imx31_phycore, and may well be very wrong.
  */
-//#define CONFIG_ENV_SIZE                      4096
-#define CONFIG_ENV_SIZE                        0x10000
-#define CONFIG_SYS_MALLOC_LEN          0x400000
 #define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* phycore */
 
 /*
  * SPI Settings
@@ -149,6 +141,4 @@
 #define CONFIG_DOS_PARTITION
 #endif
 
-#define BOARD_LATE_INIT        1
-
 #endif /* __CONFIG_H */