Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index cbe0d1ef635dacfae85958de16ff205b233e4665..ba9ba0069868f452f19313185d6b3493bb5799d5 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -18,12 +18,13 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_M54418TWR       /* M54418TWR board */
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600 , 19200 , 38400 , 57600, 115200 }
 
+#define LDS_BOARD_TEXT                 board/freescale/m54418twr/sbf_dram_init.o (.text*)
+
 #undef CONFIG_WATCHDOG
 
 #define CONFIG_TIMESTAMP       /* Print image info with timestamp */
@@ -32,15 +33,6 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/* Command line configuration */
-#undef CONFIG_CMD_DATE
-#undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_NAND
-#define CONFIG_CMD_REGINFO
 
 /*
  * NAND FLASH
@@ -61,7 +53,7 @@
 #define CONFIG_MII_INIT                1
 #define CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_SYS_RX_ETH_BUFFER       2
-#define CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 #define CONFIG_SYS_TX_ETH_BUFFER       2
 #define CONFIG_HAS_ETH1
 
@@ -73,22 +65,6 @@
 #define CONFIG_SYS_FEC0_PHYADDR        0
 #define CONFIG_SYS_FEC1_PHYADDR        1
 
-
-#ifdef CONFIG_SYS_NAND_BOOT
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock2 rw rootfstype=jffs2 " \
-                               "mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro," \
-                               "-(jffs2) console=ttyS0,115200"
-#else
-#define CONFIG_BOOTARGS        "root=/dev/nfs rw nfsroot="     \
-                               __stringify(CONFIG_SERVERIP) ":/tftpboot/" \
-                               __stringify(CONFIG_IPADDR) "  ip="      \
-                               __stringify(CONFIG_IPADDR) ":"  \
-                               __stringify(CONFIG_SERVERIP)":" \
-                               __stringify(CONFIG_GATEWAYIP)": "       \
-                               __stringify(CONFIG_NETMASK)             \
-                               "::eth0:off:rw console=ttyS0,115200"
-#endif
-
 #define CONFIG_ETHPRIME        "FEC0"
 #define CONFIG_IPADDR          192.168.1.2
 #define CONFIG_NETMASK         255.255.255.0
@@ -167,7 +143,6 @@
 
 /* I2c */
 #undef CONFIG_SYS_FSL_I2C
-#undef CONFIG_HARD_I2C         /* I2C with hardware support */
 #undef CONFIG_SYS_I2C_SOFT     /* I2C bit-banged */
 /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SPEED           80000
@@ -176,7 +151,6 @@
 #define CONFIG_SYS_IMMR                CONFIG_SYS_MBAR
 
 /* DSPI and Serial Flash */
-#define CONFIG_CF_SPI
 #define CONFIG_CF_DSPI
 #define CONFIG_SERIAL_FLASH
 #define CONFIG_HARD_SPI
@@ -199,20 +173,6 @@
 
 #define CONFIG_PRAM                    2048    /* 2048 KB */
 
-#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
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
-/* Boot Argument Buffer Size    */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x10000)
 
 #define CONFIG_SYS_MBAR                0xFC000000
@@ -276,20 +236,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
@@ -328,24 +285,13 @@
 #ifdef CONFIG_CMD_JFFS2
 #define CONFIG_JFFS2_DEV               "nand0"
 #define CONFIG_JFFS2_PART_OFFSET       (0x800000)
-#define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT         "nand0=m54418twr.nand"
-
-#define MTDPARTS_DEFAULT       "mtdparts=m54418twr.nand:1m(data),"     \
-                                               "7m(kernel),"           \
-                                               "-(rootfs)"
 
 #endif
 
 #ifdef CONFIG_CMD_UBI
-#define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts command */
 #define CONFIG_MTD_PARTITIONS  /* mtdparts and UBI support */
-#define CONFIG_RBTREE
-#define MTDIDS_DEFAULT         "nand0=NAND"
-#define MTDPARTS_DEFAULT       "mtdparts=NAND:1m(u-boot),"     \
-                                       "-(ubi)"
 #endif
 /* Cache Configuration */
 #define CONFIG_SYS_CACHELINE_SIZE      16