Merge trunk into realtek-unstable

Conflicts:
	Config.in
	feeds.conf.default
	package/base-files/files/etc/hotplug2-common.rules
	package/network/config/netifd/files/etc/init.d/network

4 files changed, 36 insertions, 34 deletions

diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile
index 5641aa62d..4b0152f1d 100644
--- a/target/linux/realview/Makefile
+++ b/target/linux/realview/Makefile
@@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk
 CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.8.12
 
 DEVICE_TYPE:=developerboard
 
diff --git a/target/linux/realview/config-3.3 b/target/linux/realview/config-3.8
index 7c4356505..317b73fe9 100644
--- a/target/linux/realview/config-3.3
+++ b/target/linux/realview/config-3.8
@@ -1,14 +1,17 @@
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_ARCH_HAS_BARRIERS=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_REALVIEW=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
+# CONFIG_ARCH_VT8500_SINGLE is not set
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
@@ -34,6 +37,7 @@ CONFIG_ARM_NR_BANKS=8
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_TIMER_SP804=y
+CONFIG_ATAGS=y
 CONFIG_ATAGS_PROC=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_BLK_DEV_RAM=y
@@ -44,8 +48,11 @@ CONFIG_CACHE_L2X0=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMDLINE="console=ttyAMA0 mem=128M"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CPU_32v6=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -60,9 +67,7 @@ CONFIG_CPU_COPY_V6=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_HAS_PMU=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_CPU_PABRT_V6=y
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_RMAP=y
@@ -72,6 +77,8 @@ CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CPU_V6=y
 CONFIG_CPU_V6K=y
 CONFIG_CPU_V7=y
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_LL_UART_NONE is not set
 # CONFIG_DEBUG_REALVIEW_PB1176_PORT is not set
 CONFIG_DEBUG_REALVIEW_STD_PORT=y
@@ -91,20 +98,32 @@ CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_AOUT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_ARCH_PFN_VALID is not set
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_TWD=y
+CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -117,18 +136,18 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_MACH_CLKDEV=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_HAVE_NET_DSA=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_HAVE_SMP=y
-CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_TCM=y
+CONFIG_HAVE_UID16=y
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_HW_PERF_EVENTS is not set
 CONFIG_ICST=y
@@ -144,7 +163,6 @@ CONFIG_JFFS2_RUBIN=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_KEXEC=y
 CONFIG_KTIME_SCALAR=y
-# CONFIG_LEDS is not set
 CONFIG_LOCAL_TIMERS=y
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
@@ -159,8 +177,8 @@ CONFIG_MACH_REALVIEW_PBA8=y
 CONFIG_MACH_REALVIEW_PBX=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MDIO_BOARDINFO=y
-# CONFIG_MFD_T7L66XB is not set
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MULTI_IRQ_HANDLER=y
@@ -174,6 +192,7 @@ CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
+CONFIG_PERCPU_RWSEM=y
 CONFIG_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
@@ -225,12 +244,19 @@ CONFIG_STOP_MACHINE=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TREE_RCU=y
 CONFIG_UID16=y
+CONFIG_UIDGID_CONVERTED=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_XHCI is not set
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_XPS=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/realview/patches-3.3/001-arm-fix-REALVIEW_EB11MP_PRIV_MEM_BASE.patch b/target/linux/realview/patches-3.3/001-arm-fix-REALVIEW_EB11MP_PRIV_MEM_BASE.patch
deleted file mode 100644
index f5008cb4b..000000000
--- a/target/linux/realview/patches-3.3/001-arm-fix-REALVIEW_EB11MP_PRIV_MEM_BASE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/mach-realview/include/mach/board-eb.h
-+++ b/arch/arm/mach-realview/include/mach/board-eb.h
-@@ -47,7 +47,7 @@
- #define REALVIEW_EB_USB_BASE		0x4F000000	/* USB */
- 
- #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
--#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x1F000000
-+#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x10100000
- #define REALVIEW_EB11MP_L220_BASE	0x10102000	/* L220 registers */
- #define REALVIEW_EB11MP_SYS_PLD_CTRL1	0xD8		/* Register offset for MPCore sysctl */
- #else
diff --git a/target/linux/realview/patches-3.3/002-disable_fmrx_instr.patch b/target/linux/realview/patches-3.3/002-disable_fmrx_instr.patch
deleted file mode 100644
index 329e29fa2..000000000
--- a/target/linux/realview/patches-3.3/002-disable_fmrx_instr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/vfp/vfpmodule.c
-+++ b/arch/arm/vfp/vfpmodule.c
-@@ -622,8 +622,10 @@ static int __init vfp_init(void)
- 			if ((fmrx(MVFR1) & 0x000fff00) == 0x00011100)
- 				elf_hwcap |= HWCAP_NEON;
- #endif
-+#if 0
- 			if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000)
- 				elf_hwcap |= HWCAP_VFPv4;
-+#endif
- 		}
- 	}
- 	return 0;