Xilinx: ARM: Removed unneeded configurations from zc702

Removed NOR, NAND configurations from board header and
also few misc configs.

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

diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h
index 59722429e61a469f447f690f05d3e8b4ff2f8d92..b5461cd0f93895ebf93fe687844a8e4f6aaaf9c9 100644 (file)
--- a/include/configs/zynq_zc702.h
+++ b/include/configs/zynq_zc702.h
@@ -19,8 +19,9 @@
 
 #undef CONFIG_ZYNQ_XIL_LQSPI
 
-/* Uncomment it if you don't want Flash */
+/* no NOR on zc702 */
 #define CONFIG_SYS_NO_FLASH
+#define CONFIG_ENV_IS_NOWHERE  1
 
 #include <config_cmd_default.h>        
 #define CONFIG_CMD_DATE                /* RTC? */
@@ -50,45 +51,12 @@
 /* this is to set ipaddr, ethaddr and serverip env variables. */
 #define CONFIG_ZYNQ_IP_ENV
 
-
-#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
-#else
-
-#define CONFIG_ENV_IS_NOWHERE  1
-
-#endif
-
 /* HW to use */
-# define CONFIG_UART1  1
-#define CONFIG_TTC0    1
-#define CONFIG_GEM0    1
+#define CONFIG_UART1           1
+#define CONFIG_TTC0            1
+#define CONFIG_GEM0            1
 #define CONFIG_NET_MULTI
-#define CONFIG_XGMAC_PHY_ADDR 0x7
+#define CONFIG_XGMAC_PHY_ADDR  0x7
 
 /*
  * These were lifted straight from imx31_phycore, and may well be very wrong.
@@ -110,34 +78,15 @@
 #define CONFIG_SPI_FLASH
 #define CONFIG_CMD_SF
 /* #define CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH */
-#ifdef NOTOW_BHILL
-#define CONFIG_SPI_FLASH_ATMEL
-#define CONFIG_SPI_FLASH_SPANSION
-#define CONFIG_SPI_FLASH_WINBOND
-#endif
 #define CONFIG_SPI_FLASH_STMICRO
 
-/*
- * NAND Flash settings
- */
-#if defined(CONFIG_ZC770_XM011) || defined(CONFIG_ZC770_XM010_XM011)
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE XPSS_NAND_BASEADDR
-#define CONFIG_MTD_DEVICE
-#endif
-
 /* Place a Xilinx Boot ROM header in u-boot image? */
-/* #define CONFIG_ZYNQ_XILINX_FLASH_HEADER */
+#undef CONFIG_ZYNQ_XILINX_FLASH_HEADER */
 
 #ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
 /* Address Xilinx boot rom should use to launch u-boot */
 #ifdef CONFIG_ZYNQ_XIL_LQSPI
 #define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
-#else
-/* NOR */
-#define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
 #endif
 #endif