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

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

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index c1295de..46595d9 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -78,8 +78,6 @@
 #define        CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
 #define CONFIG_ENV_SIZE_FLEX SZ_256K
 #define        CONFIG_SYS_MALLOC_LEN   (CONFIG_ENV_SIZE + SZ_1M)
-/* bytes reserved for initial data */
-#define        CONFIG_SYS_GBL_DATA_SIZE        128
 
 /*
  * Hardware drivers
@@ -88,7 +86,6 @@
 /*
  * SMC91c96 Etherent
  */
-#define CONFIG_NET_MULTI
 #define        CONFIG_LAN91C96
 #define        CONFIG_LAN91C96_BASE    (APOLLON_CS1_BASE+0x300)
 #define        CONFIG_LAN91C96_EXT_PHY
@@ -268,4 +265,8 @@
                                        "-(ubifs)"
 #endif
 
+#define PHYS_SRAM                      0x4020F800
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR        PHYS_SRAM
+
 #endif /* __CONFIG_H */