diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
| commit | e5441232a81d01e2ed46d88e340a30fd6b15b012 (patch) | |
| tree | e008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/at91 | |
| parent | 048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff) | |
| download | master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2 master-187ad058-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/at91')
| -rw-r--r-- | target/linux/at91/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch | 4 | ||||
| -rw-r--r-- | target/linux/at91/patches-3.14/700-tqma9263-support.patch | 16 |
3 files changed, 9 insertions, 13 deletions
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 1c96492dac..c7e67fec01 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Atmel AT91 FEATURES:=squashfs targz ext2 usb SUBTARGETS:=legacy sama5d3 -LINUX_VERSION:=3.14.16 +LINUX_VERSION:=3.14.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch index c631f8d588..e8cc68d13d 100644 --- a/target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch +++ b/target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch @@ -1,7 +1,7 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -23,6 +23,7 @@ dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb - dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb +@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb + dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb # sam9g45 dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb +dtb-$(CONFIG_ARCH_AT91) += lmu5000.dtb diff --git a/target/linux/at91/patches-3.14/700-tqma9263-support.patch b/target/linux/at91/patches-3.14/700-tqma9263-support.patch index fac71b43d6..5c042dacb9 100644 --- a/target/linux/at91/patches-3.14/700-tqma9263-support.patch +++ b/target/linux/at91/patches-3.14/700-tqma9263-support.patch @@ -1,8 +1,6 @@ -Index: linux-3.14.16/arch/arm/mach-at91/Kconfig.non_dt -=================================================================== ---- linux-3.14.16.orig/arch/arm/mach-at91/Kconfig.non_dt 2014-08-31 13:36:59.849640477 -0700 -+++ linux-3.14.16/arch/arm/mach-at91/Kconfig.non_dt 2014-08-31 13:36:59.845640477 -0700 -@@ -281,6 +281,12 @@ +--- a/arch/arm/mach-at91/Kconfig.non_dt ++++ b/arch/arm/mach-at91/Kconfig.non_dt +@@ -281,6 +281,12 @@ config MACH_AT91SAM9G10EK Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit. <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588> @@ -15,11 +13,9 @@ Index: linux-3.14.16/arch/arm/mach-at91/Kconfig.non_dt endif # ---------------------------------------------------------- -Index: linux-3.14.16/arch/arm/mach-at91/Makefile -=================================================================== ---- linux-3.14.16.orig/arch/arm/mach-at91/Makefile 2014-08-31 13:36:59.849640477 -0700 -+++ linux-3.14.16/arch/arm/mach-at91/Makefile 2014-08-31 13:37:27.125639720 -0700 -@@ -62,6 +62,7 @@ +--- a/arch/arm/mach-at91/Makefile ++++ b/arch/arm/mach-at91/Makefile +@@ -62,6 +62,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar # AT91SAM9263 board-specific support obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o |