[adm5120] switch to 2.6.23

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

23 files changed, 58 insertions, 1231 deletions

diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile
index 34c3b804a..ed9dce2c4 100644
--- a/target/linux/adm5120/Makefile
+++ b/target/linux/adm5120/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 BOARD:=adm5120
-LINUX_VERSION:=2.6.22.4
+LINUX_VERSION:=2.6.23
 FEATURES:=squashfs jffs2 tgz broken
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
index 011323439..5aa5a633d 100644
--- a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
+++ b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
@@ -199,7 +199,7 @@ void __init adm5120_pci_set_irq_map(unsigned int nr_irqs,
 	adm5120_pci_irq_map = map;
 }
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
 	int irq = -1;
 	int i;
diff --git a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
index 06189371d..f3a9b0154 100644
--- a/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
+++ b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
@@ -29,13 +29,13 @@
 #include <linux/leds.h>
 #include <linux/err.h>
 
-#include <linux/gpio_leds.h>
+#include <linux/io.h>
+#include <linux/leds.h>
 
 #include <asm/bootinfo.h>
-#include <asm/io.h>
 #include <asm/gpio.h>
 
-#include <asm/mach-adm5120/adm5120_info.h>
+#include <adm5120_info.h>
 
 #define NUM_LEDS_MAX	23
 
@@ -43,12 +43,13 @@
 
 struct mach_data {
 	unsigned long machtype;
-	unsigned count;
-	struct gpio_led_platform_data *data;
+	unsigned nr_leds;
+	struct gpio_led *leds;
 };
 
 struct adm5120_leddev {
 	struct platform_device pdev;
+	struct gpio_led led;
 	struct gpio_led_platform_data pdata;
 };
 
@@ -56,19 +57,17 @@ static int led_count = 0;
 static struct adm5120_leddev *led_devs[NUM_LEDS_MAX];
 
 #define LED_ARRAY(n)				\
-static struct gpio_led_platform_data		\
-n ## _leds [] __initdata =
+static struct gpio_led n ## _leds [] __initdata =
 
-#define LED_DATA(n,t,g,off,on) {		\
+#define LED_DATA(n,t,g,al) {			\
 	.name = (n),				\
-	.trigger = (t),				\
+	.default_trigger = (t),			\
 	.gpio = (g),				\
-	.value_off = (off),			\
-	.value_on = (on)			\
+	.active_low = (al)			\
 	}
 
-#define LED_STD(g,n,t)	LED_DATA((n),(t),(g), 0, 1)
-#define LED_INV(g,n,t)	LED_DATA((n),(t),(g), 1, 0)
+#define LED_STD(g,n,t)	LED_DATA((n),(t),(g), 0)
+#define LED_INV(g,n,t)	LED_DATA((n),(t),(g), 1)
 
 /*
  * Compex boards
@@ -218,8 +217,8 @@ LED_ARRAY(generic) {
 
 #define MACH_DATA(m, n) {				\
 	.machtype	= (m),				\
-	.count		= ARRAY_SIZE(n ## _leds),	\
-	.data		= n ## _leds			\
+	.nr_leds	= ARRAY_SIZE(n ## _leds),	\
+	.leds		= n ## _leds			\
 }
 
 static struct mach_data machines[] __initdata = {
@@ -250,7 +249,7 @@ static struct mach_data machines[] __initdata = {
 };
 
 static struct adm5120_leddev * __init
-create_leddev(struct gpio_led_platform_data *data)
+create_leddev(int id, struct gpio_led *led)
 {
 	struct adm5120_leddev *p;
 
@@ -258,17 +257,21 @@ create_leddev(struct gpio_led_platform_data *data)
 	if (p == NULL)
 		return NULL;
 
-	memcpy(&p->pdata, data, sizeof(p->pdata));
+	memcpy(&p->led, led, sizeof(p->led));
+	p->pdev.name = "leds-gpio";
+	p->pdev.id = id;
 	p->pdev.dev.platform_data = &p->pdata;
+	p->pdata.num_leds=1;
+	p->pdata.leds = &p->led;
 
 	return p;
 }
 
 static void
-destroy_leddev(struct adm5120_leddev *led)
+destroy_leddev(struct adm5120_leddev *leddev)
 {
-	if (led)
-		kfree(led);
+	if (leddev)
+		kfree(leddev);
 }
 
 static struct mach_data * __init
@@ -311,23 +314,21 @@ adm5120_leds_init(void)
 		goto err;
 	}
 
-	for (i=0; i < mach->count; i++) {
-		led_devs[i] = create_leddev(&mach->data[i]);
+	for (i=0; i < mach->nr_leds; i++) {
+		led_devs[i] = create_leddev(i, &mach->leds[i]);
 		if (led_devs[i] == NULL) {
 			ret = -ENOMEM;
 			goto err_destroy;
 		}
-		led_devs[i]->pdev.name = "gpio-led";
-		led_devs[i]->pdev.id = i;
 	}
 
-	for (i=0; i < mach->count; i++) {
+	for (i=0; i < mach->nr_leds; i++) {
 		ret = platform_device_register(&led_devs[i]->pdev);
 		if (ret)
 			goto err_unregister;
 	}
 
-	led_count = mach->count;
+	led_count = mach->nr_leds;
 	return 0;
 
 err_unregister:
diff --git a/target/linux/adm5120/files/drivers/leds/leds-gpio.c b/target/linux/adm5120/files/drivers/leds/leds-gpio.c
deleted file mode 100755
index b1a1f1ce9..000000000
--- a/target/linux/adm5120/files/drivers/leds/leds-gpio.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- *  $Id$
- *
- *  Driver for LEDs connected to GPIO lines
- *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was derived from:
- *    /drivers/led/leds-s3c24xx.c
- *    (c) 2006 Simtec Electronics, Ben Dooks <ben@simtec.co.uk>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <linux/err.h>
-
-#include <linux/gpio_leds.h>
-
-#include <asm/io.h>
-#include <asm/gpio.h>
-
-#define DRV_NAME "gpio-led"
-#define DRV_DESC "GPIO LEDs driver"
-
-struct gpio_led_device {
-	struct led_classdev cdev;
-	struct gpio_led_platform_data *pdata;
-};
-
-static inline struct gpio_led_device *pdev_to_led(struct platform_device *dev)
-{
-	return platform_get_drvdata(dev);
-}
-
-static inline struct gpio_led_device *class_to_led(struct led_classdev *led_cdev)
-{
-	return container_of(led_cdev, struct gpio_led_device, cdev);
-}
-
-static void gpio_led_set(struct led_classdev *led_cdev,
-			    enum led_brightness brightness)
-{
-	struct gpio_led_device *led;
-	struct gpio_led_platform_data *pdata;
-
-	led = class_to_led(led_cdev);
-	pdata = led->pdata;
-
-	switch (brightness) {
-	case LED_FULL:
-		gpio_direction_output(pdata->gpio, pdata->value_on);
-		break;
-	case LED_OFF:
-		gpio_direction_output(pdata->gpio, pdata->value_off);
-		break;
-	default:
-		gpio_direction_output(pdata->gpio, brightness);
-		break;
-	}
-}
-
-static int __devinit gpio_led_probe(struct platform_device *dev)
-{
-	struct gpio_led_platform_data *pdata;
-	struct gpio_led_device *led;
-	int ret;
-
-	pdata = dev->dev.platform_data;
-	if (pdata == NULL) {
-		dev_err(&dev->dev, "no platform data, id=%d\n", dev->id);
-		ret = -EINVAL;
-		goto err;
-	}
-
-	if (pdata->name == NULL) {
-		dev_err(&dev->dev, "no led name specified\n");
-		ret = -EINVAL;
-		goto err;
-	}
-
-	ret = gpio_request(pdata->gpio, pdata->name);
-	if (ret) {
-		dev_err(&dev->dev, "gpio_request failed\n");
-		goto err;
-	}
-
-	led = kzalloc(sizeof(*led), GFP_KERNEL);
-	if (led == NULL) {
-		dev_err(&dev->dev, "no memory for device");
-		ret = -ENOMEM;
-		goto err_free_gpio;
-	}
-
-	platform_set_drvdata(dev, led);
-	led->pdata = pdata;
-	led->cdev.name = pdata->name;
-	led->cdev.brightness_set = gpio_led_set;
-#ifdef CONFIG_LEDS_TRIGGERS
-	led->cdev.default_trigger = pdata->trigger;
-#endif
-
-	ret = led_classdev_register(&dev->dev, &led->cdev);
-	if (ret < 0) {
-		dev_err(&dev->dev, "led_classdev_register failed");
-		goto err_free_led;
-	}
-
-	return 0;
-
-err_free_led:
-	kfree(led);
-err_free_gpio:
-	gpio_free(pdata->gpio);
-err:
-	return ret;
-}
-
-static int __devexit gpio_led_remove(struct platform_device *dev)
-{
-	struct gpio_led_device *led;
-	struct gpio_led_platform_data *pdata;
-
-	pdata = dev->dev.platform_data;
-
-	led = pdev_to_led(dev);
-	led_classdev_unregister(&led->cdev);
-	kfree(led);
-
-	gpio_free(pdata->gpio);
-
-	return 0;
-}
-
-#ifdef CONFIG_PM
-static int gpio_led_suspend(struct platform_device *dev,
-		pm_message_t state)
-{
-	struct gpio_led_device *led;
-
-	led = pdev_to_led(dev);
-	led_classdev_suspend(&led->cdev);
-
-	return 0;
-}
-
-static int gpio_led_resume(struct platform_device *dev)
-{
-	struct gpio_led_device *led;
-
-	led = pdev_to_led(dev);
-	led_classdev_resume(&led->cdev);
-
-	return 0;
-}
-#endif /* CONFIG_PM */
-
-static struct platform_driver gpio_led_driver = {
-	.probe		= gpio_led_probe,
-	.remove		= __devexit_p(gpio_led_remove),
-#ifdef CONFIG_PM
-	.suspend	= gpio_led_suspend,
-	.resume		= gpio_led_resume,
-#endif
-	.driver		= {
-		.name		= DRV_NAME,
-		.owner		= THIS_MODULE,
-	},
-};
-
-static int __init gpio_led_init(void)
-{
-	int ret;
-
-	ret = platform_driver_register(&gpio_led_driver);
-	if (ret)
-		printk(KERN_ALERT DRV_DESC " register failed\n");
-	else
-		printk(KERN_INFO DRV_DESC " registered\n");
-
-	return ret;
-}
-
-static void __exit gpio_led_exit(void)
-{
-	platform_driver_unregister(&gpio_led_driver);
-}
-
-module_init(gpio_led_init);
-module_exit(gpio_led_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION(DRV_DESC);
-MODULE_LICENSE("GPL");
diff --git a/target/linux/adm5120/patches-2.6.22/001-adm5120.patch b/target/linux/adm5120/patches-2.6.22/001-adm5120.patch
deleted file mode 100644
index b17ba4cff..000000000
--- a/target/linux/adm5120/patches-2.6.22/001-adm5120.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: linux-2.6.22.1/arch/mips/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/arch/mips/Kconfig
-+++ linux-2.6.22.1/arch/mips/Kconfig
-@@ -15,6 +15,18 @@ choice
- 	prompt "System type"
- 	default SGI_IP22
- 
-+config MIPS_ADM5120
-+	bool "Support for ADM5120 SoC"
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_HAS_EARLY_PRINTK
-+	select DMA_NONCOHERENT
-+	select HW_HAS_PCI
-+	select IRQ_CPU
-+	select SYS_SUPPORTS_LITTLE_ENDIAN
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select GENERIC_GPIO
-+
- config MACH_ALCHEMY
- 	bool "Alchemy processor based machines"
- 
-@@ -658,6 +670,7 @@ config TOSHIBA_RBTX4938
- 
- endchoice
- 
-+source "arch/mips/adm5120/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/ddb5xxx/Kconfig"
- source "arch/mips/gt64120/ev64120/Kconfig"
-Index: linux-2.6.22.1/arch/mips/Makefile
-===================================================================
---- linux-2.6.22.1.orig/arch/mips/Makefile
-+++ linux-2.6.22.1/arch/mips/Makefile
-@@ -165,6 +165,16 @@ cflags-$(CONFIG_MACH_JAZZ)	+= -Iinclude/
- load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000
- 
- #
-+# ADMtek 5120
-+#
-+
-+libs-$(CONFIG_MIPS_ADM5120)	+= arch/mips/adm5120/prom/
-+core-$(CONFIG_MIPS_ADM5120)	+= arch/mips/adm5120/
-+core-$(CONFIG_MIPS_ADM5120)	+= arch/mips/adm5120/boards/
-+cflags-$(CONFIG_MIPS_ADM5120)	+= -Iinclude/asm-mips/mach-adm5120
-+load-$(CONFIG_MIPS_ADM5120)	+= 0xffffffff80001000
-+
-+#
- # Common Alchemy Au1x00 stuff
- #
- core-$(CONFIG_SOC_AU1X00)	+= arch/mips/au1000/common/
-Index: linux-2.6.22.1/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.22.1.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.22.1/include/asm-mips/bootinfo.h
-@@ -213,6 +213,58 @@
- #define MACH_GROUP_NEC_EMMA2RH 25	/* NEC EMMA2RH (was 23)		*/
- #define  MACH_NEC_MARKEINS	0	/* NEC EMMA2RH Mark-eins	*/
- 
-+/*
-+ * Valid machtype for group ADMtek ADM5120
-+ */
-+#define MACH_GROUP_ADM5120	26
-+#define MACH_ADM5120_GENERIC	0	/* Generic board */
-+#define MACH_ADM5120_WP54G_WRT	1	/* Compex WP54G-WRT */
-+#define MACH_ADM5120_WP54G	2	/* Compex WP54G */
-+#define MACH_ADM5120_WP54AG	3	/* Compex WP54AG */
-+#define MACH_ADM5120_WPP54G	4	/* Compex WPP54G */
-+#define MACH_ADM5120_WPP54AG	5	/* Compex WPP54AG */
-+#define MACH_ADM5120_NP28G	6	/* Compex NP28G */
-+#define MACH_ADM5120_NP28GHS	7	/* Compex NP28G HotSpot */
-+#define MACH_ADM5120_NP27G	8	/* Compex NP27G */
-+#define MACH_ADM5120_WP54Gv1C	9	/* Compex WP54G version 1C */
-+#define MACH_ADM5120_RB_111	10	/* Mikrotik RouterBOARD 111 */
-+#define MACH_ADM5120_RB_112	11	/* Mikrotik RouterBOARD 112 */
-+#define MACH_ADM5120_RB_133	12	/* Mikrotik RouterBOARD 133 */
-+#define MACH_ADM5120_RB_133C	13	/* Mikrotik RouterBOARD 133c */
-+#define MACH_ADM5120_RB_150	14	/* Mikrotik RouterBOARD 150 */
-+#define MACH_ADM5120_RB_153	15	/* Mikrotik RouterBOARD 153 */
-+#define MACH_ADM5120_HS100	16	/* ZyXEL HomeSafe 100/100W */
-+#define MACH_ADM5120_P334	17	/* ZyXEL Prestige 334 */
-+#define MACH_ADM5120_P334U	18	/* ZyXEL Prestige 334U */
-+#define MACH_ADM5120_P334W	19	/* ZyXEL Prestige 334W */
-+#define MACH_ADM5120_P334WH	20	/* ZyXEL Prestige 334WH */
-+#define MACH_ADM5120_P334WHD	21	/* ZyXEL Prestige 334WHD */
-+#define MACH_ADM5120_P334WT	22	/* ZyXEL Prestige 334WT */
-+#define MACH_ADM5120_P335	23	/* ZyXEL Prestige 335/335WT */
-+#define MACH_ADM5120_P335PLUS	24	/* ZyXEL Prestige 335Plus */
-+#define MACH_ADM5120_P335U	25	/* ZyXEL Prestige 335U */
-+#define MACH_ADM5120_ES2108	26	/* ZyXEL Ethernet Switch 2108 */
-+#define MACH_ADM5120_ES2108F	27	/* ZyXEL Ethernet Switch 2108-F */
-+#define MACH_ADM5120_ES2108G	28	/* ZyXEL Ethernet Switch 2108-G */
-+#define MACH_ADM5120_ES2108LC	29	/* ZyXEL Ethernet Switch 2108-LC */
-+#define MACH_ADM5120_ES2108PWR	30	/* ZyXEL Ethernet Switch 2108-PWR */
-+#define MACH_ADM5120_ES2024A	31	/* ZyXEL Ethernet Switch 2024A */
-+#define MACH_ADM5120_ES2024PWR	32	/* ZyXEL Ethernet Switch 2024PWR */
-+#define MACH_ADM5120_CAS630	33	/* Cellvision CAS-630/630W */
-+#define MACH_ADM5120_CAS670	34	/* Cellvision CAS-670/670W */
-+#define MACH_ADM5120_CAS700	36	/* Cellvision CAS-700/700W */
-+#define MACH_ADM5120_CAS771	37	/* Cellvision CAS-771/771W */
-+#define MACH_ADM5120_CAS790	38	/* Cellvision CAS-790 */
-+#define MACH_ADM5120_CAS861	39	/* Cellvision CAS-861/861W */
-+#define MACH_ADM5120_NFS101U	40	/* Cellvision NFS-101U/101WU */
-+#define MACH_ADM5120_NFS202U	41	/* Cellvision NFS-202U/202WU */
-+#define MACH_ADM5120_EASY5120PATA 42	/* Infineon EASY 5120P-ATA */
-+#define MACH_ADM5120_EASY5120RT 43	/* Infineon EASY 5120-RT */
-+#define MACH_ADM5120_EASY5120WVOIP 44	/* Infineon EASY 5120-WVoIP */
-+#define MACH_ADM5120_EASY83000	45	/* Infineon EASY-83000 */
-+#define MACH_ADM5120_BR6104K	46	/* Edimax BR-6104K */
-+#define MACH_ADM5120_RB_192	47	/* Mikrotik RouterBOARD 192 */
-+
- #define CL_SIZE			COMMAND_LINE_SIZE
- 
- const char *get_system_type(void);
diff --git a/target/linux/adm5120/patches-2.6.22/002-adm5120_flash.patch b/target/linux/adm5120/patches-2.6.22/002-adm5120_flash.patch
deleted file mode 100644
index e2f21bfc4..000000000
--- a/target/linux/adm5120/patches-2.6.22/002-adm5120_flash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: linux-2.6.22.1/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.22.1/drivers/mtd/maps/Kconfig
-@@ -620,5 +620,9 @@ config MTD_PLATRAM
- 
- 	  This selection automatically selects the map_ram driver.
- 
-+config MTD_ADM5120
-+	tristate "Map driver for ADM5120 based boards"
-+	depends on MIPS_ADM5120
-+
- endmenu
- 
-Index: linux-2.6.22.1/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.22.1/drivers/mtd/maps/Makefile
-@@ -47,6 +47,7 @@ obj-$(CONFIG_MTD_OCELOT)	+= ocelot.o
- obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
- obj-$(CONFIG_MTD_PCI)		+= pci.o
- obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.o
-+obj-$(CONFIG_MTD_ADM5120)      	+= adm5120-flash.o
- obj-$(CONFIG_MTD_LASAT)		+= lasat.o
- obj-$(CONFIG_MTD_AUTCPU12)	+= autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312)	+= edb7312.o
diff --git a/target/linux/adm5120/patches-2.6.22/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.22/003-adm5120_switch.patch
deleted file mode 100644
index ff8a9bbc2..000000000
--- a/target/linux/adm5120/patches-2.6.22/003-adm5120_switch.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: linux-2.6.22.1/drivers/net/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/net/Kconfig
-+++ linux-2.6.22.1/drivers/net/Kconfig
-@@ -574,6 +574,10 @@ config MIPS_AU1X00_ENET
- 	  If you have an Alchemy Semi AU1X00 based system
- 	  say Y.  Otherwise, say N.
- 
-+config MIPS_ADM5120_ENET
-+	tristate "MIPS ADM5120 Ethernet switch support"
-+	depends on NET_ETHERNET && MIPS_ADM5120
-+
- config NET_SB1250_MAC
- 	tristate "SB1250 Ethernet support"
- 	depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC
-Index: linux-2.6.22.1/drivers/net/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/net/Makefile
-+++ linux-2.6.22.1/drivers/net/Makefile
-@@ -165,6 +165,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
- # This is also a 82596 and should probably be merged
- obj-$(CONFIG_LP486E) += lp486e.o
- 
-+obj-$(CONFIG_MIPS_ADM5120_ENET) += adm5120sw.o
- obj-$(CONFIG_ETH16I) += eth16i.o
- obj-$(CONFIG_ZORRO8390) += zorro8390.o
- obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
diff --git a/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch b/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
deleted file mode 100644
index 5441fef41..000000000
--- a/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: linux-2.6.22.1/drivers/mtd/nand/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/nand/Kconfig
-+++ linux-2.6.22.1/drivers/mtd/nand/Kconfig
-@@ -81,6 +81,16 @@ config MTD_NAND_TS7250
- 	help
- 	  Support for NAND flash on Technologic Systems TS-7250 platform.
- 
-+config MTD_NAND_ADM5120
-+	tristate "ADM5120 NAND support"
-+	depends on MTD_NAND && MIPS_ADM5120
-+	help
-+	  This enables the driver for the ADM5120 SoC built-in
-+	  NAND flash interface.
-+
-+	  No board specific support is done by this driver, each board
-+	  must advertise a platform_device for the driver to attach.
-+
- config MTD_NAND_IDS
- 	tristate
- 
-Index: linux-2.6.22.1/drivers/mtd/nand/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/nand/Makefile
-+++ linux-2.6.22.1/drivers/mtd/nand/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_MTD_NAND_CAFE)		+= cafe_nan
- obj-$(CONFIG_MTD_NAND_SPIA)		+= spia.o
- obj-$(CONFIG_MTD_NAND_AMS_DELTA)	+= ams-delta.o
- obj-$(CONFIG_MTD_NAND_TOTO)		+= toto.o
-+obj-$(CONFIG_MTD_NAND_ADM5120)		+= adm5120-nand.o
- obj-$(CONFIG_MTD_NAND_AUTCPU12)		+= autcpu12.o
- obj-$(CONFIG_MTD_NAND_EDB7312)		+= edb7312.o
- obj-$(CONFIG_MTD_NAND_AU1550)		+= au1550nd.o
diff --git a/target/linux/adm5120/patches-2.6.22/005-adm5120_usb.patch b/target/linux/adm5120/patches-2.6.22/005-adm5120_usb.patch
deleted file mode 100644
index 0a74e9103..000000000
--- a/target/linux/adm5120/patches-2.6.22/005-adm5120_usb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: linux-2.6.22.1/drivers/usb/host/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/usb/host/Kconfig
-+++ linux-2.6.22.1/drivers/usb/host/Kconfig
-@@ -237,3 +237,6 @@ config USB_SL811_CS
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called "sl811_cs".
- 
-+config USB_ADM5120_HCD
-+	tristate "ADM5120 HCD support (EXPERIMENTAL)"
-+	depends on USB && MIPS_ADM5120 && EXPERIMENTAL
-Index: linux-2.6.22.1/drivers/usb/host/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/usb/host/Makefile
-+++ linux-2.6.22.1/drivers/usb/host/Makefile
-@@ -8,6 +8,7 @@ endif
- 
- obj-$(CONFIG_PCI)		+= pci-quirks.o
- 
-+obj-$(CONFIG_USB_ADM5120_HCD)	+= adm5120-hcd.o
- obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
- obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o
- obj-$(CONFIG_USB_OHCI_HCD)	+= ohci-hcd.o
-Index: linux-2.6.22.1/drivers/usb/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/usb/Makefile
-+++ linux-2.6.22.1/drivers/usb/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD)	+= host/
- obj-$(CONFIG_USB_SL811_HCD)	+= host/
- obj-$(CONFIG_USB_U132_HCD)	+= host/
- obj-$(CONFIG_USB_OHCI_AT91)	+= host/
-+obj-$(CONFIG_USB_ADM5120_HCD)  	+= host/
- 
- obj-$(CONFIG_USB_ACM)		+= class/
- obj-$(CONFIG_USB_PRINTER)	+= class/
diff --git a/target/linux/adm5120/patches-2.6.22/006-adm5120_leds.patch b/target/linux/adm5120/patches-2.6.22/006-adm5120_leds.patch
deleted file mode 100644
index bf173bd92..000000000
--- a/target/linux/adm5120/patches-2.6.22/006-adm5120_leds.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: linux-2.6.22.1/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/leds/Kconfig
-+++ linux-2.6.22.1/drivers/leds/Kconfig
-@@ -20,6 +20,27 @@ config LEDS_CLASS
- 
- comment "LED drivers"
- 
-+config LEDS_GPIO
-+	tristate "LED support for LEDS on GPIO lines"
-+	depends on LEDS_CLASS && GENERIC_GPIO
-+	help
-+	  This option enables support for LEDs connected to GPIO lines
-+
-+config LEDS_ADM5120
-+	tristate "LED Support for ADM5120 GPIO LEDs"
-+	depends on LEDS_GPIO && MIPS_ADM5120
-+	help
-+	  This option enables support for LEDs connected to GPIO lines
-+	  on ADM5120 SoC based platforms.
-+
-+config LEDS_ADM5120_EXPERIMENTAL
-+	bool "Enable ADM5120 LEDs experimental code"
-+	depends on LEDS_ADM5120
-+
-+config LEDS_ADM5120_DIAG
-+	bool "Enable ADM5120 LEDs diagnostic mode"
-+	depends on LEDS_ADM5120
-+
- config LEDS_CORGI
- 	tristate "LED Support for the Sharp SL-C7x0 series"
- 	depends on LEDS_CLASS && PXA_SHARP_C7xx
-Index: linux-2.6.22.1/drivers/leds/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/leds/Makefile
-+++ linux-2.6.22.1/drivers/leds/Makefile
-@@ -5,6 +5,8 @@ obj-$(CONFIG_LEDS_CLASS)		+= led-class.o
- obj-$(CONFIG_LEDS_TRIGGERS)		+= led-triggers.o
- 
- # LED Platform Drivers
-+obj-$(CONFIG_LEDS_GPIO)		+= leds-gpio.o
-+obj-$(CONFIG_LEDS_ADM5120)		+= leds-adm5120.o
- obj-$(CONFIG_LEDS_CORGI)		+= leds-corgi.o
- obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
- obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o
diff --git a/target/linux/adm5120/patches-2.6.22/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.22/007-adm5120_pci.patch
deleted file mode 100644
index 79a5a6910..000000000
--- a/target/linux/adm5120/patches-2.6.22/007-adm5120_pci.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: linux-2.6.22.1/arch/mips/pci/Makefile
-===================================================================
---- linux-2.6.22.1.orig/arch/mips/pci/Makefile
-+++ linux-2.6.22.1/arch/mips/pci/Makefile
-@@ -50,3 +50,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-
- obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o
- obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
- obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
-+obj-$(CONFIG_PCI_ADM5120)	+= pci-adm5120.o
-Index: linux-2.6.22.1/include/linux/pci_ids.h
-===================================================================
---- linux-2.6.22.1.orig/include/linux/pci_ids.h
-+++ linux-2.6.22.1/include/linux/pci_ids.h
-@@ -1713,6 +1713,9 @@
- #define PCI_VENDOR_ID_ESDGMBH		0x12fe
- #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
- 
-+#define PCI_VENDOR_ID_ADMTEK		0x1317
-+#define PCI_DEVICE_ID_ADMTEK_ADM5120	0x5120
-+
- #define PCI_VENDOR_ID_SIIG		0x131f
- #define PCI_SUBVENDOR_ID_SIIG		0x131f
- #define PCI_DEVICE_ID_SIIG_1S_10x_550	0x1000
diff --git a/target/linux/adm5120/patches-2.6.22/008-adm5120_uart.patch b/target/linux/adm5120/patches-2.6.22/008-adm5120_uart.patch
deleted file mode 100644
index 7f8451324..000000000
--- a/target/linux/adm5120/patches-2.6.22/008-adm5120_uart.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: linux-2.6.22.1/drivers/serial/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/serial/Makefile
-+++ linux-2.6.22.1/drivers/serial/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) 
- obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
- obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
- obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
-+obj-$(CONFIG_SERIAL_ADM5120) += adm5120_uart.o
- obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
- obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
- obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
-Index: linux-2.6.22.1/include/linux/serial_core.h
-===================================================================
---- linux-2.6.22.1.orig/include/linux/serial_core.h
-+++ linux-2.6.22.1/include/linux/serial_core.h
-@@ -143,6 +143,9 @@
- #define PORT_KS8695	76
- 
- 
-+/* ADMtek ADM5120 SoC */
-+#define PORT_ADM5120	77
-+
- #ifdef __KERNEL__
- 
- #include <linux/compiler.h>
-Index: linux-2.6.22.1/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/serial/Kconfig
-+++ linux-2.6.22.1/drivers/serial/Kconfig
-@@ -270,6 +270,22 @@ config SERIAL_8250_RM9K
- 
- comment "Non-8250 serial port support"
- 
-+config SERIAL_ADM5120
-+       bool "ADM5120 serial port support"
-+       depends on MIPS_ADM5120
-+       select SERIAL_CORE
-+       select SERIAL_CORE_CONSOLE
-+       help
-+         Driver for the on chip UARTs on the ADM5120 SoC
-+
-+config ADM5120_NR_UARTS
-+       int "Maximum number of ADM5120 serial ports"
-+       depends on SERIAL_ADM5120
-+       default "2"
-+       ---help---
-+         Set this to the number of serial ports you want the driver to
-+         support.
-+
- config SERIAL_AMBA_PL010
- 	tristate "ARM AMBA PL010 serial port support"
- 	depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)
diff --git a/target/linux/adm5120/patches-2.6.22/100-mtd_myloder_partition_parser.patch b/target/linux/adm5120/patches-2.6.22/100-mtd_myloder_partition_parser.patch
deleted file mode 100644
index 574b2d215..000000000
--- a/target/linux/adm5120/patches-2.6.22/100-mtd_myloder_partition_parser.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: linux-2.6.22.1/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/Kconfig
-+++ linux-2.6.22.1/drivers/mtd/Kconfig
-@@ -160,6 +160,22 @@ config MTD_AFS_PARTS
- 	  for your particular device. It won't happen automatically. The
- 	  'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MIPS_ADM5120 && MTD_PARTITIONS
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
-Index: linux-2.6.22.1/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/Makefile
-+++ linux-2.6.22.1/drivers/mtd/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/adm5120/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch
deleted file mode 100644
index 8ccd76f54..000000000
--- a/target/linux/adm5120/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: linux-2.6.22.1/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.22.1/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -47,12 +47,19 @@
- #define MANUFACTURER_AMD	0x0001
- #define MANUFACTURER_ATMEL	0x001F
- #define MANUFACTURER_SST	0x00BF
-+#define MANUFACTURER_MACRONIX	0x00C2
- #define SST49LF004B	        0x0060
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
- #define MANUFACTURER_SAMSUNG	0x00ec
- 
-+/* Macronix */
-+#define MX29LV160B	0x2249	/* MX29LV160 Bottom-boot chip */
-+#define MX29LV160T	0x22C4	/* MX29LV160 Top-boot chip */
-+#define MX29LV320B	0x22A8	/* MX29LV320 Bottom-boot chip */
-+#define MX29LV320T	0x22A7	/* MX29LV320 Top-boot chip */
-+
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
- static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -217,6 +224,41 @@ static void fixup_use_atmel_lock(struct 
- 	mtd->flags |= MTD_STUPID_LOCK;
- }
- 
-+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
-+/*
-+ * Some Macronix chips has no/bad bootblock information in the CFI table
-+ */
-+static void fixup_macronix_bootloc(struct mtd_info *mtd, void* param)
-+{
-+	struct map_info *map = mtd->priv;
-+	struct cfi_private *cfi = map->fldrv_priv;
-+	struct cfi_pri_amdstd *extp = cfi->cmdset_priv;
-+	__u8 t;
-+
-+	switch (cfi->id) {
-+	/* TODO: put affected chip ids here */
-+	case MX29LV160B:
-+	case MX29LV320B:
-+		t = 2;	/* Bottom boot */
-+		break;
-+	case MX29LV160T:
-+	case MX29LV320T:
-+		t = 3;	/* Top boot */
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	if (extp->TopBottom == t)
-+		/* boot location detected by the CFI layer is correct */
-+		return;
-+
-+	extp->TopBottom = t;
-+	printk("%s: Macronix chip detected, id:0x%04X, boot location forced "
-+		"to %s\n", map->name, cfi->id, (t == 2) ? "bottom" : "top");
-+}
-+#endif /* CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC */
-+
- static struct cfi_fixup cfi_fixup_table[] = {
- #ifdef AMD_BOOTLOC_BUG
- 	{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
-@@ -231,6 +273,9 @@ static struct cfi_fixup cfi_fixup_table[
- 	{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
- #endif
- 	{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
-+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
-+	{ MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_macronix_bootloc, NULL, },
-+#endif
- 	{ 0, 0, NULL, NULL }
- };
- static struct cfi_fixup jedec_fixup_table[] = {
-Index: linux-2.6.22.1/drivers/mtd/chips/Kconfig
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/chips/Kconfig
-+++ linux-2.6.22.1/drivers/mtd/chips/Kconfig
-@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
- 	  provides support for one of those command sets, used on chips
- 	  including the AMD Am29LV320.
- 
-+config MTD_CFI_FIXUP_MACRONIX_BOOTLOC
-+	bool "Fix boot-block location for Macronix flash chips"
-+	depends on MTD_CFI_AMDSTD
-+	help
-+	  Some Macronix flash chips have no/wrong boot-block location in the
-+	  CFI table, and the driver may detect the type incorrectly. Select
-+	  this if your board has such chip.
-+
- config MTD_CFI_STAA
- 	tristate "Support for ST (Advanced Architecture) flash chips"
- 	depends on MTD_GEN_PROBE
diff --git a/target/linux/adm5120/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch
deleted file mode 100644
index abed363ed..000000000
--- a/target/linux/adm5120/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: linux-2.6.22.1/drivers/mtd/chips/jedec_probe.c
-===================================================================
---- linux-2.6.22.1.orig/drivers/mtd/chips/jedec_probe.c
-+++ linux-2.6.22.1/drivers/mtd/chips/jedec_probe.c
-@@ -121,6 +121,10 @@
- #define UPD29F064115	0x221C
- 
- /* PMC */
-+#define PM39LV512	0x001B
-+#define PM39LV010	0x001C
-+#define PM39LV020	0x003D
-+#define PM39LV040	0x003E
- #define PM49FL002	0x006D
- #define PM49FL004	0x006E
- #define PM49FL008	0x006A
-@@ -1246,6 +1250,58 @@ static const struct amd_flash_info jedec
- 			ERASEINFO(0x02000,2),
- 			ERASEINFO(0x04000,1),
- 		}
-+        }, {
-+		.mfr_id		= MANUFACTURER_PMC,
-+		.dev_id		= PM39LV512,
-+		.name		= "PMC Pm39LV512",
-+ 		.uaddr		= {
-+			[0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+		},
-+		.DevSize	= SIZE_64KiB,
-+		.CmdSet		= P_ID_AMD_STD,
-+		.NumEraseRegions= 1,
-+		.regions	= {
-+			ERASEINFO(0x01000,16),
-+		}
-+        }, {
-+		.mfr_id		= MANUFACTURER_PMC,
-+		.dev_id		= PM39LV010,
-+		.name		= "PMC Pm39LV010",
-+ 		.uaddr		= {
-+			[0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+		},
-+		.DevSize	= SIZE_128KiB,
-+		.CmdSet		= P_ID_AMD_STD,
-+		.NumEraseRegions= 1,
-+		.regions	= {
-+			ERASEINFO(0x01000,32),
-+		}
-+        }, {
-+		.mfr_id		= MANUFACTURER_PMC,
-+		.dev_id		= PM39LV020,
-+		.name		= "PMC Pm39LV020",
-+ 		.uaddr		= {
-+			[0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+		},
-+		.DevSize	= SIZE_256KiB,
-+		.CmdSet		= P_ID_AMD_STD,
-+		.NumEraseRegions= 1,
-+		.regions	= {
-+			ERASEINFO(0x01000,64),
-+		}
-+        }, {
-+		.mfr_id		= MANUFACTURER_PMC,
-+		.dev_id		= PM39LV040,
-+		.name		= "PMC Pm39LV040",
-+ 		.uaddr		= {
-+			[0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-+		},
-+		.DevSize	= SIZE_512KiB,
-+		.CmdSet		= P_ID_AMD_STD,
-+		.NumEraseRegions= 1,
-+		.regions	= {
-+			ERASEINFO(0x01000,128),
-+		}
- 	}, {
- 		.mfr_id		= MANUFACTURER_PMC,
- 		.dev_id		= PM49FL002,
diff --git a/target/linux/adm5120/patches-2.6.22/103-mtd_trxsplit.patch b/target/linux/adm5120/patches-2.6.22/103-mtd_trxsplit.patch
deleted file mode 100644
index c623bc42e..000000000
--- a/target/linux/adm5120/patches-2.6.22/103-mtd_trxsplit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: linux-2.6.22.4/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.22.4.orig/drivers/mtd/Kconfig
-+++ linux-2.6.22.4/drivers/mtd/Kconfig
-@@ -57,6 +57,11 @@ config MTD_ROOTFS_SPLIT
- 	depends on MTD_PARTITIONS
- 	default y
- 
-+config MTD_TRXSPLIT
-+	bool "Automatically find and split TRX partitions"
-+	depends on MTD_PARTITIONS
-+	default n
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
-Index: linux-2.6.22.4/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.22.4.orig/drivers/mtd/Makefile
-+++ linux-2.6.22.4/drivers/mtd/Makefile
-@@ -8,6 +8,7 @@ mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.
- obj-$(CONFIG_MTD)		+= $(mtd-y)
- 
- obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o
-+obj-$(CONFIG_MTD_TRXSPLIT)	+= trxsplit.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
diff --git a/target/linux/adm5120/patches-2.6.22/140-cmdline_hack.patch b/target/linux/adm5120/patches-2.6.22/140-cmdline_hack.patch
deleted file mode 100644
index 093dfc6b4..000000000
--- a/target/linux/adm5120/patches-2.6.22/140-cmdline_hack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: linux-2.6.22.1/arch/mips/kernel/head.S
-===================================================================
---- linux-2.6.22.1.orig/arch/mips/kernel/head.S
-+++ linux-2.6.22.1/arch/mips/kernel/head.S
-@@ -129,14 +129,19 @@
- #endif
- 	.endm
- 
--
- 	j kernel_entry
- 	nop
--
-+	nop
-+	
- 	/*
- 	 * Reserved space for exception handlers.
- 	 * Necessary for machines which link their kernels at KSEG0.
-+	 * Use as temporary storage for the kernel command line, so that it
-+	 * can be updated easily without having to relink the kernel.
- 	 */
-+	 
-+EXPORT(_image_cmdline)
-+	.ascii "CMDLINE:"
- 	.align 10
- 
- EXPORT(stext)					# used for profiling
diff --git a/target/linux/adm5120/patches-2.6.22/200-amba_pl010_hacks.patch b/target/linux/adm5120/patches-2.6.22/200-amba_pl010_hacks.patch
deleted file mode 100644
index 840d5a4cf..000000000
--- a/target/linux/adm5120/patches-2.6.22/200-amba_pl010_hacks.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Index: linux/drivers/serial/amba-pl010.c
-===================================================================
---- linux.orig/drivers/serial/amba-pl010.c
-+++ linux/drivers/serial/amba-pl010.c
-@@ -52,11 +52,10 @@
- 
- #include <asm/io.h>
- 
--#define UART_NR		8
--
- #define SERIAL_AMBA_MAJOR	204
- #define SERIAL_AMBA_MINOR	16
--#define SERIAL_AMBA_NR		UART_NR
-+#define SERIAL_AMBA_NR		CONFIG_SERIAL_AMBA_PL010_NUMPORTS
-+#define SERIAL_AMBA_NAME	CONFIG_SERIAL_AMBA_PL010_PORTNAME
- 
- #define AMBA_ISR_PASS_LIMIT	256
- 
-@@ -82,7 +81,7 @@ static void pl010_stop_tx(struct uart_po
- 	struct uart_amba_port *uap = (struct uart_amba_port *)port;
- 	unsigned int cr;
- 
--	cr = readb(uap->port.membase + UART010_CR);
-+	cr = readl(uap->port.membase + UART010_CR);
- 	cr &= ~UART010_CR_TIE;
- 	writel(cr, uap->port.membase + UART010_CR);
- }
-@@ -92,7 +91,7 @@ static void pl010_start_tx(struct uart_p
- 	struct uart_amba_port *uap = (struct uart_amba_port *)port;
- 	unsigned int cr;
- 
--	cr = readb(uap->port.membase + UART010_CR);
-+	cr = readl(uap->port.membase + UART010_CR);
- 	cr |= UART010_CR_TIE;
- 	writel(cr, uap->port.membase + UART010_CR);
- }
-@@ -102,7 +101,7 @@ static void pl010_stop_rx(struct uart_po
- 	struct uart_amba_port *uap = (struct uart_amba_port *)port;
- 	unsigned int cr;
- 
--	cr = readb(uap->port.membase + UART010_CR);
-+	cr = readl(uap->port.membase + UART010_CR);
- 	cr &= ~(UART010_CR_RIE | UART010_CR_RTIE);
- 	writel(cr, uap->port.membase + UART010_CR);
- }
-@@ -112,7 +111,7 @@ static void pl010_enable_ms(struct uart_
- 	struct uart_amba_port *uap = (struct uart_amba_port *)port;
- 	unsigned int cr;
- 
--	cr = readb(uap->port.membase + UART010_CR);
-+	cr = readl(uap->port.membase + UART010_CR);
- 	cr |= UART010_CR_MSIE;
- 	writel(cr, uap->port.membase + UART010_CR);
- }
-@@ -122,9 +121,9 @@ static void pl010_rx_chars(struct uart_a
- 	struct tty_struct *tty = uap->port.info->tty;
- 	unsigned int status, ch, flag, rsr, max_count = 256;
- 
--	status = readb(uap->port.membase + UART01x_FR);
-+	status = readl(uap->port.membase + UART01x_FR);
- 	while (UART_RX_DATA(status) && max_count--) {
--		ch = readb(uap->port.membase + UART01x_DR);
-+		ch = readl(uap->port.membase + UART01x_DR);
- 		flag = TTY_NORMAL;
- 
- 		uap->port.icount.rx++;
-@@ -133,7 +132,7 @@ static void pl010_rx_chars(struct uart_a
- 		 * Note that the error handling code is
- 		 * out of the main execution path
- 		 */
--		rsr = readb(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
-+		rsr = readl(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
- 		if (unlikely(rsr & UART01x_RSR_ANY)) {
- 			writel(0, uap->port.membase + UART01x_ECR);
- 
-@@ -165,7 +164,7 @@ static void pl010_rx_chars(struct uart_a
- 		uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);
- 
- 	ignore_char:
--		status = readb(uap->port.membase + UART01x_FR);
-+		status = readl(uap->port.membase + UART01x_FR);
- 	}
- 	spin_unlock(&uap->port.lock);
- 	tty_flip_buffer_push(tty);
-@@ -210,7 +209,7 @@ static void pl010_modem_status(struct ua
- 
- 	writel(0, uap->port.membase + UART010_ICR);
- 
--	status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
-+	status = readl(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
- 
- 	delta = status ^ uap->old_status;
- 	uap->old_status = status;
-@@ -238,7 +237,7 @@ static irqreturn_t pl010_int(int irq, vo
- 
- 	spin_lock(&uap->port.lock);
- 
--	status = readb(uap->port.membase + UART010_IIR);
-+	status = readl(uap->port.membase + UART010_IIR);
- 	if (status) {
- 		do {
- 			if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
-@@ -251,7 +250,7 @@ static irqreturn_t pl010_int(int irq, vo
- 			if (pass_counter-- == 0)
- 				break;
- 
--			status = readb(uap->port.membase + UART010_IIR);
-+			status = readl(uap->port.membase + UART010_IIR);
- 		} while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
- 				   UART010_IIR_TIS));
- 		handled = 1;
-@@ -265,7 +264,7 @@ static irqreturn_t pl010_int(int irq, vo
- static unsigned int pl010_tx_empty(struct uart_port *port)
- {
- 	struct uart_amba_port *uap = (struct uart_amba_port *)port;
--	unsigned int status = readb(uap->port.membase + UART01x_FR);
-+	unsigned int status = readl(uap->port.membase + UART01x_FR);
- 	return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
- }
- 
-@@ -275,7 +274,7 @@ static unsigned int pl010_get_mctrl(stru
- 	unsigned int result = 0;
- 	unsigned int status;
- 
--	status = readb(uap->port.membase + UART01x_FR);
-+	status = readl(uap->port.membase + UART01x_FR);
- 	if (status & UART01x_FR_DCD)
- 		result |= TIOCM_CAR;
- 	if (status & UART01x_FR_DSR)
-@@ -301,7 +300,7 @@ static void pl010_break_ctl(struct uart_
- 	unsigned int lcr_h;
- 
- 	spin_lock_irqsave(&uap->port.lock, flags);
--	lcr_h = readb(uap->port.membase + UART010_LCRH);
-+	lcr_h = readl(uap->port.membase + UART010_LCRH);
- 	if (break_state == -1)
- 		lcr_h |= UART01x_LCRH_BRK;
- 	else
-@@ -334,7 +333,7 @@ static int pl010_startup(struct uart_por
- 	/*
- 	 * initialise the old status of the modem signals
- 	 */
--	uap->old_status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
-+	uap->old_status = readl(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
- 
- 	/*
- 	 * Finally, enable interrupts
-@@ -365,7 +364,7 @@ static void pl010_shutdown(struct uart_p
- 	writel(0, uap->port.membase + UART010_CR);
- 
- 	/* disable break condition and fifos */
--	writel(readb(uap->port.membase + UART010_LCRH) &
-+	writel(readl(uap->port.membase + UART010_LCRH) &
- 		~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
- 	       uap->port.membase + UART010_LCRH);
- 
-@@ -387,7 +386,7 @@ pl010_set_termios(struct uart_port *port
- 	/*
- 	 * Ask the core to calculate the divisor for us.
- 	 */
--	baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16); 
-+	baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16);
- 	quot = uart_get_divisor(port, baud);
- 
- 	switch (termios->c_cflag & CSIZE) {
-@@ -450,7 +449,7 @@ pl010_set_termios(struct uart_port *port
- 		uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX;
- 
- 	/* first, disable everything */
--	old_cr = readb(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
-+	old_cr = readl(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
- 
- 	if (UART_ENABLE_MS(port, termios->c_cflag))
- 		old_cr |= UART010_CR_MSIE;
-@@ -540,7 +539,7 @@ static struct uart_ops amba_pl010_pops =
- 	.verify_port	= pl010_verify_port,
- };
- 
--static struct uart_amba_port *amba_ports[UART_NR];
-+static struct uart_amba_port *amba_ports[SERIAL_AMBA_NR];
- 
- #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
- 
-@@ -550,7 +549,7 @@ static void pl010_console_putchar(struct
- 	unsigned int status;
- 
- 	do {
--		status = readb(uap->port.membase + UART01x_FR);
-+		status = readl(uap->port.membase + UART01x_FR);
- 		barrier();
- 	} while (!UART_TX_READY(status));
- 	writel(ch, uap->port.membase + UART01x_DR);
-@@ -567,7 +566,7 @@ pl010_console_write(struct console *co, 
- 	/*
- 	 *	First save the CR then disable the interrupts
- 	 */
--	old_cr = readb(uap->port.membase + UART010_CR);
-+	old_cr = readl(uap->port.membase + UART010_CR);
- 	writel(UART01x_CR_UARTEN, uap->port.membase + UART010_CR);
- 
- 	uart_console_write(&uap->port, s, count, pl010_console_putchar);
-@@ -577,7 +576,7 @@ pl010_console_write(struct console *co, 
- 	 *	and restore the TCR
- 	 */
- 	do {
--		status = readb(uap->port.membase + UART01x_FR);
-+		status = readl(uap->port.membase + UART01x_FR);
- 		barrier();
- 	} while (status & UART01x_FR_BUSY);
- 	writel(old_cr, uap->port.membase + UART010_CR);
-@@ -589,9 +588,9 @@ static void __init
- pl010_console_get_options(struct uart_amba_port *uap, int *baud,
- 			     int *parity, int *bits)
- {
--	if (readb(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
-+	if (readl(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
- 		unsigned int lcr_h, quot;
--		lcr_h = readb(uap->port.membase + UART010_LCRH);
-+		lcr_h = readl(uap->port.membase + UART010_LCRH);
- 
- 		*parity = 'n';
- 		if (lcr_h & UART01x_LCRH_PEN) {
-@@ -606,8 +605,8 @@ pl010_console_get_options(struct uart_am
- 		else
- 			*bits = 8;
- 
--		quot = readb(uap->port.membase + UART010_LCRL) |
--		       readb(uap->port.membase + UART010_LCRM) << 8;
-+		quot = readl(uap->port.membase + UART010_LCRL) |
-+		       readl(uap->port.membase + UART010_LCRM) << 8;
- 		*baud = uap->port.uartclk / (16 * (quot + 1));
- 	}
- }
-@@ -625,7 +624,7 @@ static int __init pl010_console_setup(st
- 	 * if so, search for the first available port that does have
- 	 * console support.
- 	 */
--	if (co->index >= UART_NR)
-+	if (co->index >= SERIAL_AMBA_NR)
- 		co->index = 0;
- 	uap = amba_ports[co->index];
- 	if (!uap)
-@@ -643,7 +642,7 @@ static int __init pl010_console_setup(st
- 
- static struct uart_driver amba_reg;
- static struct console amba_console = {
--	.name		= "ttyAM",
-+	.name		= SERIAL_AMBA_NAME,
- 	.write		= pl010_console_write,
- 	.device		= uart_console_device,
- 	.setup		= pl010_console_setup,
-@@ -659,11 +658,11 @@ static struct console amba_console = {
- 
- static struct uart_driver amba_reg = {
- 	.owner			= THIS_MODULE,
--	.driver_name		= "ttyAM",
--	.dev_name		= "ttyAM",
-+	.driver_name		= SERIAL_AMBA_NAME,
-+	.dev_name		= SERIAL_AMBA_NAME,
- 	.major			= SERIAL_AMBA_MAJOR,
- 	.minor			= SERIAL_AMBA_MINOR,
--	.nr			= UART_NR,
-+	.nr			= SERIAL_AMBA_NR,
- 	.cons			= AMBA_CONSOLE,
- };
- 
-Index: linux/drivers/serial/Kconfig
-===================================================================
---- linux.orig/drivers/serial/Kconfig
-+++ linux/drivers/serial/Kconfig
-@@ -293,10 +293,25 @@ config SERIAL_AMBA_PL010
- 	help
- 	  This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
- 	  an Integrator/AP or Integrator/PP2 platform, or if you have a
--	  Cirrus Logic EP93xx CPU, say Y or M here.
-+	  Cirrus Logic EP93xx CPU or an Infineon ADM5120 SOC, say Y or M here.
- 
- 	  If unsure, say N.
- 
-+config SERIAL_AMBA_PL010_NUMPORTS
-+	int "Maximum number of AMBA PL010 serial ports"
-+	depends on SERIAL_AMBA_PL010
-+	default "8"
-+	---help---
-+	  Set this to the number of serial ports you want the AMBA PL010 driver
-+	  to support.
-+
-+config SERIAL_AMBA_PL010_PORTNAME
-+	string "Name of the AMBA PL010 serial ports"
-+	depends on SERIAL_AMBA_PL010
-+	default "ttyAM"
-+	---help---
-+	  ::: To be written :::
-+
- config SERIAL_AMBA_PL010_CONSOLE
- 	bool "Support for console on AMBA serial port"
- 	depends on SERIAL_AMBA_PL010=y
diff --git a/target/linux/adm5120/patches-2.6.22/201-amba_bus_hacks.patch b/target/linux/adm5120/patches-2.6.22/201-amba_bus_hacks.patch
deleted file mode 100644
index 3b92f2561..000000000
--- a/target/linux/adm5120/patches-2.6.22/201-amba_bus_hacks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: linux/drivers/amba/bus.c
-===================================================================
---- linux.orig/drivers/amba/bus.c
-+++ linux/drivers/amba/bus.c
-@@ -17,6 +17,10 @@
- #include <asm/io.h>
- #include <asm/sizes.h>
- 
-+#ifndef NO_IRQ
-+#define NO_IRQ		(-1)
-+#endif
-+
- #define to_amba_device(d)	container_of(d, struct amba_device, dev)
- #define to_amba_driver(d)	container_of(d, struct amba_driver, drv)
- 
diff --git a/target/linux/adm5120/patches-2.6.22/300-i2c_gpio_custom.patch b/target/linux/adm5120/patches-2.6.22/300-i2c_gpio_custom.patch
deleted file mode 100644
index 8c08b7403..000000000
--- a/target/linux/adm5120/patches-2.6.22/300-i2c_gpio_custom.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- linux-2.6.22.4.orig/drivers/i2c/busses/Kconfig	2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.22.4/drivers/i2c/busses/Kconfig	2007-10-09 12:53:13.000000000 +0200
-@@ -125,6 +125,17 @@
- 	  This is a very simple bitbanging I2C driver utilizing the
- 	  arch-neutral GPIO API to control the SCL and SDA lines.
- 
-+config I2C_GPIO_CUSTOM
-+	tristate "Custom GPIO-based I2C driver"
-+	depends on GENERIC_GPIO
-+	select I2C_GPIO
-+	help
-+	  This is an I2C driver to register 1 to 4 custom I2C buses using 
-+	  GPIO lines.
-+
-+	  This support is also available as a module.  If so, the module
-+	  will be called i2c-gpio-custom.
-+
- config I2C_HYDRA
- 	tristate "CHRP Apple Hydra Mac I/O I2C interface"
- 	depends on PCI && PPC_CHRP && EXPERIMENTAL
---- linux-2.6.22.4.orig/drivers/i2c/busses/Makefile	2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.22.4/drivers/i2c/busses/Makefile	2007-10-09 12:07:45.000000000 +0200
-@@ -13,6 +13,7 @@
- obj-$(CONFIG_I2C_BLACKFIN_TWI)	+= i2c-bfin-twi.o
- obj-$(CONFIG_I2C_ELEKTOR)	+= i2c-elektor.o
- obj-$(CONFIG_I2C_GPIO)		+= i2c-gpio.o
-+obj-$(CONFIG_I2C_GPIO_CUSTOM)	+= i2c-gpio-custom.o
- obj-$(CONFIG_I2C_HYDRA)		+= i2c-hydra.o
- obj-$(CONFIG_I2C_I801)		+= i2c-i801.o
- obj-$(CONFIG_I2C_I810)		+= i2c-i810.o
diff --git a/target/linux/adm5120/patches-2.6.23/006-adm5120_leds.patch b/target/linux/adm5120/patches-2.6.23/006-adm5120_leds.patch
index 30f9234e1..e40b77a36 100644
--- a/target/linux/adm5120/patches-2.6.23/006-adm5120_leds.patch
+++ b/target/linux/adm5120/patches-2.6.23/006-adm5120_leds.patch
@@ -2,16 +2,10 @@ Index: linux-2.6.23/drivers/leds/Kconfig
 ===================================================================
 --- linux-2.6.23.orig/drivers/leds/Kconfig
 +++ linux-2.6.23/drivers/leds/Kconfig
-@@ -18,6 +18,27 @@ config LEDS_CLASS
+@@ -18,6 +18,21 @@ config LEDS_CLASS
  
  comment "LED drivers"
  
-+config LEDS_GPIO
-+	tristate "LED support for LEDS on GPIO lines"
-+	depends on LEDS_CLASS && GENERIC_GPIO
-+	help
-+	  This option enables support for LEDs connected to GPIO lines
-+
 +config LEDS_ADM5120
 +	tristate "LED Support for ADM5120 GPIO LEDs"
 +	depends on LEDS_GPIO && MIPS_ADM5120
@@ -34,11 +28,10 @@ Index: linux-2.6.23/drivers/leds/Makefile
 ===================================================================
 --- linux-2.6.23.orig/drivers/leds/Makefile
 +++ linux-2.6.23/drivers/leds/Makefile
-@@ -5,6 +5,8 @@ obj-$(CONFIG_LEDS_CLASS)		+= led-class.o
+@@ -5,6 +5,7 @@ obj-$(CONFIG_LEDS_CLASS)		+= led-class.o
  obj-$(CONFIG_LEDS_TRIGGERS)		+= led-triggers.o
  
  # LED Platform Drivers
-+obj-$(CONFIG_LEDS_GPIO)		+= leds-gpio.o
 +obj-$(CONFIG_LEDS_ADM5120)		+= leds-adm5120.o
  obj-$(CONFIG_LEDS_CORGI)		+= leds-corgi.o
  obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
diff --git a/target/linux/adm5120/router_be/config-2.6.22 b/target/linux/adm5120/router_be/config-2.6.23
index 0fca8f8fb..1c6b7e1f8 100644
--- a/target/linux/adm5120/router_be/config-2.6.22
+++ b/target/linux/adm5120/router_be/config-2.6.23
@@ -1,6 +1,5 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_ADM5120_CPU_OVERRIDES=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -22,6 +21,7 @@ CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
+# CONFIG_CPU_LOONGSON2 is not set
 CONFIG_CPU_MIPS32=y
 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
@@ -45,7 +45,7 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_DDB5477 is not set
+# CONFIG_CRYPTO_HW is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -61,11 +61,11 @@ CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_GEN_RTC is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
+CONFIG_HID_SUPPORT=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
@@ -81,7 +81,7 @@ CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_EVDEV is not set
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_TUNNEL=m
@@ -94,6 +94,7 @@ CONFIG_LEDS_ADM5120_DIAG=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -105,7 +106,6 @@ CONFIG_MIPS_ADM5120=y
 CONFIG_MIPS_ADM5120_ENET=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_EV64120 is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_MT_DISABLED=y
@@ -113,11 +113,7 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_ADM5120=y
@@ -166,6 +162,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NETDEV_1000=y
+CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
@@ -173,6 +170,7 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_NAT_PROTO_GRE=m
+# CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -180,14 +178,17 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_ADM5120=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNPACPI is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_RTC is not set
+# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SERIAL_ADM5120 is not set
 CONFIG_SERIAL_AMBA_PL010=y
@@ -240,11 +241,13 @@ CONFIG_USB_ADM5120_HCD=m
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set
+# CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_ZD1211RW is not set
diff --git a/target/linux/adm5120/router_le/config-2.6.22 b/target/linux/adm5120/router_le/config-2.6.23
index a87658360..5165b54f4 100644
--- a/target/linux/adm5120/router_le/config-2.6.22
+++ b/target/linux/adm5120/router_le/config-2.6.23
@@ -1,6 +1,5 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_ADM5120_CPU_OVERRIDES=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -22,6 +21,7 @@ CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_LOONGSON2 is not set
 CONFIG_CPU_MIPS32=y
 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
@@ -45,7 +45,7 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_DDB5477 is not set
+# CONFIG_CRYPTO_HW is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -61,11 +61,11 @@ CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_GEN_RTC is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
+CONFIG_HID_SUPPORT=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
@@ -81,7 +81,7 @@ CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_EVDEV is not set
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_TUNNEL=m
@@ -94,6 +94,7 @@ CONFIG_LEDS_ADM5120_DIAG=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -105,7 +106,6 @@ CONFIG_MIPS_ADM5120=y
 CONFIG_MIPS_ADM5120_ENET=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_EV64120 is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_MT_DISABLED=y
@@ -113,11 +113,7 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_ADM5120=y
@@ -176,6 +172,8 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_TRXSPLIT=y
 # CONFIG_NETDEV_1000 is not set
+# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
+CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
@@ -183,6 +181,7 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_NAT_PROTO_GRE=m
+# CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -190,14 +189,17 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_ADM5120=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNPACPI is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_RTC is not set
+# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SERIAL_ADM5120 is not set
 CONFIG_SERIAL_AMBA_PL010=y
@@ -245,7 +247,6 @@ CONFIG_USB_ADM5120_HCD=m
 # CONFIG_USB_ALI_M5632 is not set
 # CONFIG_USB_AN2720 is not set
 # CONFIG_USB_CATC is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_NET_DM9601 is not set
@@ -257,8 +258,10 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_V4L1=y
 CONFIG_VM_EVENT_COUNTERS=y