From 0a866293bd9e204978c995cb0545c20f8ab63c7e Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Mon, 10 Oct 2011 15:13:46 +0000
Subject: * update patches to 3.0 * add basic vr9 support * backport 3.1 fixes
 * backport 3.2 queue (falcon)

SVN-Revision: 28405
---
 target/linux/lantiq/ar9/config-3.0              | 51 -------------------------
 target/linux/lantiq/ar9/config-default          |  4 +-
 target/linux/lantiq/ar9/profiles/003-buffalo.mk |  2 +-
 target/linux/lantiq/ar9/target.mk               |  2 +-
 4 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 target/linux/lantiq/ar9/config-3.0

(limited to 'target/linux/lantiq/ar9')

diff --git a/target/linux/lantiq/ar9/config-3.0 b/target/linux/lantiq/ar9/config-3.0
deleted file mode 100644
index f596114d76..0000000000
--- a/target/linux/lantiq/ar9/config-3.0
+++ /dev/null
@@ -1,51 +0,0 @@
-CONFIG_ADM6996_PHY=y
-CONFIG_AR8216_PHY=y
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ATH79 is not set
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
-CONFIG_INPUT_POLLDEV=y
-# CONFIG_ISDN is not set
-CONFIG_LANTIQ_ETOP=y
-# CONFIG_LANTIQ_MACH_ARV45XX is not set
-# CONFIG_LANTIQ_MACH_EASY50712 is not set
-CONFIG_LANTIQ_MACH_NETGEAR=y
-# CONFIG_LANTIQ_MACH_GIGASX76X is not set
-CONFIG_MACH_NO_WESTBRIDGE=y
-# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_QUOTACTL is not set
-CONFIG_RTL8306_PHY=y
-# CONFIG_SOC_AMAZON_SE is not set
-# CONFIG_SOC_FALCON is not set
-CONFIG_SOC_TYPE_XWAY=y
-CONFIG_SOC_XWAY=y
-CONFIG_SPI=y
-CONFIG_SPI_BITBANG=y
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_LANTIQ=y
-CONFIG_SPI_MASTER=y
-CONFIG_USB_SUPPORT=y
-CONFIG_XZ_DEC=y
diff --git a/target/linux/lantiq/ar9/config-default b/target/linux/lantiq/ar9/config-default
index fb69899594..34192d03fc 100644
--- a/target/linux/lantiq/ar9/config-default
+++ b/target/linux/lantiq/ar9/config-default
@@ -27,8 +27,8 @@ CONFIG_LANTIQ_ETOP=y
 # CONFIG_LANTIQ_MACH_ARV45XX is not set
 # CONFIG_LANTIQ_MACH_EASY50712 is not set
 CONFIG_LANTIQ_MACH_NETGEAR=y
-# CONFIG_LANTIQ_MACH_GIGASX76X is not set
 CONFIG_LANTIQ_MACH_WBMR=y
+# CONFIG_LANTIQ_MACH_GIGASX76X is not set
 CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -40,6 +40,7 @@ CONFIG_PERF_USE_VMALLOC=y
 # CONFIG_QUOTACTL is not set
 CONFIG_RTL8306_PHY=y
 # CONFIG_SOC_AMAZON_SE is not set
+# CONFIG_SOC_VR9 is not set
 # CONFIG_SOC_FALCON is not set
 CONFIG_SOC_TYPE_XWAY=y
 CONFIG_SOC_XWAY=y
@@ -50,3 +51,4 @@ CONFIG_SPI_LANTIQ=y
 CONFIG_SPI_MASTER=y
 CONFIG_USB_SUPPORT=y
 CONFIG_XZ_DEC=y
+CONFIG_SPI_XWAY=y
diff --git a/target/linux/lantiq/ar9/profiles/003-buffalo.mk b/target/linux/lantiq/ar9/profiles/003-buffalo.mk
index bdf838d6e8..df2829ef3e 100644
--- a/target/linux/lantiq/ar9/profiles/003-buffalo.mk
+++ b/target/linux/lantiq/ar9/profiles/003-buffalo.mk
@@ -1,7 +1,7 @@
 define Profile/WBMR
   NAME:=WBMR - Buffalo WBMR-HP-G300H
   PACKAGES:= kmod-usb-core kmod-usb-dwc-otg kmod-leds-gpio \
-	 kmod-ltq-dsl-firmware-b kmod-ledtrig-usbdev 
+	 kmod-ltq-dsl-firmware-b-ar9 kmod-ledtrig-usbdev
 endef
 
 define Profile/WBMR/Description
diff --git a/target/linux/lantiq/ar9/target.mk b/target/linux/lantiq/ar9/target.mk
index a04384efeb..89a1586d58 100644
--- a/target/linux/lantiq/ar9/target.mk
+++ b/target/linux/lantiq/ar9/target.mk
@@ -3,7 +3,7 @@ SUBTARGET:=ar9
 BOARDNAME:=AR9
 FEATURES:=squashfs jffs2 atm
 
-DEFAULT_PACKAGES+=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl kmod-ltq-dsl ltq-dsl-app swconfig
+DEFAULT_PACKAGES+=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl kmod-ltq-dsl-ar9 ltq-dsl-app swconfig
 
 define Target/Description
 	Lantiq XWAY (danube/twinpass/ar9)
-- 
cgit v1.2.3