Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig

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

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index a5489cd..cc74ca3 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -90,11 +90,7 @@
 #define CONFIG_CMD_NAND_TRIMFFS
 
 #define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS
 #endif
 
 /* USB */
@@ -117,7 +113,6 @@
 
 #ifdef CONFIG_SYS_USE_NANDFLASH
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              0x120000
 #define CONFIG_ENV_OFFSET_REDUND       0x100000
 #define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */
@@ -126,7 +121,6 @@
                                "bootm 0x22000000"
 #elif defined(CONFIG_SYS_USE_SPIFLASH)
 /* bootstrap + u-boot + env + linux in spi flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET      0x5000
 #define CONFIG_ENV_SIZE                0x3000
 #define CONFIG_ENV_SECT_SIZE   0x1000
@@ -136,7 +130,6 @@
                                "bootm 0x22000000"
 #elif defined(CONFIG_SYS_USE_DATAFLASH)
 /* bootstrap + u-boot + env + linux in data flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET      0x4200
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_ENV_SECT_SIZE   0x210
@@ -147,7 +140,6 @@
 #else /* CONFIG_SYS_USE_MMC */
 /* bootstrap + u-boot + env + linux in mmc */
 #define CONFIG_ENV_IS_IN_FAT
-#define CONFIG_FAT_WRITE
 #define FAT_ENV_INTERFACE      "mmc"
 #define FAT_ENV_FILE           "uboot.env"
 #define FAT_ENV_DEVICE_AND_PART "0"
@@ -191,7 +183,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #define CONFIG_SYS_MASTER_CLOCK                132096000