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

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

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index cf86735..f27466c 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -76,7 +76,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
@@ -328,8 +327,7 @@
 #endif
 
 
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#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
 
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE