From b07872a9796d410bbff7d2750b19856f667f57f4 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 18 Feb 2015 13:35:46 +0000 Subject: [PATCH] at91: bump to v3.18 Signed-off-by: Your Name git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44489 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/at91/Makefile | 2 +- target/linux/at91/config-default | 5 +++++ .../linux/at91/{files-3.14 => files}/arch/arm/boot/dts/lmu5000.dts | 0 target/linux/at91/{files-3.14 => files}/drivers/mtd/at91part.c | 0 .../100-ARM-at91-build-dtb-for-LMU5000.patch | 0 .../at91/{patches-3.14 => patches}/805-free_some_portc_pins.patch | 0 .../901-AT91-flexibity-default-leds-to-heartbeat.patch | 0 target/linux/at91/sama5d3/config-default | 1 + 8 files changed, 7 insertions(+), 1 deletion(-) rename target/linux/at91/{files-3.14 => files}/arch/arm/boot/dts/lmu5000.dts (100%) rename target/linux/at91/{files-3.14 => files}/drivers/mtd/at91part.c (100%) rename target/linux/at91/{patches-3.14 => patches}/100-ARM-at91-build-dtb-for-LMU5000.patch (100%) rename target/linux/at91/{patches-3.14 => patches}/805-free_some_portc_pins.patch (100%) rename target/linux/at91/{patches-3.14 => patches}/901-AT91-flexibity-default-leds-to-heartbeat.patch (100%) 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 similarity index 100% rename from target/linux/at91/files-3.14/arch/arm/boot/dts/lmu5000.dts rename to 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 similarity index 100% rename from target/linux/at91/files-3.14/drivers/mtd/at91part.c rename to 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 similarity index 100% rename from target/linux/at91/patches-3.14/100-ARM-at91-build-dtb-for-LMU5000.patch rename to 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 similarity index 100% rename from target/linux/at91/patches-3.14/805-free_some_portc_pins.patch rename to 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 similarity index 100% rename from target/linux/at91/patches-3.14/901-AT91-flexibity-default-leds-to-heartbeat.patch rename to 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 -- 2.11.0