diff options
| author | Matt Fleming <matt@console-pimps.org> | 2010-04-24 13:34:44 +0100 |
|---|---|---|
| committer | Matt Fleming <matt@console-pimps.org> | 2010-04-25 20:44:23 +0100 |
| commit | 9c3d936352fefaadec57bafda1fe3807890cbf2c (patch) | |
| tree | c07b194d192d0f8f6b415870282460f6245e5ffe /arch/sh/boot | |
| parent | b161313ae8d9c64de589d1de72f975210ce37b48 (diff) | |
| download | linux-9c3d936352fefaadec57bafda1fe3807890cbf2c.tar.gz linux-9c3d936352fefaadec57bafda1fe3807890cbf2c.tar.bz2 linux-9c3d936352fefaadec57bafda1fe3807890cbf2c.zip | |
sh: Fix zImage load address when CONFIG_32BIT=y
We can't necessarily use the P1SEG region to access RAM when running in
32BIT mode, so use CONFIG_MEMORY_START as the base address.
Signed-off-by: Matt Fleming <matt@console-pimps.org>
Diffstat (limited to 'arch/sh/boot')
| -rw-r--r-- | arch/sh/boot/compressed/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile index 5d660b90943b..cfa5a087a886 100644 --- a/arch/sh/boot/compressed/Makefile +++ b/arch/sh/boot/compressed/Makefile @@ -14,10 +14,16 @@ OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o # # IMAGE_OFFSET is the load offset of the compression loader # +ifeq ($(CONFIG_32BIT),y) +IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ + $$[$(CONFIG_MEMORY_START) + \ + $(CONFIG_BOOT_LINK_OFFSET)]') +else IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ $$[$(CONFIG_PAGE_OFFSET) + \ $(KERNEL_MEMORY) + \ $(CONFIG_BOOT_LINK_OFFSET)]') +endif LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |