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

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

diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 2d9b0a878d18ecf742c0698ce30d1a10c16bacf3..bd6d9aef0a42bbf9e8b7d3ed7a4520ebd7d21f4e 100644 (file)
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -17,14 +17,12 @@
 /*
  * Memory configuration
  */
-#define CONFIG_SYS_TEXT_BASE           0xae000000
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 #define CONFIG_SYS_SDRAM_SIZE          0x80000000
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M   /* see armv7/start.S. */
-#define CONFIG_STACKSIZE               SZ_256K
 
 /* GPIO Driver */
 #define CONFIG_KONA_GPIO
@@ -81,15 +79,12 @@
 #define CONFIG_SYS_NS16550_COM1                0x3e000000
 
 /* must fit into GPT:u-boot-env partition */
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_OFFSET              (0x00011a00 * 512)
 #define CONFIG_ENV_SIZE                        (8 * 512)
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE              1024    /* Console buffer size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                       sizeof(CONFIG_SYS_PROMPT) + 16) /* Printbuffer size */
 #define CONFIG_SYS_MAXARGS             64
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
@@ -100,19 +95,12 @@
  */
 
 /* version string, parser, etc */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
 
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /* Initial upstream - boot to cmd prompt only */
 #define CONFIG_BOOTCOMMAND             ""
 
-/* Commands */
-#define CONFIG_FAT_WRITE
-
 #define CONFIG_USBID_ADDR              0x34052c46
 
 #endif /* __BCM28155_AP_H */