Update AT91 kernel to 3.10.34

From 2064e6d069ec8df7f5e988547fe7f2a1a7ad890f Mon Sep 17 00:00:00 2001
From: Owen Kirby <osk@exegin.com>
Date: Thu, 10 Apr 2014 19:02:15 -0700
Subject: [PATCH 1/3] [at91]  Update AT91 kernel to 3.10.34.

This patch updates the kernel of the AT91 target to version 3.10.34.

Signed-off-by: Owen Kirby <osk@exegin.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40596 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 38 insertions, 22 deletions

diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index 3dac8a4ee4..8340d2aa8c 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -13,7 +13,7 @@ BOARDNAME:=Atmel AT91
 FEATURES:=squashfs targz ext2 usb
 CPU_TYPE:=arm926ej-s
 
-LINUX_VERSION:=3.8.13
+LINUX_VERSION:=3.10.36
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default
index 5d33472f12..92f3893f4a 100644
--- a/target/linux/at91/config-default
+++ b/target/linux/at91/config-default
@@ -18,7 +18,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_VT8500_SINGLE is not set
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
@@ -33,9 +32,9 @@ CONFIG_AT91_PMC_UNIT=y
 CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
 CONFIG_AT91_SAM9G45_RESET=y
 CONFIG_AT91_SAM9_ALT_RESET=y
+CONFIG_AT91_SAM9_TIME=y
 CONFIG_AT91_TIMER_HZ=100
 CONFIG_ATAGS=y
-# CONFIG_ATMEL_SSC is not set
 # CONFIG_ATMEL_TCLIB is not set
 # CONFIG_BLK_DEV is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -43,6 +42,7 @@ CONFIG_ATAGS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLONE_BACKWARDS=y
+CONFIG_CONFIGFS_FS=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5TJ=y
 CONFIG_CPU_ARM926T=y
@@ -58,9 +58,6 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CRC16=y
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
-# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -76,7 +73,7 @@ CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -84,13 +81,14 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_AOUT=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
@@ -98,8 +96,10 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_AT91_DBGU0=y
 CONFIG_HAVE_AT91_DBGU1=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -112,7 +112,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
-CONFIG_HAVE_IRQ_WORK=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
@@ -126,15 +126,19 @@ CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
+CONFIG_HZ_PERIODIC=y
+CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_WORK=y
 # CONFIG_ISDN is not set
 CONFIG_JBD2=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_KTIME_SCALAR=y
-# CONFIG_LEDS_ATMEL_PWM is not set
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE=y
+CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MACB=y
-CONFIG_MACH_AT91SAM_DT=y
+CONFIG_MACH_AT91SAM9_DT=y
 CONFIG_MDIO_BOARDINFO=y
 # CONFIG_MII is not set
 CONFIG_MMC=y
@@ -144,17 +148,19 @@ CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ATMEL=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_KUSER_HELPERS=y
 CONFIG_NEED_MACH_GPIO_H=y
 CONFIG_NEED_PER_CPU_KM=y
-CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NLS=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
@@ -166,10 +172,11 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_MTD=y
 CONFIG_OF_NET=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
-CONFIG_PERCPU_RWSEM=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
 CONFIG_PINCONF=y
@@ -178,10 +185,13 @@ CONFIG_PINCTRL_AT91=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINMUX=y
 # CONFIG_PREEMPT_RCU is not set
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_RCU_STALL_COMMON is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_AT91RM9200 is not set
 # CONFIG_RTC_DRV_AT91SAM9 is not set
 # CONFIG_RTC_DRV_CMOS is not set
+CONFIG_SCHED_HRTICK=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ATMEL=y
@@ -197,6 +207,8 @@ CONFIG_SOC_AT91SAM9G45=y
 CONFIG_SOC_AT91SAM9N12=y
 CONFIG_SOC_AT91SAM9RL=y
 CONFIG_SOC_AT91SAM9X5=y
+CONFIG_SOC_SAM_V4_V5=y
+# CONFIG_SOC_SAM_V7 is not set
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
 CONFIG_SPI_ATMEL=y
@@ -208,6 +220,7 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_UID16=y
 CONFIG_UIDGID_CONVERTED=y
+CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 # CONFIG_USB_ARCH_HAS_XHCI is not set
 CONFIG_USB_AT91=y
 CONFIG_USB_COMMON=y
@@ -220,9 +233,12 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VFP is not set
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WLAN is not set
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch
index e6c4c7231a..c631f8d588 100644
--- a/target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch
+++ b/target/linux/at91/patches/100-ARM-at91-build-dtb-for-LMU5000.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
+@@ -23,6 +23,7 @@ dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
  dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
  # sam9g45
  dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
diff --git a/target/linux/at91/patches/700-tqma9263-support.patch b/target/linux/at91/patches/700-tqma9263-support.patch
index 4db1ff89a1..d249783a3e 100644
--- a/target/linux/at91/patches/700-tqma9263-support.patch
+++ b/target/linux/at91/patches/700-tqma9263-support.patch
@@ -1,8 +1,8 @@
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -358,6 +358,12 @@ config MACH_NEOCORE926
- 	help
- 	  Select this if you are using the Adeneo Neocore 926 board.
+--- a/arch/arm/mach-at91/Kconfig.non_dt
++++ b/arch/arm/mach-at91/Kconfig.non_dt
+@@ -258,6 +258,12 @@ config MACH_USB_A9263
+ 	  Select this if you are using a Calao Systems USB-A9263.
+ 	  <http://www.calao-systems.com>
  
 +config MACH_TQMA9263
 +	bool "TQ Components TQMa9263 board"
@@ -15,10 +15,10 @@
  # ----------------------------------------------------------
 --- a/arch/arm/mach-at91/Makefile
 +++ b/arch/arm/mach-at91/Makefile
-@@ -67,6 +67,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
+@@ -68,6 +68,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
+ # AT91SAM9263 board-specific support
  obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
  obj-$(CONFIG_MACH_USB_A9263)	+= board-usb-a926x.o
- obj-$(CONFIG_MACH_NEOCORE926)	+= board-neocore926.o
 +obj-$(CONFIG_MACH_TQMA9263)	+= board-tqma9263.o
  
  # AT91SAM9RL board-specific support