diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-10-26 17:16:04 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-15 00:15:08 -0500 |
commit | b2e8dbd20452ba3893e1b7cd006ef20168b43240 (patch) | |
tree | 010a75ecf8b8d388e48703e08149b0119ddc6b3a /arch | |
parent | 13a1320cf59023bda187a0bd5ad0cdee95beb9b1 (diff) |
Blackfin: add an uncompressed vmImage target
This is useful for quick tests where networks are faster than compression,
and/or the compression code is broken.
Reported-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/Makefile | 3 | ||||
-rw-r--r-- | arch/blackfin/boot/Makefile | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index f063b772934b..9507e21ac0ac 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
@@ -137,7 +137,7 @@ archclean: | |||
137 | 137 | ||
138 | INSTALL_PATH ?= /tftpboot | 138 | INSTALL_PATH ?= /tftpboot |
139 | boot := arch/$(ARCH)/boot | 139 | boot := arch/$(ARCH)/boot |
140 | BOOT_TARGETS = vmImage vmImage.bz2 vmImage.gz vmImage.lzma | 140 | BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma |
141 | PHONY += $(BOOT_TARGETS) install | 141 | PHONY += $(BOOT_TARGETS) install |
142 | KBUILD_IMAGE := $(boot)/vmImage | 142 | KBUILD_IMAGE := $(boot)/vmImage |
143 | 143 | ||
@@ -151,6 +151,7 @@ install: | |||
151 | 151 | ||
152 | define archhelp | 152 | define archhelp |
153 | echo '* vmImage - Alias to selected kernel format (vmImage.gz by default)' | 153 | echo '* vmImage - Alias to selected kernel format (vmImage.gz by default)' |
154 | echo ' vmImage.bin - Uncompressed Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bin)' | ||
154 | echo ' vmImage.bz2 - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)' | 155 | echo ' vmImage.bz2 - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)' |
155 | echo '* vmImage.gz - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)' | 156 | echo '* vmImage.gz - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)' |
156 | echo ' vmImage.lzma - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)' | 157 | echo ' vmImage.lzma - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)' |
diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile index fd9ccc5fea10..e9c48c6f8c1f 100644 --- a/arch/blackfin/boot/Makefile +++ b/arch/blackfin/boot/Makefile | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | MKIMAGE := $(srctree)/scripts/mkuboot.sh | 9 | MKIMAGE := $(srctree)/scripts/mkuboot.sh |
10 | 10 | ||
11 | targets := vmImage vmImage.bz2 vmImage.gz vmImage.lzma | 11 | targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma |
12 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma | 12 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma |
13 | 13 | ||
14 | quiet_cmd_uimage = UIMAGE $@ | 14 | quiet_cmd_uimage = UIMAGE $@ |
@@ -29,6 +29,9 @@ $(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE | |||
29 | $(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE | 29 | $(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE |
30 | $(call if_changed,lzma) | 30 | $(call if_changed,lzma) |
31 | 31 | ||
32 | $(obj)/vmImage.bin: $(obj)/vmlinux.bin | ||
33 | $(call if_changed,uimage,none) | ||
34 | |||
32 | $(obj)/vmImage.bz2: $(obj)/vmlinux.bin.bz2 | 35 | $(obj)/vmImage.bz2: $(obj)/vmlinux.bin.bz2 |
33 | $(call if_changed,uimage,bzip2) | 36 | $(call if_changed,uimage,bzip2) |
34 | 37 | ||
@@ -38,6 +41,7 @@ $(obj)/vmImage.gz: $(obj)/vmlinux.bin.gz | |||
38 | $(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma | 41 | $(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma |
39 | $(call if_changed,uimage,lzma) | 42 | $(call if_changed,uimage,lzma) |
40 | 43 | ||
44 | suffix-y := bin | ||
41 | suffix-$(CONFIG_KERNEL_GZIP) := gz | 45 | suffix-$(CONFIG_KERNEL_GZIP) := gz |
42 | suffix-$(CONFIG_KERNEL_BZIP2) := bz2 | 46 | suffix-$(CONFIG_KERNEL_BZIP2) := bz2 |
43 | suffix-$(CONFIG_KERNEL_LZMA) := lzma | 47 | suffix-$(CONFIG_KERNEL_LZMA) := lzma |