ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled (c4761b69) · Commits · 戴 / test

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> Signed-off-by:

Ben Dooks <ben-linux@fluff.org>

arch/arm/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/mach-s3c2410/Makefile.boot

+7 −3

Original line number	Diff line number	Diff line
		ifeq ($(CONFIG_PM_H1940),y)
		zreladdr-y := 0x30108000
		params_phys-y := 0x30100100
		else
		zreladdr-y := 0x30008000
		params_phys-y := 0x30000100

		endif

Admin message