Merge branch 'master' of /home/wd/git/u-boot/master

[karo-tx-uboot.git] / include / configs / CU824.h

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 8e19aeb35cbe03a2d42bce4cb2a0fc9010e73341..77414abdac68c2bd211e7e3c19dafc8c8ff4dac5 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -139,13 +139,9 @@
  * Definitions for initial stack pointer and data area
  */
 
-       /* Size in bytes reserved for initial data
-        */
-#define CONFIG_SYS_GBL_DATA_SIZE    128
-
 #define CONFIG_SYS_INIT_RAM_ADDR     0x40000000
-#define CONFIG_SYS_INIT_RAM_END      0x1000
-#define CONFIG_SYS_GBL_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE      0x1000
+#define CONFIG_SYS_GBL_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * NS16550 Configuration
@@ -298,7 +294,6 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP
 #define CONFIG_TULIP_USE_IO