Move environment files from common/ to env/

[u-boot] / include / configs / M5253DEMO.h

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 6c90700ccf826081b34f6e768639177433c6c4c3..da8333ac6fdafd12d584a01fb10abc7a49bbfaf9 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -13,7 +13,6 @@
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
 
 #undef CONFIG_WATCHDOG         /* disable watchdog */
 
@@ -24,26 +23,21 @@
 #ifdef CONFIG_MONITOR_IS_IN_RAM
 #      define CONFIG_ENV_OFFSET                0x4000
 #      define CONFIG_ENV_SECT_SIZE     0x1000
-#      define CONFIG_ENV_IS_IN_FLASH   1
 #else
 #      define CONFIG_ENV_ADDR          (CONFIG_SYS_FLASH_BASE + 0x4000)
 #      define CONFIG_ENV_SECT_SIZE     0x1000
-#      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 
 #define LDS_BOARD_TEXT \
-        . = DEFINED(env_offset) ? env_offset : .; \
-        common/env_embedded.o (.text*);
+       . = DEFINED(env_offset) ? env_offset : .; \
+       env/embedded.o(.text*);
 
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IDE
 
-#ifdef CONFIG_CMD_IDE
+#ifdef CONFIG_IDE
 /* ATA */
-#      define CONFIG_DOS_PARTITION
-#      define CONFIG_MAC_PARTITION
 #      define CONFIG_IDE_RESET         1
 #      define CONFIG_IDE_PREINIT       1
 #      define CONFIG_ATAPI