aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
committerLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
commite5441232a81d01e2ed46d88e340a30fd6b15b012 (patch)
treee008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch
parent048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff)
downloadupstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz
upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2
upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.zip
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch')
-rw-r--r--target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch b/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch
index c94c75abe2..c09c3a68f3 100644
--- a/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch
+++ b/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch
@@ -8,11 +8,9 @@ Subject: [PATCH 132/182] XXX: Add boot support for u-boot.ipq image
arch/arm/boot/Makefile | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
-diff --git a/arch/arm/Makefile b/arch/arm/Makefile
-index 51e5bed..e9fc731 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
-@@ -297,7 +297,7 @@ archprepare:
+@@ -302,7 +302,7 @@ archprepare:
# Convert bzImage to zImage
bzImage: zImage
@@ -21,8 +19,6 @@ index 51e5bed..e9fc731 100644
INSTALL_TARGETS = zinstall uinstall install
PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index ec2f806..3cbc83e 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -25,7 +25,7 @@ INITRD_PHYS := $(initrd_phys-y)
@@ -50,6 +46,3 @@ index ec2f806..3cbc83e 100644
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@:
---
-1.7.10.4
-