Merge git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 380221e..5a2f0e2 100644 (file)
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -24,16 +24,14 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_ENV_OFFSET              0x4000
 #define CONFIG_ENV_SECT_SIZE   0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
 #else
 #define CONFIG_ENV_ADDR                0xffe04000
 #define CONFIG_ENV_SECT_SIZE   0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
-       common/env_embedded.o      (.text)
+       env/embedded.o(.text)
 
 /*
  * BOOTP options
@@ -46,7 +44,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IDE
 
 /* ATA */
 #define CONFIG_IDE_RESET       1