diff options
| author | Andrzej Zaborowski <balrog@zabor.org> | 2008-11-19 17:09:45 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:45 +0000 |
| commit | 414caf3e9799dd1647ba902d8c285ea85d61983b (patch) | |
| tree | dff2e798ade73017d2f4f723db4da2a480345104 /arch | |
| parent | b155417c6624894294bd972eb10e928c645043cb (diff) | |
Subject: [PATCH] Build fixes.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/kexec.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/time.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h index df15a0dc228..9fac2c3036e 100644 --- a/arch/arm/include/asm/kexec.h +++ b/arch/arm/include/asm/kexec.h @@ -1,8 +1,6 @@ #ifndef _ARM_KEXEC_H #define _ARM_KEXEC_H -#ifdef CONFIG_KEXEC - /* Maximum physical address we can use pages from */ #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL) /* Maximum address we can reach in physical address mode */ @@ -14,6 +12,10 @@ #define KEXEC_ARCH KEXEC_ARCH_ARM +#define KEXEC_BOOT_PARAMS_SIZE 1536 + +#ifdef CONFIG_KEXEC + #define KEXEC_ARM_ATAGS_OFFSET 0x1000 #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000 @@ -29,3 +31,4 @@ static inline void crash_setup_regs(struct pt_regs *newregs, #endif /* CONFIG_KEXEC */ #endif /* _ARM_KEXEC_H */ + diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 6cc68a142a7..f9aa91ce18f 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -6,10 +6,11 @@ config CPU_S3C2442 bool - depends on ARCH_S3C2440 + depends on CPU_S3C2440 select S3C2410_CLOCK select S3C2410_GPIO select S3C2410_PM if PM + select S3C2440_DMA if S3C2410_DMA select CPU_S3C244X select CPU_LLSERIAL_S3C2440 help diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index a986748860d..b0fe896440d 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig @@ -30,7 +30,7 @@ config S3C24XX_DCLK config CPU_S3C244X bool - depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) + default y if CPU_S3C2440 || CPU_S3C2442 help Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c index 410937f8c4b..c0de5e41eda 100644 --- a/arch/arm/plat-s3c24xx/time.c +++ b/arch/arm/plat-s3c24xx/time.c @@ -200,12 +200,12 @@ static void s3c2410_timer_setup (void) pclk = clk_get_rate(clk); - printk("pclk = %d\n", pclk); + printk("pclk = %lu\n", pclk); /* configure clock tick */ timer_usec_ticks = timer_mask_usec_ticks(6, pclk); - printk("timer_usec_ticks = %d\n", timer_usec_ticks); + printk("timer_usec_ticks = %lu\n", timer_usec_ticks); tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK; tcfg1 |= S3C2410_TCFG1_MUX4_DIV2; |