Xilinx: ARM: Cleanup config support for ZedBoard

This patch cleans up config support needed for ZedBoard targets
following merge branch 'master-next" and has been tested on Rev. B
ZedBoard hardware.

Signed-off-by: Kevin Keryk <kevin.keryk@avnet.com>

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index b2cccb99cdfdeab78b7b70906aaf9307a5dc85c1..4026a1edb857c6f7e2fa94f2b87fa56796d5f2a7 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -1,45 +1,51 @@
-#ifndef __CONFIG_H
-#define __CONFIG_H
+/*
+ * Configuration for Zynq Evaluation and Development Board - ZedBoard
+ *
+ * See zynq_common.h for Zynq common configs
+ */
+
+#ifndef __CONFIG_ZYNQ_ZED_H
+#define __CONFIG_ZYNQ_ZED_H
+
+#include <configs/zynq_common.h>
 
 /*
  * High Level Configuration Options
  */
 #define CONFIG_ZED /* Community Board */
 
-#include <configs/zynq_common.h>
-
 /* Default environment */
 #define CONFIG_IPADDR   192.168.1.10
-/* ETHADDR should pretty much never be in the default env */
-#define CONFIG_ETHADDR  00:0a:35:00:01:22
 #define CONFIG_SERVERIP 192.168.1.50
 
+#undef CONFIG_ZYNQ_XIL_LQSPI
+
+/* No NOR Flash available on ZedBoard */
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_ENV_IS_NOWHERE
+
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS      \
+       "ethaddr=00:0a:35:00:01:22\0"   \
        "kernel_size=0x140000\0"        \
        "ramdisk_size=0x200000\0"       \
        "qspiboot=sf probe 0 0 0;" \
-               "sf read 0x8000 0x100000 0x2c0000; " \
-               "sf read 0x1000000 0x3c0000 0x40000; " \
-               "sf read 0x800000 0x400000 0x800000; " \
+               "sf read 0x8000 0x100000 0x2c0000;" \
+               "sf read 0x1000000 0x3c0000 0x40000;" \
+               "sf read 0x800000 0x400000 0x800000;" \
                "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; " \
+       "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;" \
                "go 0x8000\0" \
-       "jtagboot=echo TFTPing Linux to RAM...; " \
-               "tftp 0x8000 zImage; " \
-               "tftp 0x1000000 devicetree.dtb; " \
-               "tftp 0x800000 ramdisk8M.image.gz; " \
+       "jtagboot=echo TFTPing Linux to RAM...;" \
+               "tftp 0x8000 zImage;" \
+               "tftp 0x1000000 devicetree.dtb;" \
+               "tftp 0x800000 ramdisk8M.image.gz;" \
                "go 0x8000\0"
 
-#undef CONFIG_PELE_XIL_LQSPI
-
-#undef CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
-
 #include <config_cmd_default.h>
 #define CONFIG_CMD_DATE                /* RTC? */
 #define CONFIG_CMD_PING                /* Might be useful for debugging */
@@ -57,32 +63,13 @@
 #undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT      "zed-boot> "
 
-#ifndef CONFIG_SYS_NO_FLASH
-
-/* FLASH organization */
-#define CONFIG_SYS_FLASH_BASE           0xE2000000
-#define CONFIG_SYS_FLASH_SIZE           (16 * 1024 * 1024)
-#define CONFIG_SYS_MAX_FLASH_BANKS      1
-/* max number of sectors/blocks on one chip */
-#define CONFIG_SYS_MAX_FLASH_SECT       512
-#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
-#undef CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_FLASH_CFI_DRIVER
-
-#undef CONFIG_SYS_FLASH_PROTECTION /* don't use hardware protection */
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes (20x faster) */
-#endif
+/* 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
 
 /* HW to use */
-#define CONFIG_XDF_UART
-#define CONFIG_XDF_ETH
-#define CONFIG_XDF_RTC
-# define CONFIG_UART1
+#define CONFIG_UART1
 #define CONFIG_TTC0
 #define CONFIG_GEM0
 #define CONFIG_ZYNQ_GEM
@@ -92,7 +79,7 @@
 /*
  * Physical Memory map
  */
-#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024)
+#define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024)
 
 /*
  * SPI Settings
@@ -105,18 +92,16 @@
 #define CONFIG_SPI_FLASH_SPANSION
 
 /* Place a Xilinx Boot ROM header in u-boot image? */
-#define CONFIG_PELE_XILINX_FLASH_HEADER
+#undef CONFIG_ZYNQ_XILINX_FLASH_HEADER
 
-#ifdef CONFIG_PELE_XILINX_FLASH_HEADER
+#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
 /* Address Xilinx boot rom should use to launch u-boot */
-#ifdef CONFIG_PELE_XIL_LQSPI
-#define CONFIG_PELE_XIP_START XPSS_QSPI_LIN_BASEADDR
-#else
-/* NOR */
-#define CONFIG_PELE_XIP_START CONFIG_SYS_FLASH_BASE
+#ifdef CONFIG_ZYNQ_XIL_LQSPI
+#define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
 #endif
 #endif
 
+/* Secure Digital */
 #define CONFIG_MMC
 
 #ifdef CONFIG_MMC
@@ -128,4 +113,4 @@
 #define CONFIG_DOS_PARTITION
 #endif
 
-#endif /* __CONFIG_H */
+#endif /* __CONFIG_ZYNQ_ZED_H */