uImage: Allow to specify MKIMAGE
Subsystems (4)
PATCH 1/1 uImage: Allow to specify MKIMAGE
Signed-off-by Paulius Zaleckas <[email protected]>
---
arch/arm/boot/Makefile | 4 ++-- arch/avr32/boot/images/Makefile | 4 ++-- arch/blackfin/boot/Makefile | 4 ++-- arch/microblaze/boot/Makefile | 4 ++-- arch/sh/boot/Makefile | 4 ++-- scripts/mkuboot.sh | 1 + 6 files changed, 11 insertions(+), 10 deletions(-)
arch/arm/boot/Makefile +2 -2
@@ -11,7 +11,7 @@ # Copyright (C) 1995-2002 Russell King # -MKIMAGE := $(srctree)/scripts/mkuboot.sh +MKIMAGE := $(CONFIG_SHELL) $(srctree)/scripts/mkuboot.sh ifneq ($(MACHINE),) include $(srctree)/$(MACHINE)/Makefile.boot
@@ -60,7 +60,7 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE endif quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \ + cmd_uimage = $(MKIMAGE) -A arm -O linux -T kernel \ -C none -a $(LOADADDR) -e $(STARTADDR) \ -n 'Linux-$(KERNELRELEASE)' -d $< $@
arch/avr32/boot/images/Makefile +2 -2
@@ -6,7 +6,7 @@ # for more details. # -MKIMAGE := $(srctree)/scripts/mkuboot.sh +MKIMAGE := $(CONFIG_SHELL) $(srctree)/scripts/mkuboot.sh extra-y := vmlinux.bin vmlinux.gz
@@ -18,7 +18,7 @@ $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE $(call if_changed,gzip) quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A avr32 -O linux -T kernel \ + cmd_uimage = $(MKIMAGE) -A avr32 -O linux -T kernel \ -C gzip -a $(CONFIG_LOAD_ADDRESS) -e $(CONFIG_ENTRY_ADDRESS) \ -n 'Linux-$(KERNELRELEASE)' -d $< $@
arch/blackfin/boot/Makefile +2 -2
@@ -6,7 +6,7 @@ # for more details. # -MKIMAGE := $(srctree)/scripts/mkuboot.sh +MKIMAGE := $(CONFIG_SHELL) $(srctree)/scripts/mkuboot.sh targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xip
@@ -16,7 +16,7 @@ UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD) UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \ + cmd_uimage = $(MKIMAGE) -A $(ARCH) -O linux -T kernel \ -C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' \ -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \ $(UIMAGE_OPTS-y) -d $< $@
arch/microblaze/boot/Makefile +2 -2
@@ -2,7 +2,7 @@ # arch/microblaze/boot/Makefile # -MKIMAGE := $(srctree)/scripts/mkuboot.sh +MKIMAGE := $(CONFIG_SHELL) $(srctree)/scripts/mkuboot.sh obj-y += linked_dtb.o
@@ -40,7 +40,7 @@ quiet_cmd_strip = STRIP $@ cmd_strip = $(STRIP) -K _start -K _end -K __log_buf -K _fdt_start vmlinux -o $@ quiet_cmd_uimage = UIMAGE [email protected] - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A microblaze -O linux -T kernel \ + cmd_uimage = $(MKIMAGE) -A microblaze -O linux -T kernel \ -C none -n 'Linux-$(KERNELRELEASE)' \ -a $(CONFIG_KERNEL_BASE_ADDR) -e $(CONFIG_KERNEL_BASE_ADDR) \ -d $@ [email protected]
arch/sh/boot/Makefile +2 -2
@@ -8,7 +8,7 @@ # Copyright (C) 1999 Stuart Menefy # -MKIMAGE := $(srctree)/scripts/mkuboot.sh +MKIMAGE := $(CONFIG_SHELL) $(srctree)/scripts/mkuboot.sh # # Assign safe dummy values if these variables are not defined,
@@ -60,7 +60,7 @@ KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \ $(CONFIG_ZERO_PAGE_OFFSET) + $(CONFIG_ENTRY_OFFSET)]') quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ + cmd_uimage = $(MKIMAGE) -A sh -O linux -T kernel \ -C $(2) -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \ -n 'Linux-$(KERNELRELEASE)' -d $< $@
scripts/mkuboot.sh +1 -0
@@ -11,6 +11,7 @@ if [ -z "${MKIMAGE}" ]; then if [ -z "${MKIMAGE}" ]; then # Doesn't exist echo '"mkimage" command not found - U-Boot images will not be built' >&2 + echo 'You can use MKIMAGE to specify path (eg. MKIMAGE=/tmp/mkimage)' >&2 exit 0; fi fi
Quoted 14 lines · Paulius Zaleckas
arch/blackfin/boot/Makefile +0
-0@@ -6,7 +6,7 @@?# for more details.
?#arch/blackfin/boot/Makefile +1
-1-MKIMAGE := $(srctree)/scripts/mkuboot.sh +MKIMAGE := $(CONFIG_SHELL) $(srctree)/scripts/mkuboot.sh?targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip ?extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xip
arch/blackfin/boot/Makefile +0
-0@@ -16,7 +16,7 @@ UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD)?UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x
Quoted 6 lines
?quiet_cmd_uimage = UIMAGE ?$@
- ? ? ?cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \
+ ? ? ?cmd_uimage = $(MKIMAGE) -A $(ARCH) -O linux -T kernel \
? ? ? ? ? ? ? ? ? ?-C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' \
? ? ? ? ? ? ? ? ? ?-e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \
? ? ? ? ? ? ? ? ? ?$(UIMAGE_OPTS-y) -d $< $@
looks straightforward, and doesnt matter to me, so
Acked-by Mike Frysinger <[email protected]>
-mike
Quoted 11 lines · Paulius Zaleckas
Signed-off-by Paulius Zaleckas <[email protected]>---
arch/arm/boot/Makefile | 4 ++-- arch/avr32/boot/images/Makefile | 4 ++-- arch/blackfin/boot/Makefile | 4 ++-- arch/microblaze/boot/Makefile | 4 ++-- arch/sh/boot/Makefile | 4 ++-- scripts/mkuboot.sh | 1 + 6 files changed, 11 insertions(+), 10 deletions(-)
Acked-by Paul Mundt <[email protected]>
Quoted 11 lines · Paulius Zaleckas
Signed-off-by Paulius Zaleckas <[email protected]>---
arch/arm/boot/Makefile | 4 ++-- arch/avr32/boot/images/Makefile | 4 ++-- arch/blackfin/boot/Makefile | 4 ++-- arch/microblaze/boot/Makefile | 4 ++-- arch/sh/boot/Makefile | 4 ++-- scripts/mkuboot.sh | 1 + 6 files changed, 11 insertions(+), 10 deletions(-)
Acked-by Michal Simek <[email protected]>
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian