Merge branch 'master' of git://git.denx.de/u-boot-video

[platform/kernel/u-boot.git] / include / configs / BMW.h

diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index 7d928eb..e1951eb 100644 (file)
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -49,9 +49,6 @@
 
 #define        CONFIG_MISC_INIT_F      1       /* Use misc_init_f()                    */
 
-#define CONFIG_BCM570x         1       /* Use Broadcom BCM570x Ethernet Driver */
-#define        CONFIG_TIGON3           1
-
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                9600
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
@@ -84,6 +81,8 @@
 
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
 
 
 #if 0
@@ -150,9 +149,8 @@
  * Definitions for initial stack pointer and data area
  */
 #define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_MONITOR_LEN
-#define CONFIG_SYS_INIT_RAM_END   0x2F00  /* End of used area in DPRAM  */
-#define CONFIG_SYS_GBL_DATA_SIZE  128  /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE   0x2F00  /* Size of used area in DPRAM  */
+#define CONFIG_SYS_GBL_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET  CONFIG_SYS_GBL_DATA_OFFSET
 
 /*