diff options
-rw-r--r-- | arch/arm/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/Makefile.boot | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ed820e737a8a..eddcbba87c67 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -110,6 +110,8 @@ CHECKFLAGS += -D__arm__ | |||
110 | head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o | 110 | head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o |
111 | textofs-y := 0x00008000 | 111 | textofs-y := 0x00008000 |
112 | textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 | 112 | textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 |
113 | # We don't want the htc bootloader to corrupt kernel during resume | ||
114 | textofs-$(CONFIG_PM_H1940) := 0x00108000 | ||
113 | # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory | 115 | # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory |
114 | ifeq ($(CONFIG_ARCH_SA1100),y) | 116 | ifeq ($(CONFIG_ARCH_SA1100),y) |
115 | textofs-$(CONFIG_SA1111) := 0x00208000 | 117 | textofs-$(CONFIG_SA1111) := 0x00208000 |
diff --git a/arch/arm/mach-s3c2410/Makefile.boot b/arch/arm/mach-s3c2410/Makefile.boot index 7dab2a0325b5..58c1dd7f8e1d 100644 --- a/arch/arm/mach-s3c2410/Makefile.boot +++ b/arch/arm/mach-s3c2410/Makefile.boot | |||
@@ -1,3 +1,7 @@ | |||
1 | zreladdr-y := 0x30008000 | 1 | ifeq ($(CONFIG_PM_H1940),y) |
2 | params_phys-y := 0x30000100 | 2 | zreladdr-y := 0x30108000 |
3 | 3 | params_phys-y := 0x30100100 | |
4 | else | ||
5 | zreladdr-y := 0x30008000 | ||
6 | params_phys-y := 0x30000100 | ||
7 | endif | ||