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

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

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index e6c87efef0308968cb9db55d318d2ee49a3e0763..2b816ceae2b94d69b064010026209cd5b167dc48 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -197,6 +197,7 @@
  */
 /* Initial Memory map for Linux */
 #define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTM_LEN           (CONFIG_SYS_SDRAM_SIZE << 20)
 
 /*-----------------------------------------------------------------------
  * FLASH organization
@@ -215,13 +216,12 @@
 #      define CONFIG_SYS_FLASH_PROTECTION      /* "Real" (hardware) sectors protection */
 #endif
 
-#define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE << 16)
+#define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_IS_EMBEDDED 1
 #ifdef NORFLASH_PS32BIT
 #      define CONFIG_ENV_OFFSET                (0x8000)
 #      define CONFIG_ENV_SIZE          0x4000
@@ -251,13 +251,13 @@
  * CS7 - Available
  */
 #ifdef NORFLASH_PS32BIT
-#      define CONFIG_SYS_CS0_BASE      0xFFC0
+#      define CONFIG_SYS_CS0_BASE      0xFFC00000
 #      define CONFIG_SYS_CS0_MASK      0x003f0001
-#      define CONFIG_SYS_CS0_CTRL      0x1D00
+#      define CONFIG_SYS_CS0_CTRL      0x00001D00
 #else
-#      define CONFIG_SYS_CS0_BASE      0xFFE0
+#      define CONFIG_SYS_CS0_BASE      0xFFE00000
 #      define CONFIG_SYS_CS0_MASK      0x001f0001
-#      define CONFIG_SYS_CS0_CTRL      0x1D80
+#      define CONFIG_SYS_CS0_CTRL      0x00001D80
 #endif
 
 #endif                         /* _M5329EVB_H */