From 09354571f1d9ba2054845e91fa135fe78299e68f Mon Sep 17 00:00:00 2001 From: Joonyoung Shim Date: Wed, 13 Jan 2010 13:40:47 +0900 Subject: [PATCH] s5p6442: smdk6442: fix compile error Signed-off-by: Joonyoung Shim --- cpu/arm1176/s5p64xx/timer.c | 2 +- drivers/mtd/onenand/samsung.c | 6 +++--- include/configs/smdk6442.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cpu/arm1176/s5p64xx/timer.c b/cpu/arm1176/s5p64xx/timer.c index a99af78..5a619a1 100644 --- a/cpu/arm1176/s5p64xx/timer.c +++ b/cpu/arm1176/s5p64xx/timer.c @@ -121,7 +121,7 @@ void set_timer(unsigned long t) } /* delay x useconds */ -void udelay(unsigned long usec) +void __udelay(unsigned long usec) { unsigned long tmo, tmp, now, until; diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index f2be687..cbcf83b 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_S5PC1XX) || defined(CONFIG_S5P64XX) #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_S5PC1XX) || defined(CONFIG_S5P64XX) 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_S5PC1XX) || defined(CONFIG_S5P64XX) onenand->base = (void *)0xE7100000; onenand->ahb_addr = (void *)0xB0000000; #endif diff --git a/include/configs/smdk6442.h b/include/configs/smdk6442.h index 4759983..9f544ae 100644 --- a/include/configs/smdk6442.h +++ b/include/configs/smdk6442.h @@ -222,6 +222,7 @@ /* base address for uboot */ #define CONFIG_SYS_PHY_UBOOT_BASE (CONFIG_SYS_SDRAM_BASE + 0x04800000) +#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_SDRAM_BASE + 0x04800000) /*----------------------------------------------------------------------- * Stack sizes -- 2.7.4