Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccebb88a authored by Maarten ter Huurne's avatar Maarten ter Huurne Committed by Ralf Baechle
Browse files

MIPS: zboot: Add "uzImage.bin" target 



uzImage.bin is vmlinuz.bin wrapped in a legacy U-Boot image. Since
the extraction code is inside the image, it does not depend on the
boot loader to extract the kernel.

Signed-off-by: default avatarMaarten ter Huurne <maarten@treewalker.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14473/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0c744ea4

arch/mips/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -320,6 +320,9 @@ bootz-y := vmlinuz 
bootz-y			+= vmlinuz.bin

bootz-y			+= vmlinuz.ecoff

bootz-y			+= vmlinuz.srec

ifeq ($(shell expr $(zload-y) \< 0xffffffff80000000 2> /dev/null), 0)

bootz-y			+= uzImage.bin

endif



ifdef CONFIG_LASAT

rom.bin rom.sw: vmlinux
@@ -433,6 +436,7 @@ define archhelp 
	echo '  uImage.gz            - U-Boot image (gzip)'

	echo '  uImage.lzma          - U-Boot image (lzma)'

	echo '  uImage.lzo           - U-Boot image (lzo)'

	echo '  uzImage.bin          - U-Boot image (self-extracting)'

	echo '  dtbs                 - Device-tree blobs for enabled boards'

	echo '  dtbs_install         - Install dtbs to $(INSTALL_DTBS_PATH)'

	echo

arch/mips/boot/compressed/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ else 
VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \

		$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))

endif

UIMAGE_LOADADDR = $(VMLINUZ_LOAD_ADDRESS)



vmlinuzobjs-y += $(obj)/piggy.o
@@ -129,4 +130,7 @@ OBJCOPYFLAGS_vmlinuz.srec := $(OBJCOPYFLAGS) -S -O srec 
vmlinuz.srec: vmlinuz

	$(call cmd,objcopy)



uzImage.bin: vmlinuz.bin FORCE

	$(call if_changed,uimage,none)



clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}