Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

[people/ms/u-boot.git] / include / configs / M5235EVB.h

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 8bf4e5318f4c5abd0778c4022f96e90877d12093..d221f718f076d65dc6fa4320987e8b89b7293428 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -21,7 +21,6 @@
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
@@ -30,28 +29,6 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_REGINFO
-
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
@@ -91,7 +68,6 @@
 #define CONFIG_SYS_I2C_PINMUX_SET      (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#define CONFIG_BOOTDELAY       1       /* autoboot after 5 seconds */
 #define CONFIG_BOOTFILE                "u-boot.bin"
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_IPADDR    192.162.1.2
@@ -114,18 +90,7 @@
        ""
 
 #define CONFIG_PRAM            512     /* 512 KB */
-#define CONFIG_SYS_PROMPT              "-> "
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
-#if defined(CONFIG_KGDB)
-#      define CONFIG_SYS_CBSIZE                1024    /* Console I/O Buffer Size */
-#else
-#      define CONFIG_SYS_CBSIZE                256     /* Console I/O Buffer Size */
-#endif
-
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)        /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size    */
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE+0x20000)
 
 #define CONFIG_SYS_CLK                 75000000
@@ -195,11 +160,10 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
-#define CONFIG_ENV_IS_IN_FLASH 1
 
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
-       common/env_embedded.o (.text);
+       env/embedded.o(.text);
 
 #ifdef NORFLASH_PS32BIT
 #      define CONFIG_ENV_OFFSET                (0x8000)