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

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

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index f012af547fc85a0d1632ec2a74184164616a53b2..6e024d1b2fd8282e2ebb3e246afdcc8f876f12ac 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -29,7 +29,6 @@
 #define CONFIG_CMDLINE_TAG             1
 #define CONFIG_INITRD_TAG              1
 #define CONFIG_SETUP_MEMORY_TAGS       1
-#define CONFIG_BOOTARGS                "root=/dev/nfs console=ttyAM0,115200 ip=dhcp"
 #define CONFIG_BOOTFILE                "edb93xx.img"
 
 #define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
@@ -76,19 +75,10 @@
 #define CONFIG_SYS_CLK_FREQ    14745600        /* EP93xx has a 14.7456 clock */
 
 /* Monitor configuration */
-#undef CONFIG_CMD_DATE
-#define CONFIG_CMD_JFFS2
 
-#define CONFIG_SYS_LONGHELP                    /* Enable "long" help in mon */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O buffer size */
-/* Print buffer size */
-#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-/* Boot argument buffer size */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_MAXARGS     16              /* Max number of command args */
 
 /* Serial port hardware configuration */
-#define CONFIG_PL010_SERIAL
 #define CONFIG_CONS_INDEX              0
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, \
                         115200, 230400}
@@ -192,7 +182,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      (256+8)
 
-#define CONFIG_SYS_TEXT_BASE           0x60000000
 #define PHYS_FLASH_1                   CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
 
@@ -200,7 +189,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
 
 #define CONFIG_ENV_OVERWRITE           /* Vendor params unprotected */
-#define CONFIG_ENV_IS_IN_FLASH
 
 #define CONFIG_ENV_ADDR                        0x60040000
 #define CONFIG_ENV_ADDR_REDUND         (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)