diff options
author | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:23:13 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:23:13 +0100 |
commit | e57ed96baca1222e6cd3d7032691a89d5890bb4a (patch) | |
tree | ce82b7473894c8336d786a5779c893e58085f989 /include/configs/M5329EVB.h | |
parent | 2468592d79891fea4f39d0a414c7316f3af03f4c (diff) | |
parent | 57a127201eb3d8cc19170a008e0bd7af608bd72f (diff) | |
download | u-boot-imx-e57ed96baca1222e6cd3d7032691a89d5890bb4a.zip u-boot-imx-e57ed96baca1222e6cd3d7032691a89d5890bb4a.tar.gz u-boot-imx-e57ed96baca1222e6cd3d7032691a89d5890bb4a.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Diffstat (limited to 'include/configs/M5329EVB.h')
-rw-r--r-- | include/configs/M5329EVB.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 47d74a3..e956739 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -213,7 +213,7 @@ #ifdef NANDFLASH_SIZE # define CFG_MAX_NAND_DEVICE 1 -# define CFG_NAND_BASE (CFG_CS2_BASE << 16) +# define CFG_NAND_BASE CFG_CS2_BASE # define CFG_NAND_SIZE 1 # define CFG_NAND_BASE_LIST { CFG_NAND_BASE } # define NAND_MAX_CHIPS 1 @@ -224,7 +224,7 @@ # define CONFIG_JFFS2_PART_OFFSET 0x00000000 #endif -#define CFG_FLASH_BASE (CFG_CS0_BASE << 16) +#define CFG_FLASH_BASE CFG_CS0_BASE /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash @@ -254,12 +254,12 @@ #define CFG_CS0_MASK 0x007f0001 #define CFG_CS0_CTRL 0x00001fa0 -#define CFG_CS1_BASE 0x1000 +#define CFG_CS1_BASE 0x10000000 #define CFG_CS1_MASK 0x001f0001 #define CFG_CS1_CTRL 0x002A3780 #ifdef NANDFLASH_SIZE -#define CFG_CS2_BASE 0x2000 +#define CFG_CS2_BASE 0x20000000 #define CFG_CS2_MASK ((NANDFLASH_SIZE << 20) | 1) #define CFG_CS2_CTRL 0x00001f60 #endif |