diff options
-rw-r--r-- | arch/blackfin/Kconfig | 1 | ||||
-rw-r--r-- | arch/blackfin/Makefile | 3 | ||||
-rw-r--r-- | arch/blackfin/boot/Makefile | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index de4bd432b439..0f63ed4fe143 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -32,6 +32,7 @@ config BLACKFIN | |||
32 | select HAVE_KERNEL_GZIP if RAMKERNEL | 32 | select HAVE_KERNEL_GZIP if RAMKERNEL |
33 | select HAVE_KERNEL_BZIP2 if RAMKERNEL | 33 | select HAVE_KERNEL_BZIP2 if RAMKERNEL |
34 | select HAVE_KERNEL_LZMA if RAMKERNEL | 34 | select HAVE_KERNEL_LZMA if RAMKERNEL |
35 | select HAVE_KERNEL_LZO if RAMKERNEL | ||
35 | select HAVE_OPROFILE | 36 | select HAVE_OPROFILE |
36 | select ARCH_WANT_OPTIONAL_GPIOLIB | 37 | select ARCH_WANT_OPTIONAL_GPIOLIB |
37 | 38 | ||
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 9d5ffaf5492a..3e65b0ffe084 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
@@ -140,7 +140,7 @@ archclean: | |||
140 | 140 | ||
141 | INSTALL_PATH ?= /tftpboot | 141 | INSTALL_PATH ?= /tftpboot |
142 | boot := arch/$(ARCH)/boot | 142 | boot := arch/$(ARCH)/boot |
143 | BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip | 143 | BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.lzo vmImage.xip |
144 | PHONY += $(BOOT_TARGETS) install | 144 | PHONY += $(BOOT_TARGETS) install |
145 | KBUILD_IMAGE := $(boot)/vmImage | 145 | KBUILD_IMAGE := $(boot)/vmImage |
146 | 146 | ||
@@ -158,6 +158,7 @@ define archhelp | |||
158 | echo ' vmImage.bz2 - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)' | 158 | echo ' vmImage.bz2 - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)' |
159 | echo '* vmImage.gz - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)' | 159 | echo '* vmImage.gz - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)' |
160 | echo ' vmImage.lzma - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)' | 160 | echo ' vmImage.lzma - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)' |
161 | echo ' vmImage.lzo - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzo)' | ||
161 | echo ' vmImage.xip - XIP Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.xip)' | 162 | echo ' vmImage.xip - XIP Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.xip)' |
162 | echo ' install - Install kernel using' | 163 | echo ' install - Install kernel using' |
163 | echo ' (your) ~/bin/$(INSTALLKERNEL) or' | 164 | echo ' (your) ~/bin/$(INSTALLKERNEL) or' |
diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile index d1b3d6051fdf..13d2dbd658e3 100644 --- a/arch/blackfin/boot/Makefile +++ b/arch/blackfin/boot/Makefile | |||
@@ -8,8 +8,8 @@ | |||
8 | 8 | ||
9 | MKIMAGE := $(srctree)/scripts/mkuboot.sh | 9 | MKIMAGE := $(srctree)/scripts/mkuboot.sh |
10 | 10 | ||
11 | targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip | 11 | targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.lzo vmImage.xip |
12 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xip | 12 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.xip |
13 | 13 | ||
14 | UIMAGE_OPTS-y := | 14 | UIMAGE_OPTS-y := |
15 | UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD) | 15 | UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD) |
@@ -33,6 +33,9 @@ $(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE | |||
33 | $(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE | 33 | $(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE |
34 | $(call if_changed,lzma) | 34 | $(call if_changed,lzma) |
35 | 35 | ||
36 | $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE | ||
37 | $(call if_changed,lzo) | ||
38 | |||
36 | # The mkimage tool wants 64bytes prepended to the image | 39 | # The mkimage tool wants 64bytes prepended to the image |
37 | quiet_cmd_mk_bin_xip = BIN $@ | 40 | quiet_cmd_mk_bin_xip = BIN $@ |
38 | cmd_mk_bin_xip = ( printf '%64s' | tr ' ' '\377' ; cat $< ) > $@ | 41 | cmd_mk_bin_xip = ( printf '%64s' | tr ' ' '\377' ; cat $< ) > $@ |
@@ -51,6 +54,9 @@ $(obj)/vmImage.gz: $(obj)/vmlinux.bin.gz | |||
51 | $(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma | 54 | $(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma |
52 | $(call if_changed,uimage,lzma) | 55 | $(call if_changed,uimage,lzma) |
53 | 56 | ||
57 | $(obj)/vmImage.lzo: $(obj)/vmlinux.bin.lzo | ||
58 | $(call if_changed,uimage,lzo) | ||
59 | |||
54 | $(obj)/vmImage.xip: $(obj)/vmlinux.bin.xip | 60 | $(obj)/vmImage.xip: $(obj)/vmlinux.bin.xip |
55 | $(call if_changed,uimage,none) | 61 | $(call if_changed,uimage,none) |
56 | 62 | ||
@@ -58,6 +64,7 @@ suffix-y := bin | |||
58 | suffix-$(CONFIG_KERNEL_GZIP) := gz | 64 | suffix-$(CONFIG_KERNEL_GZIP) := gz |
59 | suffix-$(CONFIG_KERNEL_BZIP2) := bz2 | 65 | suffix-$(CONFIG_KERNEL_BZIP2) := bz2 |
60 | suffix-$(CONFIG_KERNEL_LZMA) := lzma | 66 | suffix-$(CONFIG_KERNEL_LZMA) := lzma |
67 | suffix-$(CONFIG_KERNEL_LZO) := lzo | ||
61 | suffix-$(CONFIG_ROMKERNEL) := xip | 68 | suffix-$(CONFIG_ROMKERNEL) := xip |
62 | 69 | ||
63 | $(obj)/vmImage: $(obj)/vmImage.$(suffix-y) | 70 | $(obj)/vmImage: $(obj)/vmImage.$(suffix-y) |