diff options
Diffstat (limited to 'arch/sh/boot/compressed')
-rw-r--r-- | arch/sh/boot/compressed/Makefile | 6 | ||||
-rw-r--r-- | arch/sh/boot/compressed/head_32.S | 4 |
2 files changed, 10 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 | |||
14 | # | 14 | # |
15 | # IMAGE_OFFSET is the load offset of the compression loader | 15 | # IMAGE_OFFSET is the load offset of the compression loader |
16 | # | 16 | # |
17 | ifeq ($(CONFIG_32BIT),y) | ||
18 | IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ | ||
19 | $$[$(CONFIG_MEMORY_START) + \ | ||
20 | $(CONFIG_BOOT_LINK_OFFSET)]') | ||
21 | else | ||
17 | IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ | 22 | IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ |
18 | $$[$(CONFIG_PAGE_OFFSET) + \ | 23 | $$[$(CONFIG_PAGE_OFFSET) + \ |
19 | $(KERNEL_MEMORY) + \ | 24 | $(KERNEL_MEMORY) + \ |
20 | $(CONFIG_BOOT_LINK_OFFSET)]') | 25 | $(CONFIG_BOOT_LINK_OFFSET)]') |
26 | endif | ||
21 | 27 | ||
22 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) | 28 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |
23 | 29 | ||
diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S index 02a30935f0b9..200c1d4f1efe 100644 --- a/arch/sh/boot/compressed/head_32.S +++ b/arch/sh/boot/compressed/head_32.S | |||
@@ -97,7 +97,11 @@ init_stack_addr: | |||
97 | decompress_kernel_addr: | 97 | decompress_kernel_addr: |
98 | .long decompress_kernel | 98 | .long decompress_kernel |
99 | kernel_start_addr: | 99 | kernel_start_addr: |
100 | #ifdef CONFIG_32BIT | ||
101 | .long ___pa(_text+PAGE_SIZE) | ||
102 | #else | ||
100 | .long _text+PAGE_SIZE | 103 | .long _text+PAGE_SIZE |
104 | #endif | ||
101 | 105 | ||
102 | .align 9 | 106 | .align 9 |
103 | fake_headers_as_bzImage: | 107 | fake_headers_as_bzImage: |