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

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

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index dfe7802119f7df75ac519b53f23f3ef3d55738c6..0d53e51b9d5568471eeba37779ede66258e03ce7 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -64,10 +64,9 @@
 #define CONFIG_SYS_TEMP_STACK_OCM  1
 #define CONFIG_SYS_OCM_DATA_ADDR   CONFIG_SYS_ISRAM_BASE
 #define CONFIG_SYS_INIT_RAM_ADDR   CONFIG_SYS_ISRAM_BASE  /* Initial RAM address       */
-#define CONFIG_SYS_INIT_RAM_END    0x2000          /* End of used area in RAM  */
-#define CONFIG_SYS_GBL_DATA_SIZE   128             /* num bytes initial data   */
+#define CONFIG_SYS_INIT_RAM_SIZE    0x2000         /* Size of used area in RAM */
 
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - 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 - 0x4)
 
 #define CONFIG_SYS_MONITOR_LEN     (256 * 1024)    /* Reserve 256 kB for Mon   */
@@ -207,7 +206,6 @@
 
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_PHY_ADDR                0x02    /* dummy setting, no EMAC0 used */
 #define CONFIG_PHY1_ADDR       0x03    /* dummy setting, no EMAC1 used */
 #define CONFIG_PHY2_ADDR       0x01    /* PHY address for EMAC2        */