diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:03:22 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:03:22 +0200 |
commit | 09b4a9cf4003599f2cd609587dfa5f0b754640ed (patch) | |
tree | 768c7e70dc393814643ed7b7290ea8e33fa95ba3 /drivers/mtd/onenand/samsung.c | |
parent | 27130f133eda205b07d97b475a2ef96ec3f46b0f (diff) | |
parent | a87bc64cb4311323f592265541ced6ec9171d4d6 (diff) | |
download | u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.zip u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.gz u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'drivers/mtd/onenand/samsung.c')
-rw-r--r-- | drivers/mtd/onenand/samsung.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index f2be687..20b4912 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -67,7 +67,7 @@ do { \ #define MAP_01 (0x1 << 24) #define MAP_10 (0x2 << 24) #define MAP_11 (0x3 << 24) -#elif defined(CONFIG_S5PC1XX) +#elif defined(CONFIG_S5P) #define MAP_00 (0x0 << 26) #define MAP_01 (0x1 << 26) #define MAP_10 (0x2 << 26) @@ -121,7 +121,7 @@ static unsigned int s3c_mem_addr(int fba, int fpa, int fsa) { return (fba << 12) | (fpa << 6) | (fsa << 4); } -#elif defined(CONFIG_S5PC1XX) +#elif defined(CONFIG_S5P) static unsigned int s3c_mem_addr(int fba, int fpa, int fsa) { return (fba << 13) | (fpa << 7) | (fsa << 5); @@ -614,7 +614,7 @@ void s3c_onenand_init(struct mtd_info *mtd) #if defined(CONFIG_S3C64XX) onenand->base = (void *)0x70100000; onenand->ahb_addr = (void *)0x20000000; -#elif defined(CONFIG_S5PC1XX) +#elif defined(CONFIG_S5P) onenand->base = (void *)0xE7100000; onenand->ahb_addr = (void *)0xB0000000; #endif |