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

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

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 8105876e4ead49843dbf095548c1d60f48958bc8..50dd918385413186144b8619dd170f7a97532e05 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -52,11 +52,11 @@
 #define CONFIG_ETHPRIME
 #define CONFIG_IPADDR          192.168.30.1
 #define CONFIG_SERVERIP                192.168.1.1
-#define CONFIG_ROOTPATH
+#define CONFIG_ROOTPATH                ""
 #define CONFIG_GATEWAYIP       192.168.1.1
 #define CONFIG_NETMASK         255.255.0.0
 #define CONFIG_HOSTNAME                idmr
-#define CONFIG_BOOTFILE                /tftpboot/idmr/uImage
+#define CONFIG_BOOTFILE                "/tftpboot/idmr/uImage"
 #define CONFIG_PREBOOT         "echo;echo Type \\\"run flash_nfs\\\" to mount root " \
                                "filesystem over NFS; echo"
 
@@ -155,7 +155,6 @@
  */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
@@ -180,9 +179,8 @@
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x20000000
-#define CONFIG_SYS_INIT_RAM_END        0x1000  /* End of used area in internal SRAM */
-#define CONFIG_SYS_GBL_DATA_SIZE       64      /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000  /* Size of used area in internal SRAM */
+#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
 
 /*
@@ -225,9 +223,9 @@
 #define CONFIG_SYS_CACHELINE_SIZE      16
 
 #define ICACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_END - 8)
+                                        CONFIG_SYS_INIT_RAM_SIZE - 8)
 #define DCACHE_STATUS                  (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_END - 4)
+                                        CONFIG_SYS_INIT_RAM_SIZE - 4)
 #define CONFIG_SYS_ICACHE_INV          (CF_CACR_CINV | CF_CACR_INVI)
 #define CONFIG_SYS_CACHE_ACR0          (CONFIG_SYS_SDRAM_BASE | \
                                         CF_ADDRMASK(CONFIG_SYS_SDRAM_SIZE) | \