Xilinx: ARM: few more configuartions are factored from board headers

Factored few more configs from board headers and placed on to
zynq_common.h, apart from this few more config cleanups are done.

Signed-off-by: Jagan <jaganna@xilinx.com>

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index b8910bcf38f99bfa15f7a5d1d8477dfd14c78392..af504e4ec94cffaf48479333188c3dea3da1ce49 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -47,14 +47,12 @@
                            "cp 0xFC600000 0x1000000 0x8000;" \
                            "echo Copying ramdisk...;" \
                            "cp 0xFC800000 0x800000 ${ramdisk_size};" \
-                           "ping 10.10.70.101;" \
                            "go 0x8000\0" \
        "sdboot=echo Copying Linux from SD to RAM...;" \
                            "mmcinfo;" \
                            "fatload mmc 0 0x8000 zImage;" \
                            "fatload mmc 0 0x1000000 devicetree.dtb;" \
                            "fatload mmc 0 0x800000 ramdisk8M.image.gz;" \
-                           "ping 10.10.70.101;" \
                            "go 0x8000\0" \
        "nandboot=echo Copying Linux from NAND flash to RAM...;" \
                            "nand read 0x8000 0x200000 ${nand_kernel_size};" \
@@ -68,7 +66,6 @@
                            "tftp 0x800000 ramdisk8M.image.gz;" \
                            "go 0x8000\0"
 
-
 /* default boot is according to the bootmode switch settings */
 #define CONFIG_BOOTCOMMAND "run modeboot"
 
@@ -84,14 +81,30 @@
 /* CONFIG_SYS_MONITOR_BASE? */
 /* CONFIG_SYS_MONITOR_LEN? */
 
+/* Keep L2 Cache Disabled */
+#define CONFIG_L2_OFF                  1               
 #define CONFIG_SYS_CACHELINE_SIZE      32 /* Assuming bytes? */
 
+/*
+ * Physical Memory map
+ */
+#define CONFIG_NR_DRAM_BANKS           1
+/* Semi-educated guess based on p.48 of DF Arch spec */
+#define PHYS_SDRAM_1                   (256 * 1024)
+/* Cameron guessed 256 or 512 MB */
+#define PHYS_SDRAM_1_SIZE              (256 * 1024 * 1024)
+
+#define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x10000)
+
+#define CONFIG_SYS_SDRAM_BASE          0
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
                                        CONFIG_SYS_INIT_RAM_SIZE - \
                                        GENERATED_GBL_DATA_SIZE)
 
+#undef CONFIG_SKIP_RELOCATE_UBOOT
 /* Because (at least at first) we're going to be loaded via JTAG_Tcl */
 /* #define CONFIG_SKIP_LOWLEVEL_INIT */
 
@@ -101,14 +114,6 @@
 #define TIMER_TICK_HZ          (TIMER_INPUT_CLOCK / CONFIG_TIMER_PRESCALE)
 #define CONFIG_SYS_HZ          1000
 
-/* And here... */
 #define CONFIG_SYS_LOAD_ADDR   0 /* default? */
-/* Semi-educated guess based on p.48 of DF Arch spec */
-#define PHYS_SDRAM_1           (256 * 1024)
-/* Cameron guessed 256 or 512 MB */
-#define PHYS_SDRAM_1_SIZE      (256 * 1024 * 1024)
-
-#define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x10000)
 
 #endif /* __CONFIG_ZYNQ_COMMON_H */

diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index 75c1044857e3692c3f159f18544da32f05ac9743..aa19c86609f7e1ac0d668c2b3cd74f220cf9e53f 100644 (file)
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -39,30 +39,22 @@
 #define CONFIG_AUTO_COMPLETE   1
 #define CONFIG_CMDLINE_EDITING 1
 
-#undef CONFIG_SKIP_RELOCATE_UBOOT      
-
-#define CONFIG_SYS_SDRAM_BASE  0
-
-#define CONFIG_L2_OFF
-
 /* this is to initialize GEM at uboot start */
 /* #define CONFIG_ZYNQ_INIT_GEM        */
 /* this is to set ipaddr, ethaddr and serverip env variables. */
 #define CONFIG_ZYNQ_IP_ENV
 
-
+/*
+ * NOR Flash Settings
+ */
 #ifndef CONFIG_SYS_NO_FLASH
-
-/* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE           0xE2000000 
 #define CONFIG_SYS_FLASH_SIZE           (16*1024*1024)  /* i.e. 16MB */
 #define CONFIG_SYS_MAX_FLASH_BANKS      1       /* max number of memory banks */
 #define CONFIG_SYS_MAX_FLASH_SECT       512     /* max number of sectors/blocks on one chip */
 #define CONFIG_SYS_FLASH_ERASE_TOUT     1000
 #define CONFIG_SYS_FLASH_WRITE_TOUT     5000
-
 #define CONFIG_FLASH_SHOW_PROGRESS     10
-
 #define CONFIG_SYS_FLASH_CFI            1
 // #define CONFIG_SYS_FLASH_EMPTY_INFO     0
 #define CONFIG_FLASH_CFI_DRIVER        1
@@ -74,9 +66,7 @@
 #define CONFIG_ENV_SECT_SIZE           0x20000         /*128 KB*/
 #define CONFIG_ENV_IS_IN_FLASH         1
 #else
-
 #define CONFIG_ENV_IS_NOWHERE  1
-
 #endif
 
 /* HW to use */

diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h
index b5461cd0f93895ebf93fe687844a8e4f6aaaf9c9..312d913f092c5fc55a45f6ae06c807967ef4de5c 100644 (file)
--- a/include/configs/zynq_zc702.h
+++ b/include/configs/zynq_zc702.h
@@ -40,12 +40,6 @@
 #define CONFIG_AUTO_COMPLETE   1
 #define CONFIG_CMDLINE_EDITING 1
 
-#undef CONFIG_SKIP_RELOCATE_UBOOT
-
-#define CONFIG_SYS_SDRAM_BASE  0
-
-#define CONFIG_L2_OFF
-
 /* this is to initialize GEM at uboot start */
 /* #define CONFIG_ZYNQ_INIT_GEM        */
 /* this is to set ipaddr, ethaddr and serverip env variables. */
@@ -63,7 +57,6 @@
  */
 //#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

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index c0e0c4813e7a276a8a82bd48b84e7f32561c1ab2..ab714f177e19f2f80c7b02ad4d0522d9db7b910e 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -39,12 +39,6 @@
 #define CONFIG_AUTO_COMPLETE   1
 #define CONFIG_CMDLINE_EDITING 1
 
-#undef CONFIG_SKIP_RELOCATE_UBOOT      
-
-#define CONFIG_SYS_SDRAM_BASE  0
-
-#define CONFIG_L2_OFF
-
 /* this is to initialize GEM at uboot start */
 /* #define CONFIG_ZYNQ_INIT_GEM        */
 /* this is to set ipaddr, ethaddr and serverip env variables. */
@@ -55,39 +49,32 @@
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
 #endif
 
+/*
+ * NOR Flash Settings
+ */
 #ifndef CONFIG_SYS_NO_FLASH
-
-/* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE           0xE2000000 
 #define CONFIG_SYS_FLASH_SIZE           (16*1024*1024)  /* i.e. 16MB */
 #define CONFIG_SYS_MAX_FLASH_BANKS      1       /* max number of memory banks */
 #define CONFIG_SYS_MAX_FLASH_SECT       512     /* max number of sectors/blocks on one chip */
 #define CONFIG_SYS_FLASH_ERASE_TOUT     1000
 #define CONFIG_SYS_FLASH_WRITE_TOUT     5000
-
 #define CONFIG_FLASH_SHOW_PROGRESS     10
 
 #define CONFIG_SYS_FLASH_CFI            1
 // #define CONFIG_SYS_FLASH_EMPTY_INFO     0
 #define CONFIG_FLASH_CFI_DRIVER        1
-
 #define CONFIG_SYS_FLASH_PROTECTION     0       /* use hardware protection           */
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE       /* use buffered writes (20x faster)  */
 //#define CONFIG_ENV_ADDR              (CONFIG_SYS_FLASH_BASE + 0x00000000)
 #define CONFIG_ENV_OFFSET              0xC0000         /*768 KB*/
 #define CONFIG_ENV_SECT_SIZE           0x20000         /*128 KB*/
-#ifdef CONFIG_EP107
-# define CONFIG_ENV_IS_IN_FLASH                1
-#else
-# define CONFIG_ENV_IS_NOWHERE         1
-#endif
+#define CONFIG_ENV_IS_IN_FLASH         1
 #ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
 #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
 #endif
 #else
-
 #define CONFIG_ENV_IS_NOWHERE  1
-
 #endif
 
 /*
@@ -95,7 +82,6 @@
  */
 //#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
@@ -108,7 +94,7 @@
 #define CONFIG_UART0                   1
 #endif
 
- /*
+/*
  * Ethernet Settings
  */
 #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM013)