nios2: Add support for compressed kernel

Signed-off-by: Ley Foon Tan <lftan@altera.com>

diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 2361acf6d2b1abb195c3f2daff5c64df88400a94..f77991ecfd8e181cbd82c1ed59dad0ae128b59b8 100644 (file)
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -134,6 +134,14 @@ config NIOS2_PASS_CMDLINE
          will override "Default kernel command string".
          Say N if you are unsure.
 
+config NIOS2_BOOT_LINK_OFFSET
+       hex "Link address offset for booting"
+       default "0x00500000"
+       help
+         This option allows you to set the link address offset of the zImage.
+         This can be useful if you are on a board which has a small amount of
+         memory.
+
 endmenu
 
 menu "Advanced setup"

diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
index 59392dc0bdcb3710908497f2ad5a1784017e5098..c899876320df331ce1b897148c9bf05f4f247a0f 100644 (file)
--- a/arch/nios2/boot/Makefile
+++ b/arch/nios2/boot/Makefile
@@ -24,6 +24,13 @@ $(obj)/vmImage: $(obj)/vmlinux.gz
        $(call if_changed,uimage)
        @$(kecho) 'Kernel: $@ is ready'
 
+$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
+       $(call if_changed,objcopy)
+       @$(kecho) 'Kernel: $@ is ready'
+
+$(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE
+       $(Q)$(MAKE) $(build)=$(obj)/compressed $@
+
 # Rule to build device tree blobs
 DTB_SRC := $(patsubst "%",%,$(CONFIG_NIOS2_DTB_SOURCE))
 

diff --cc arch/nios2/boot/compressed/Makefile
Simple merge

diff --cc arch/nios2/boot/compressed/console.c
Simple merge

diff --cc arch/nios2/boot/compressed/head.S
Simple merge

diff --cc arch/nios2/boot/compressed/misc.c
Simple merge

diff --cc arch/nios2/boot/compressed/vmlinux.lds.S
Simple merge

diff --cc arch/nios2/boot/compressed/vmlinux.scr
Simple merge