summaryrefslogtreecommitdiff
path: root/include/configs/M5282EVB.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-11-09 00:01:59 +0100
committerWolfgang Denk <wd@denx.de>2008-11-09 00:01:59 +0100
commitac4aeb1735404d2d331bd018e8c709e17c7392ad (patch)
tree00b8e8044f5b1d9e78b15ad116c1703854a08e64 /include/configs/M5282EVB.h
parent0829323073c505556ed5f5073f91adb504584d45 (diff)
parentc06d9bbbeb0416f189e841ffb214ada6194ed874 (diff)
downloadu-boot-imx-ac4aeb1735404d2d331bd018e8c709e17c7392ad.zip
u-boot-imx-ac4aeb1735404d2d331bd018e8c709e17c7392ad.tar.gz
u-boot-imx-ac4aeb1735404d2d331bd018e8c709e17c7392ad.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/configs/M5282EVB.h')
-rw-r--r--include/configs/M5282EVB.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index a8a2655..15590cf 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -165,7 +165,7 @@
*/
#define CONFIG_SYS_SDRAM_BASE 0x00000000
#define CONFIG_SYS_SDRAM_SIZE 16 /* SDRAM size in MB */
-#define CONFIG_SYS_FLASH_BASE 0xffe00000
+#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
#define CONFIG_SYS_INT_FLASH_BASE 0xf0000000
#define CONFIG_SYS_INT_FLASH_ENABLE 0x21
@@ -212,18 +212,10 @@
/*-----------------------------------------------------------------------
* Memory bank definitions
*/
-#define CONFIG_SYS_CS0_BASE CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_CS0_SIZE 2*1024*1024
-#define CONFIG_SYS_CS0_WIDTH 16
-#define CONFIG_SYS_CS0_RO 0
-#define CONFIG_SYS_CS0_WS 6
-/*
-#define CONFIG_SYS_CS3_BASE 0xE0000000
-#define CONFIG_SYS_CS3_SIZE 1*1024*1024
-#define CONFIG_SYS_CS3_WIDTH 16
-#define CONFIG_SYS_CS3_RO 0
-#define CONFIG_SYS_CS3_WS 6
-*/
+#define CONFIG_SYS_CS0_BASE 0xFFE00000
+#define CONFIG_SYS_CS0_CTRL 0x00001980
+#define CONFIG_SYS_CS0_MASK 0x001F0001
+
/*-----------------------------------------------------------------------
* Port configuration
*/