Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 2faf58156d89b444b19667d616f08c53cbfe7e5a..14dd2a516e9d5206aadd04cc248769274ccd5711 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -18,15 +18,12 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF5445x                /* define processor family */
-#define CONFIG_M54455          /* define processor type */
 #define CONFIG_M54455EVB       /* M54455EVB board */
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
+
+#define LDS_BOARD_TEXT                  board/freescale/m54455evb/sbf_dram_init.o (.text*)
 
 #undef CONFIG_WATCHDOG
 
@@ -36,36 +33,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_DATE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
-#undef CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
-
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 /* Network configuration */
 #define CONFIG_MCFFEC
@@ -83,16 +50,11 @@
 #      define MCFFEC_TOUT_LOOP 50000
 #      define CONFIG_HAS_ETH1
 
-#      define CONFIG_BOOTDELAY 1       /* autoboot after 5 seconds */
-#      define CONFIG_BOOTARGS          "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-#      define CONFIG_ETHADDR           00:e0:0c:bc:e5:60
-#      define CONFIG_ETH1ADDR          00:e0:0c:bc:e5:61
 #      define CONFIG_ETHPRIME          "FEC0"
 #      define CONFIG_IPADDR            192.162.1.2
 #      define CONFIG_NETMASK           255.255.255.0
 #      define CONFIG_SERVERIP          192.162.1.1
 #      define CONFIG_GATEWAYIP         192.162.1.1
-#      define CONFIG_OVERWRITE_ETHADDR_ONCE
 
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY
@@ -147,8 +109,6 @@
 #endif
 
 /* ATA configuration */
-#define CONFIG_ISO_PARTITION
-#define CONFIG_DOS_PARTITION
 #define CONFIG_IDE_RESET       1
 #define CONFIG_IDE_PREINIT     1
 #define CONFIG_ATAPI
@@ -183,13 +143,10 @@
 #define CONFIG_SYS_IMMR                CONFIG_SYS_MBAR
 
 /* DSPI and Serial Flash */
-#define CONFIG_CF_SPI
 #define CONFIG_CF_DSPI
 #define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE         0x13
 #ifdef CONFIG_CMD_SPI
-#      define CONFIG_SPI_FLASH
-#      define CONFIG_SPI_FLASH_STMICRO
 
 #      define CONFIG_SYS_DSPI_CTAR0            (DSPI_CTAR_TRSZ(7) | \
                                         DSPI_CTAR_PCSSCK_1CLK | \
@@ -202,8 +159,6 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI             1
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 4
@@ -223,7 +178,6 @@
 
 /* FPGA - Spartan 2 */
 /* experiment
-#define CONFIG_FPGA
 #define CONFIG_FPGA_COUNT      1
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC
@@ -234,18 +188,6 @@
 
 #define CONFIG_PRAM            2048    /* 2048 KB */
 
-#define CONFIG_SYS_PROMPT              "-> "
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-
-#if defined(CONFIG_CMD_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 + 0x10000)
 
 #define CONFIG_SYS_MBAR                0xFC000000
@@ -310,10 +252,7 @@
  * crc error warning if there is no correct environment on the flash.
  */
 #ifdef CONFIG_CF_SBF
-#      define CONFIG_ENV_IS_IN_SPI_FLASH
 #      define CONFIG_ENV_SPI_CS                1
-#else
-#      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 #undef CONFIG_ENV_OVERWRITE