diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-18 13:35:46 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-18 13:35:46 +0000 |
| commit | b77e03c4bf8e89f4b1f5bc7d3b9f478b67162e10 (patch) | |
| tree | f05495d6a9adf4b3e15e1fc0a173e98b25b4f700 /target/linux | |
| parent | e51055dc1dfc3426ac608ce8cd02a9fabb6a5ec1 (diff) | |
| download | upstream-b77e03c4bf8e89f4b1f5bc7d3b9f478b67162e10.tar.gz upstream-b77e03c4bf8e89f4b1f5bc7d3b9f478b67162e10.tar.bz2 upstream-b77e03c4bf8e89f4b1f5bc7d3b9f478b67162e10.zip | |
at91: bump to v3.18
Signed-off-by: Your Name <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44489 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/at91/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/at91/config-default | 5 | ||||
| -rw-r--r-- | target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts (renamed from target/linux/at91/files-3.14/arch/arm/boot/dts/lmu5000.dts) | 0 | ||||
| -rw-r--r-- | target/linux/at91/files/drivers/mtd/at91part.c (renamed from target/linux/at91/files-3.14/drivers/mtd/at91part.c) | 0 | ||||
| -rw-r--r-- | target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch (renamed from target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch) | 0 | ||||
| -rw-r--r-- | target/linux/at91/patches/805-free_some_portc_pins.patch (renamed from target/linux/at91/patches-3.14/805-free_some_portc_pins.patch) | 0 | ||||
| -rw-r--r-- | target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch (renamed from target/linux/at91/patches-3.14/901-AT91-flexibity-default-leds-to-heartbeat.patch) | 0 | ||||
| -rw-r--r-- | target/linux/at91/sama5d3/config-default | 1 |
8 files changed, 7 insertions, 1 deletions
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 27ee330026..040df33300 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 -KERNEL_PATCHVER:=3.14 +KERNEL_PATCHVER:=3.18 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default index 6ed83c8e74..89a9fc2147 100644 --- a/target/linux/at91/config-default +++ b/target/linux/at91/config-default @@ -171,6 +171,10 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINMUX=y +# CONFIG_PL310_ERRATA_588369 is not set +# CONFIG_PL310_ERRATA_727915 is not set +# CONFIG_PL310_ERRATA_753970 is not set +# CONFIG_PL310_ERRATA_769419 is not set # CONFIG_PREEMPT_RCU is not set CONFIG_PROC_DEVICETREE=y # CONFIG_RCU_STALL_COMMON is not set @@ -210,6 +214,7 @@ CONFIG_USB_ETH=y # CONFIG_USB_ETH_EEM is not set CONFIG_USB_ETH_RNDIS=y CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_XILINX is not set CONFIG_USB_LIBCOMPOSITE=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y diff --git a/target/linux/at91/files-3.14/arch/arm/boot/dts/lmu5000.dts b/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts index 921d44beec..921d44beec 100644 --- a/target/linux/at91/files-3.14/arch/arm/boot/dts/lmu5000.dts +++ b/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts diff --git a/target/linux/at91/files-3.14/drivers/mtd/at91part.c b/target/linux/at91/files/drivers/mtd/at91part.c index 31f3bbd69d..31f3bbd69d 100644 --- a/target/linux/at91/files-3.14/drivers/mtd/at91part.c +++ b/target/linux/at91/files/drivers/mtd/at91part.c diff --git a/target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch index e8cc68d13d..e8cc68d13d 100644 --- a/target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch +++ b/target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch diff --git a/target/linux/at91/patches-3.14/805-free_some_portc_pins.patch b/target/linux/at91/patches/805-free_some_portc_pins.patch index a9694d1f01..a9694d1f01 100644 --- a/target/linux/at91/patches-3.14/805-free_some_portc_pins.patch +++ b/target/linux/at91/patches/805-free_some_portc_pins.patch diff --git a/target/linux/at91/patches-3.14/901-AT91-flexibity-default-leds-to-heartbeat.patch b/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch index a97850ac91..a97850ac91 100644 --- a/target/linux/at91/patches-3.14/901-AT91-flexibity-default-leds-to-heartbeat.patch +++ b/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch diff --git a/target/linux/at91/sama5d3/config-default b/target/linux/at91/sama5d3/config-default index 2cdd3819b8..62aef01668 100644 --- a/target/linux/at91/sama5d3/config-default +++ b/target/linux/at91/sama5d3/config-default @@ -2,6 +2,7 @@ CONFIG_SOC_SAMA5=y # CONFIG_SOC_SAM_V4_V5 is not set CONFIG_SOC_SAM_V7=y CONFIG_SOC_SAMA5D3=y +CONFIG_SOC_SAMA5D4=y CONFIG_MACH_SAMA5_DT=y # CONFIG_ARM_LPAE is not set # CONFIG_ARM_THUMBEE is not set |