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

[u-boot] / include / configs / ZUMA.h

diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index b161dde2aa26b2b9f42c70aa1752b62c36630987..5350f619f8c43adb624e3fab2eaca65aebdbb9e8 100644 (file)
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -77,7 +77,6 @@
 
 #define CONFIG_MPSC_PORT       0
 
-#define CONFIG_NET_MULTI        /* attempt all available adapters */
 
 /* define this if you want to enable GT MAC filtering */
 #define CONFIG_GT_USE_MAC_HASH_TABLE
@@ -180,9 +179,8 @@
  * Definitions for initial stack pointer and data area
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_END        0x1000
-#define CONFIG_SYS_GBL_DATA_SIZE       128  /* size in bytes reserved for init data */
-#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)
 #define CONFIG_SYS_INIT_RAM_LOCK
 
 
@@ -389,12 +387,4 @@
  */
 #define CONFIG_GT_I2C
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                  */
-
 #endif /* __CONFIG_H */