configs: Migrate CMD_NAND*

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

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 3b2d01e..7552f4d 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -36,9 +36,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/* Command line configuration */
-#undef CONFIG_CMD_NAND
-
 /*
  * NAND FLASH
  */
@@ -272,20 +269,17 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #if !defined(CONFIG_SERIAL_BOOT)  /*MRAM boot*/
-#define CONFIG_ENV_IS_IN_MRAM  1
 #define CONFIG_ENV_ADDR                (0x40000 - 0x1000) /*MRAM size 40000*/
 #define CONFIG_ENV_SIZE                0x1000
 #endif
 
 #if defined(CONFIG_CF_SBF)
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
 #define CONFIG_ENV_SPI_CS              1
 #define CONFIG_ENV_OFFSET              0x40000
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_SECT_SIZE           0x10000
 #endif
 #if defined(CONFIG_SYS_NAND_BOOT)
-#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_OFFSET      0x80000
 #define CONFIG_ENV_SIZE        0x20000
 #define CONFIG_ENV_SECT_SIZE   0x20000