Commit 453ec9c1 authored by Thomas Betker's avatar Thomas Betker Committed by Paul Mundt
Browse files

sh: Fix up uImage target entry point. 



This patch changes the uImage target so that it generates a wrapped
compressed vmlinux, rather than a wrapped zImage. The previous version
matched the ARM, this version matches the PPC. However I would question
how useful a self decompressing image is with a boot loader which does
decompression, so I think this is more useful. I also feel it matches
the descrition in the help text ("Compressed kernel image") better.

Signed-off-by: default avatarThomas Betker <thomas.betker@5etech.eu>
Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0fb19dcb

arch/sh/boot/Makefile

+15 −4
Original line number Diff line number Diff line
@@ -35,17 +35,27 @@ $(obj)/compressed/vmlinux: FORCE 
KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%8x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(CONFIG_MEMORY_START) + \

			$(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')

			$(CONFIG_ZERO_PAGE_OFFSET)]')



KERNEL_ENTRY	:= $(shell /bin/bash -c 'printf "0x%8x" \

		     $$[$(KERNEL_LOAD)+0x1000]')





quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \

		   -C none -a $(KERNEL_LOAD) -e $(KERNEL_LOAD) \

		   -C none -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \

		   -n 'Linux-$(KERNELRELEASE)' -d $< $@



$(obj)/uImage: $(obj)/zImage FORCE

$(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,uimage)

	@echo '  Image $@ is ready'



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec

$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux

	$(call if_changed,objcopy)
@@ -54,4 +64,5 @@ OBJCOPYFLAGS_uImage.srec := -I binary -O srec 
$(obj)/uImage.srec: $(obj)/uImage

	$(call if_changed,objcopy)



clean-files	+= uImage uImage.srec vmlinux.srec
 
clean-files	+= uImage uImage.srec vmlinux.srec \

		   vmlinux.bin vmlinux.bin.gz

CRA Git | Maintained and supported by SUSTech CRA and CCSE