Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin

[oweals/u-boot.git] / include / configs / EVB64260.h

diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index 94ab1c93e67674c4d4117c06c227a26b78d98eea..b90540295b23b21417a35365b4bb5b471b89ac82 100644 (file)
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -43,6 +43,7 @@
 #define CONFIG_SYS_GT_6426x        GT_64260 /* with a 64260 system controller */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff00000
+#define        CONFIG_SYS_LDSCRIPT     "board/evb64260/u-boot.lds"
 
 #define CONFIG_BAUDRATE                38400   /* console baudrate = 38400     */
 
@@ -77,7 +78,6 @@
 #define        CONFIG_MPSC
 #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
@@ -163,8 +163,7 @@
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #define        CONFIG_SYS_INIT_RAM_SIZE        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_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_RAM_LOCK