kernel: update 3.14 to 3.14.18
[openwrt/openwrt.git] / target / linux / ipq806x / patches / 0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch
1 From 776fff11c1bf57e564a386521e56c277287a568c Mon Sep 17 00:00:00 2001
2 From: Kumar Gala <galak@codeaurora.org>
3 Date: Thu, 8 May 2014 13:40:16 -0500
4 Subject: [PATCH 132/182] XXX: Add boot support for u-boot.ipq image
5
6 ---
7 arch/arm/Makefile | 2 +-
8 arch/arm/boot/Makefile | 11 ++++++++++-
9 2 files changed, 11 insertions(+), 2 deletions(-)
10
11 --- a/arch/arm/Makefile
12 +++ b/arch/arm/Makefile
13 @@ -302,7 +302,7 @@ archprepare:
14 # Convert bzImage to zImage
15 bzImage: zImage
16
17 -BOOT_TARGETS = zImage Image xipImage bootpImage uImage
18 +BOOT_TARGETS = zImage Image xipImage bootpImage uImage uImage.ipq Image.gz
19 INSTALL_TARGETS = zinstall uinstall install
20
21 PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
22 --- a/arch/arm/boot/Makefile
23 +++ b/arch/arm/boot/Makefile
24 @@ -25,7 +25,7 @@ INITRD_PHYS := $(initrd_phys-y)
25
26 export ZRELADDR INITRD_PHYS PARAMS_PHYS
27
28 -targets := Image zImage xipImage bootpImage uImage
29 +targets := Image zImage xipImage bootpImage uImage uImage.ipq Image.gz
30
31 ifeq ($(CONFIG_XIP_KERNEL),y)
32
33 @@ -80,6 +80,15 @@ $(obj)/uImage: $(obj)/zImage FORCE
34 $(call if_changed,uimage)
35 @$(kecho) ' Image $@ is ready'
36
37 +$(obj)/uImage.ipq: $(obj)/Image.gz FORCE
38 + @$(check_for_multiple_loadaddr)
39 + $(call if_changed,uimage,gzip)
40 + @$(kecho) ' Image $@ is ready'
41 +
42 +$(obj)/Image.gz: $(obj)/Image FORCE
43 + $(call if_changed,gzip)
44 + @$(kecho) ' Image $@ is ready'
45 +
46 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
47 $(Q)$(MAKE) $(build)=$(obj)/bootp $@
48 @: