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

Commit 9d6b80fa authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: boot: Provide more uImage options 



Allow more compression algorithms as well as uncompressed uImage.bin
to be generated. An uncompressed image might be useful to rule out
problems in the decompression code in the bootloader or even speed
up the boot process at the expense of a bigger uImage file.

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9271/


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

arch/mips/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -298,7 +298,11 @@ boot-y += vmlinux.ecoff 
boot-y			+= vmlinux.srec

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

boot-y			+= uImage

boot-y			+= uImage.bin

boot-y			+= uImage.bz2

boot-y			+= uImage.gz

boot-y			+= uImage.lzma

boot-y			+= uImage.lzo

endif



# compressed boot image targets (arch/mips/boot/compressed/)
@@ -397,7 +401,11 @@ define archhelp 
	echo '  vmlinuz.bin          - Raw binary zboot image'

	echo '  vmlinuz.srec         - SREC zboot image'

	echo '  uImage               - U-Boot image'

	echo '  uImage.bin           - U-Boot image (uncompressed)'

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

	echo '  uImage.gz            - U-Boot image (gzip)'

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

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

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

	echo

	echo '  These will be default as appropriate for a configured platform.'

arch/mips/boot/Makefile

+47 −2
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ strip-flags := $(addprefix --remove-section=,$(drop-sections)) 


hostprogs-y := elf2ecoff



suffix-y			:= bin

suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2

suffix-$(CONFIG_KERNEL_GZIP)	:= gz

suffix-$(CONFIG_KERNEL_LZMA)	:= lzma

suffix-$(CONFIG_KERNEL_LZO)	:= lzo



targets := vmlinux.ecoff

quiet_cmd_ecoff = ECOFF	  $@

      cmd_ecoff = $(obj)/elf2ecoff $(VMLINUX) $@ $(e2eflag)
@@ -44,14 +50,53 @@ $(obj)/vmlinux.srec: $(VMLINUX) FORCE 
UIMAGE_LOADADDR  = $(VMLINUX_LOAD_ADDRESS)

UIMAGE_ENTRYADDR = $(VMLINUX_ENTRY_ADDRESS)



#

# Compressed vmlinux images

#



extra-y += vmlinux.bin.bz2

extra-y += vmlinux.bin.gz

extra-y += vmlinux.bin.lzma

extra-y += vmlinux.bin.lzo



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

	$(call if_changed,bzip2)



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

	$(call if_changed,gzip)



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

	$(call if_changed,lzma)



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

	$(call if_changed,lzo)



#

# Compressed u-boot images

#



targets += uImage

targets += uImage.bin

targets += uImage.bz2

targets += uImage.gz

targets += uImage.lzma

targets += uImage.lzo



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

	$(call if_changed,uimage,none)



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

	$(call if_changed,uimage,bzip2)



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

	$(call if_changed,uimage,gzip)



targets += uImage

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

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

	$(call if_changed,uimage,lzma)



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

	$(call if_changed,uimage,lzo)



$(obj)/uImage: $(obj)/uImage.$(suffix-y)

	@ln -sf $(notdir $<) $@

	@echo '  Image $@ is ready'