From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] Locate kernel at 0x30108000 if PM_H1940 is enabled
Date: Sat, 20 Mar 2010 20:20:07 +0200 [thread overview]
Message-ID: <1269109209-26237-3-git-send-email-anarsoul@gmail.com> (raw)
In-Reply-To: <1269109209-26237-1-git-send-email-anarsoul@gmail.com>
If PM_H1940 is enabled, kernel _must_ be located upper then 0x30008000,
because this area (0x30000000-0x30100000) can be used by bootloader. If kernel
is located at 0x30008000, bootloader will corrupt kernel's code during
resume.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm/Makefile | 2 ++
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 2703222..58e4d8e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -110,6 +110,8 @@ CHECKFLAGS += -D__arm__
head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
textofs-y := 0x00008000
textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
+# We don't want the htc bootloader to corrupt kernel during resume
+textofs-$(CONFIG_PM_H1940) := 0x00108000
# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory
ifeq ($(CONFIG_ARCH_SA1100),y)
textofs-$(CONFIG_SA1111) := 0x00208000
diff --git a/arch/arm/mach-s3c2410/Makefile.boot b/arch/arm/mach-s3c2410/Makefile.boot
index 7dab2a0..58c1dd7 100644
--- a/arch/arm/mach-s3c2410/Makefile.boot
+++ b/arch/arm/mach-s3c2410/Makefile.boot
@@ -1,3 +1,7 @@
- zreladdr-y := 0x30008000
-params_phys-y := 0x30000100
-
+ifeq ($(CONFIG_PM_H1940),y)
+ zreladdr-y := 0x30108000
+ params_phys-y := 0x30100100
+else
+ zreladdr-y := 0x30008000
+ params_phys-y := 0x30000100
+endif
--
1.7.0.2
next prev parent reply other threads:[~2010-03-20 18:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-20 18:20 [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick
2010-03-20 18:20 ` [PATCH 1/4] Add HP iPAQ RX1950 machine support Vasily Khoruzhick
2010-03-21 22:42 ` denis grigoriev
2010-03-20 18:20 ` Vasily Khoruzhick [this message]
2010-03-20 18:20 ` [PATCH 3/4] s3c244x: configure GPG13-15 as input before suspend Vasily Khoruzhick
2010-03-31 1:13 ` Ben Dooks
2010-03-31 6:15 ` Vasily Khoruzhick
2010-03-20 18:20 ` [PATCH 4/4] Add suspend/resume support for RX1950 Vasily Khoruzhick
2010-03-25 6:28 ` [PATCH 0/4] HP iPAQ RX1950 patch series Vasily Khoruzhick
2010-03-29 7:58 ` Vasily Khoruzhick
2010-03-31 1:15 ` Ben Dooks
2010-03-31 6:38 ` Vasily Khoruzhick
2010-04-01 12:45 ` Vasily Khoruzhick
2010-04-12 19:38 ` Vasily Khoruzhick
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1269109209-26237-3-git-send-email-anarsoul@gmail.com \
--to=anarsoul@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).