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

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

diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 169ec34..505740c 100644 (file)
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -45,7 +45,7 @@
 
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_NO_DCACHE
-
+#define        CONFIG_SYS_TEXT_BASE    0x0
 /*
  * Hardware drivers
  */
@@ -117,7 +117,6 @@
  *
  */
 #define CONFIG_SYS_MALLOC_LEN          (128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128             /* size in bytes reserved for initial data */
 
 #define CONFIG_SYS_LONGHELP                            /* undef to save memory         */
 #define CONFIG_SYS_PROMPT              "uboot> "       /* Monitor Command Prompt       */
@@ -182,7 +181,7 @@
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define        CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_GBL_DATA_SIZE + PHYS_SDRAM_1)
+#define        CONFIG_SYS_INIT_SP_ADDR         (GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
 
 # if 0
 /* FIXME: switch to _documented_ registers */
@@ -471,6 +470,8 @@
 #define CONFIG_SYS_MDCNFG_VAL          0x09a909a9
 #define CONFIG_SYS_MDREFR_VAL          0x038ff030
 #define CONFIG_SYS_MDMRS_VAL           0x00220022
+#define        CONFIG_SYS_FLYCNFG_VAL          0x00000000
+#define        CONFIG_SYS_SXCNFG_VAL           0x00000000
 
 /*
  * PCMCIA and CF Interfaces