Commit 538067c8 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: add support for bzip2/lzma compressed kernel images 



Since U-Boot can support these compression types, add appropriate targets
to the Blackfin boot files.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent bac7d89e

arch/blackfin/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ config RWSEM_XCHGADD_ALGORITHM 
config BLACKFIN

	def_bool y

	select HAVE_IDE

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_OPROFILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

arch/blackfin/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ archclean: 


INSTALL_PATH ?= /tftpboot

boot := arch/$(ARCH)/boot

BOOT_TARGETS = vmImage

BOOT_TARGETS = vmImage vmImage.bz2 vmImage.gz vmImage.lzma

PHONY += $(BOOT_TARGETS) install

KBUILD_IMAGE := $(boot)/vmImage
@@ -150,7 +150,10 @@ install: 
	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install



define archhelp

  echo  '* vmImage         - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage)'

  echo  '* vmImage         - Alias to selected kernel format (vmImage.gz by default)'

  echo  '  vmImage.bz2     - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'

  echo  '* vmImage.gz      - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'

  echo  '  vmImage.lzma    - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'

  echo  '  install         - Install kernel using'

  echo  '                     (your) ~/bin/$(CROSS_COMPILE)installkernel or'

  echo  '                     (distribution) PATH: $(CROSS_COMPILE)installkernel or'

arch/blackfin/boot/.gitignore

+2 −1
Original line number Diff line number Diff line 
+vmImage
 
vmImage*

vmlinux*

arch/blackfin/boot/Makefile

+24 −7
Original line number Diff line number Diff line
@@ -8,24 +8,41 @@ 


MKIMAGE := $(srctree)/scripts/mkuboot.sh



targets := vmImage

extra-y += vmlinux.bin vmlinux.gz

targets := vmImage vmImage.bz2 vmImage.gz vmImage.lzma

extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma



quiet_cmd_uimage = UIMAGE  $@

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

                   -C gzip -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \

                   -C $(2) -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \

                   -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \

                   -d $< $@



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



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

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

	$(call if_changed,gzip)



$(obj)/vmImage: $(obj)/vmlinux.gz

	$(call if_changed,uimage)

	@$(kecho) 'Kernel: $@ is ready'

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

	$(call if_changed,bzip2)



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

	$(call if_changed,lzma)



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

	$(call if_changed,uimage,bzip2)



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

	$(call if_changed,uimage,gzip)



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

	$(call if_changed,uimage,lzma)



suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

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

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



install:

	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"