Convert CONFIG_ENV_SPI_* to Kconfig

[platform/kernel/u-boot.git] / include / configs / microblaze-generic.h

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 7f16700..d1ab40e 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -19,16 +19,10 @@
 #undef SPIFLASH
 #undef RAMENV  /* hold environment in flash */
 #else
-#ifdef XILINX_SPI_FLASH_BASEADDR
-#undef FLASH
-#define        SPIFLASH
-#undef RAMENV  /* hold environment in flash */
-#else
 #undef FLASH
 #undef SPIFLASH
 #define        RAMENV  /* hold environment in RAM */
 #endif
-#endif
 
 /* uart */
 /* The following table includes the supported baudrates */
@@ -38,21 +32,6 @@
 /* setting reset address */
 /*#define      CONFIG_SYS_RESET_ADDRESS        CONFIG_SYS_TEXT_BASE*/
 
-/* gpio */
-#ifdef XILINX_GPIO_BASEADDR
-# define CONFIG_SYS_GPIO_0_ADDR                XILINX_GPIO_BASEADDR
-#endif
-
-/* watchdog */
-#if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ)
-# define CONFIG_WATCHDOG_BASEADDR      XILINX_WATCHDOG_BASEADDR
-# define CONFIG_WATCHDOG_IRQ           XILINX_WATCHDOG_IRQ
-# ifndef CONFIG_SPL_BUILD
-#  define CONFIG_HW_WATCHDOG
-#  define CONFIG_XILINX_TB_WATCHDOG
-# endif
-#endif
-
 #define CONFIG_SYS_MALLOC_LEN  0xC0000
 
 /* Stack location before relocation */
@@ -80,8 +59,6 @@
 #ifdef FLASH
 # define CONFIG_SYS_FLASH_BASE         XILINX_FLASH_START
 # define CONFIG_SYS_FLASH_SIZE         XILINX_FLASH_SIZE
-# define CONFIG_SYS_FLASH_CFI          1
-# define CONFIG_FLASH_CFI_DRIVER       1
 /* ?empty sector */
 # define CONFIG_SYS_FLASH_EMPTY_INFO   1
 /* max number of memory banks */
@@ -89,9 +66,7 @@
 /* max number of sectors on one chip */
 # define CONFIG_SYS_MAX_FLASH_SECT     512
 /* hardware flash protection */
-# define CONFIG_SYS_FLASH_PROTECTION
 /* use buffered writes (20x faster) */
-# define       CONFIG_SYS_FLASH_USE_BUFFER_WRITE       1
 # ifdef        RAMENV
 #  define CONFIG_ENV_SIZE      0x1000
 #  define CONFIG_ENV_ADDR      (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
@@ -106,19 +81,11 @@
 #else /* !FLASH */
 
 #ifdef SPIFLASH
-# define CONFIG_SYS_SPI_BASE           XILINX_SPI_FLASH_BASEADDR
-# define CONFIG_SF_DEFAULT_MODE                SPI_MODE_3
-# define CONFIG_SF_DEFAULT_SPEED       XILINX_SPI_FLASH_MAX_FREQ
-# define CONFIG_SF_DEFAULT_CS          XILINX_SPI_FLASH_CS
-
 # ifdef        RAMENV
 #  define CONFIG_ENV_SIZE      0x1000
 #  define CONFIG_ENV_ADDR      (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
 
 # else /* SPIFLASH && !RAMENV */
-#  define CONFIG_ENV_SPI_MODE          SPI_MODE_3
-#  define CONFIG_ENV_SPI_MAX_HZ                CONFIG_SF_DEFAULT_SPEED
-#  define CONFIG_ENV_SPI_CS            CONFIG_SF_DEFAULT_CS
 /* 128K(two sectors) for env */
 #  define CONFIG_ENV_SECT_SIZE 0x10000
 #  define CONFIG_ENV_SIZE      (2 * CONFIG_ENV_SECT_SIZE)
@@ -154,18 +121,8 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#if defined(CONFIG_CMD_JFFS2)
-# define CONFIG_MTD_PARTITIONS
-#endif
-
-#if defined(CONFIG_CMD_UBI)
-# define CONFIG_MTD_PARTITIONS
-#endif
-
 #if defined(CONFIG_MTD_PARTITIONS)
 /* MTD partitions */
-#define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define CONFIG_FLASH_CFI_MTD
 
 /* default mtd partition table */
 #endif
@@ -201,10 +158,7 @@
 #define CONFIG_LMB             1
 
 #if defined(CONFIG_XILINX_AXIEMAC)
-# define CONFIG_MII            1
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN       1
-#else
-# undef CONFIG_MII
 #endif
 
 /* SPL part */