target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch

   1 From 727d8f48ab606e44af8afee03b87f0cfdc1f8bf5 Mon Sep 17 00:00:00 2001
   2 From: Andrzej Zaborowski <balrog@zabor.org>
   3 Date: Wed, 2 Jul 2008 22:38:36 +0100
   4 Subject: [PATCH] Subject: [PATCH] Build fixes.
   5
   6 ---
   7  arch/arm/mach-s3c2442/Kconfig           |    3 ++-
   8  arch/arm/plat-s3c24xx/Kconfig           |    2 +-
   9  arch/arm/plat-s3c24xx/time.c            |    4 ++--
  10  include/asm-arm/arch-s3c2410/regs-dsc.h |    4 ++--
  11  include/asm-arm/kexec.h                 |    4 ++--
  12  include/linux/kexec.h                   |    3 ++-
  13  6 files changed, 11 insertions(+), 9 deletions(-)
  14
  15 diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
  16 index 6cc68a1..f9aa91c 100644
  17 --- a/arch/arm/mach-s3c2442/Kconfig
  18 +++ b/arch/arm/mach-s3c2442/Kconfig
  19 @@ -6,10 +6,11 @@
  20
  21  config CPU_S3C2442
  22         bool
  23 -       depends on ARCH_S3C2440
  24 +       depends on CPU_S3C2440
  25         select S3C2410_CLOCK
  26         select S3C2410_GPIO
  27         select S3C2410_PM if PM
  28 +       select S3C2440_DMA if S3C2410_DMA
  29         select CPU_S3C244X
  30         select CPU_LLSERIAL_S3C2440
  31         help
  32 diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
  33 index 7ee4b82..9e1691f 100644
  34 --- a/arch/arm/plat-s3c24xx/Kconfig
  35 +++ b/arch/arm/plat-s3c24xx/Kconfig
  36 @@ -16,7 +16,7 @@ if PLAT_S3C24XX
  37
  38  config CPU_S3C244X
  39         bool
  40 -       depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
  41 +       default y if CPU_S3C2440 || CPU_S3C2442
  42         help
  43           Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
  44
  45 diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
  46 index 6989eea..39fc33d 100644
  47 --- a/arch/arm/plat-s3c24xx/time.c
  48 +++ b/arch/arm/plat-s3c24xx/time.c
  49 @@ -202,12 +202,12 @@ static void s3c2410_timer_setup (void)
  50
  51                 pclk = clk_get_rate(clk);
  52
  53 -               printk("pclk = %d\n", pclk);
  54 +               printk("pclk = %lu\n", pclk);
  55
  56                 /* configure clock tick */
  57
  58                 timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
  59 -               printk("timer_usec_ticks = %d\n", timer_usec_ticks);
  60 +               printk("timer_usec_ticks = %lu\n", timer_usec_ticks);
  61
  62                 tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
  63                 tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
  64 diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h
  65 index c074851..f9d0c3d 100644
  66 --- a/include/asm-arm/arch-s3c2410/regs-dsc.h
  67 +++ b/include/asm-arm/arch-s3c2410/regs-dsc.h
  68 @@ -19,7 +19,7 @@
  69  #define S3C2412_DSC1      S3C2410_GPIOREG(0xe0)
  70  #endif
  71
  72 -#if defined(CONFIG_CPU_S3C2440)
  73 +#if defined(CONFIG_CPU_S3C244X)
  74
  75  #define S3C2440_DSC0      S3C2410_GPIOREG(0xc4)
  76  #define S3C2440_DSC1      S3C2410_GPIOREG(0xc8)
  77 @@ -178,7 +178,7 @@
  78  #define S3C2440_DSC1_CS0_4mA    (3<<0)
  79  #define S3C2440_DSC1_CS0_MASK   (3<<0)
  80
  81 -#endif /* CONFIG_CPU_S3C2440 */
  82 +#endif /* CONFIG_CPU_S3C244X */
  83
  84  #endif /* __ASM_ARCH_REGS_DSC_H */
  85
  86 diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
  87 index 1ee17b6..0fb508b 100644
  88 --- a/include/asm-arm/kexec.h
  89 +++ b/include/asm-arm/kexec.h
  90 @@ -1,8 +1,6 @@
  91  #ifndef _ARM_KEXEC_H
  92  #define _ARM_KEXEC_H
  93
  94 -#ifdef CONFIG_KEXEC
  95 -
  96  /* Maximum physical address we can use pages from */
  97  #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
  98  /* Maximum address we can reach in physical address mode */
  99 @@ -16,6 +14,8 @@
 100
 101  #define KEXEC_BOOT_PARAMS_SIZE 1536
 102
 103 +#ifdef CONFIG_KEXEC
 104 +
 105  #define KEXEC_ARM_ATAGS_OFFSET  0x1000
 106  #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
 107
 108 diff --git a/include/linux/kexec.h b/include/linux/kexec.h
 109 index 2d9c448..9f1a644 100644
 110 --- a/include/linux/kexec.h
 111 +++ b/include/linux/kexec.h
 112 @@ -1,7 +1,6 @@
 113  #ifndef LINUX_KEXEC_H
 114  #define LINUX_KEXEC_H
 115
 116 -#ifdef CONFIG_KEXEC
 117  #include <linux/types.h>
 118  #include <linux/list.h>
 119  #include <linux/linkage.h>
 120 @@ -11,6 +10,8 @@
 121  #include <linux/elf.h>
 122  #include <asm/kexec.h>
 123
 124 +#ifdef CONFIG_KEXEC
 125 +
 126  /* Verify architecture specific macros are defined */
 127
 128  #ifndef KEXEC_SOURCE_MEMORY_LIMIT
 129 --
 130 1.5.6.5
 131