strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.

SVN-Revision: 8653

3 files changed, 0 insertions, 959 deletions

diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120-flash.c
deleted file mode 100644
index 0a2590e..0000000
--- a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120-flash.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- *  $Id$
- *
- *  Platform driver for NOR flash devices on ADM5120 based boards
- *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was derived from: drivers/mtd/map/physmap.c
- *	Copyright (C) 2003 MontaVista Software Inc.
- *	Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- *  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/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/device.h>
-
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-
-#include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_switch.h>
-#include <asm/mach-adm5120/adm5120_mpmc.h>
-#include <asm/mach-adm5120/adm5120_platform.h>
-
-#define DRV_NAME	"adm5120-flash"
-#define DRV_DESC	"ADM5120 flash MAP driver"
-#define MAX_PARSED_PARTS 8
-
-#ifdef ADM5120_FLASH_DEBUG
-#define MAP_DBG(m, f, a...)	printk(KERN_INFO "%s: " f, (m->name) , ## a)
-#else
-#define MAP_DBG(m, f, a...)	do {} while (0)
-#endif
-#define MAP_ERR(m, f, a...)	printk(KERN_ERR "%s: " f, (m->name) , ## a)
-#define MAP_INFO(m, f, a...)	printk(KERN_INFO "%s: " f, (m->name) , ## a)
-
-struct adm5120_map_info {
-	struct map_info	map;
-	void 		(*switch_bank)(unsigned);
-	unsigned long	window_size;
-};
-
-struct adm5120_flash_info {
-	struct mtd_info		*mtd;
-	struct resource		*res;
-	struct platform_device	*dev;
-	struct adm5120_map_info	amap;
-#ifdef CONFIG_MTD_PARTITIONS
-	int			nr_parts;
-	struct mtd_partition	*parts[MAX_PARSED_PARTS];
-#endif
-};
-
-struct flash_desc {
-	u32	phys;
-	u32	srs_shift;
-	u32	mpmc_reg;
-};
-
-/*
- * Globals
- */
-static DEFINE_SPINLOCK(adm5120_flash_spin);
-#define FLASH_LOCK()	spin_lock(&adm5120_flash_spin)
-#define FLASH_UNLOCK()	spin_unlock(&adm5120_flash_spin)
-
-static u32 flash_bankwidths[4] = { 1, 2, 4, 0 };
-
-static u32 flash_sizes[8] = {
-	0, 512*1024, 1024*1024, 2*1024*1024,
-	4*1024*1024, 0, 0, 0
-};
-
-static struct flash_desc flash_descs[2] = {
-	{
-		.phys		= ADM5120_SRAM0_BASE,
-		.mpmc_reg	= MPMC_REG_SC1,
-		.srs_shift	= MEMCTRL_SRS0_SHIFT,
-	}, {
-		.phys		= ADM5120_SRAM1_BASE,
-		.mpmc_reg	= MPMC_REG_SC0,
-		.srs_shift	= MEMCTRL_SRS1_SHIFT,
-	}
-};
-
-static const char *probe_types[] = {
-	"cfi_probe",
-	"jedec_probe",
-	"map_rom",
-	NULL
-};
-
-#ifdef CONFIG_MTD_PARTITIONS
-static const char *parse_types[] = {
-	"cmdlinepart",
-#ifdef CONFIG_MTD_REDBOOT_PARTS
-	"RedBoot",
-#endif
-#ifdef CONFIG_MTD_MYLOADER_PARTS
-	"MyLoader",
-#endif
-};
-#endif
-
-#define BANK_SIZE	(2<<20)
-#define BANK_SIZE_MAX	(4<<20)
-#define BANK_OFFS_MASK	(BANK_SIZE-1)
-#define BANK_START_MASK	(~BANK_OFFS_MASK)
-
-static inline struct adm5120_map_info *map_to_amap(struct map_info *map)
-{
-	return (struct adm5120_map_info *)map;
-}
-
-static void adm5120_flash_switchbank(struct map_info *map,
-		unsigned long ofs)
-{
-	struct adm5120_map_info *amap = map_to_amap(map);
-	unsigned bank;
-
-	if (amap->switch_bank == NULL)
-		return;
-
-	bank = (ofs & BANK_START_MASK) >> 21;
-	if (bank > 1)
-		BUG();
-
-	MAP_DBG(map, "switching to bank %u, ofs=%lX\n", bank, ofs);
-	amap->switch_bank(bank);
-}
-
-static map_word adm5120_flash_read(struct map_info *map, unsigned long ofs)
-{
-	struct adm5120_map_info *amap = map_to_amap(map);
-	map_word ret;
-
-	MAP_DBG(map, "reading from ofs %lX\n", ofs);
-
-	if (ofs >= amap->window_size)
-		return map_word_ff(map);
-
-	FLASH_LOCK();
-	adm5120_flash_switchbank(map, ofs);
-	ret = inline_map_read(map, (ofs & (amap->window_size-1)));
-	FLASH_UNLOCK();
-
-	return ret;
-}
-
-static void adm5120_flash_write(struct map_info *map, const map_word datum,
-		unsigned long ofs)
-{
-	struct adm5120_map_info *amap = map_to_amap(map);
-
-	MAP_DBG(map,"writing to ofs %lX\n", ofs);
-
-	if (ofs > amap->window_size)
-		return;
-
-	FLASH_LOCK();
-	adm5120_flash_switchbank(map, ofs);
-	inline_map_write(map, datum, (ofs & (amap->window_size-1)));
-	FLASH_UNLOCK();
-}
-
-static void adm5120_flash_copy_from(struct map_info *map, void *to,
-		unsigned long from, ssize_t len)
-{
-	struct adm5120_map_info *amap = map_to_amap(map);
-	char *p;
-	ssize_t t;
-
-	MAP_DBG(map, "copy_from, to=%lX, from=%lX, len=%lX\n",
-		(unsigned long)to, from, (unsigned long)len);
-
-	if (from > amap->window_size)
-		return;
-
-	p = (char *)to;
-	while (len > 0) {
-		t = len;
-		if ((from < BANK_SIZE) && ((from+len) > BANK_SIZE))
-			t = BANK_SIZE-from;
-
-		FLASH_LOCK();
-		MAP_DBG(map, "copying %lu byte(s) from %lX to %lX\n",
-			(unsigned long)t, (from & (amap->window_size-1)),
-			(unsigned long)p);
-		adm5120_flash_switchbank(map, from);
-		inline_map_copy_from(map, p, (from & (amap->window_size-1)), t);
-		FLASH_UNLOCK();
-		p += t;
-		from += t;
-		len -= t;
-	}
-}
-
-static int adm5120_flash_initres(struct adm5120_flash_info *info)
-{
-	struct map_info *map = &info->amap.map;
-	int err = 0;
-
-	info->res = request_mem_region(map->phys, map->size, map->name);
-	if (info->res == NULL) {
-		MAP_ERR(map, "could not reserve memory region\n");
-		err = -ENOMEM;
-		goto out;
-	}
-
-	map->virt = ioremap_nocache(map->phys, map->size);
-	if (map->virt == NULL) {
-		MAP_ERR(map, "failed to ioremap flash region\n");
-		err = -ENOMEM;
-		goto out;
-	}
-
-out:
-	return err;
-}
-
-#define SWITCH_READ(r) *(u32 *)(KSEG1ADDR(ADM5120_SWITCH_BASE)+(r))
-#define SWITCH_WRITE(r,v) *(u32 *)(KSEG1ADDR(ADM5120_SWITCH_BASE)+(r))=(v)
-#define MPMC_READ(r) *(u32 *)(KSEG1ADDR(ADM5120_MPMC_BASE)+(r))
-#define MPMC_WRITE(r,v) *(u32 *)(KSEG1ADDR(ADM5120_MPMC_BASE)+(r))=(v)
-
-static int adm5120_flash_initinfo(struct adm5120_flash_info *info,
-		struct platform_device *dev)
-{
-	struct map_info *map = &info->amap.map;
-	struct adm5120_flash_platform_data *pdata = dev->dev.platform_data;
-	struct flash_desc *fdesc;
-	u32 t;
-
-	map->name = dev->dev.bus_id;
-
-	if (dev->id > 1) {
-		MAP_ERR(map, "invalid flash id\n");
-		goto err_out;
-	}
-
-	fdesc = &flash_descs[dev->id];
-
-	/* get memory window size */
-	t = SWITCH_READ(SWITCH_REG_MEMCTRL) >> fdesc->srs_shift;
-	t &= MEMCTRL_SRS_MASK;
-	info->amap.window_size = flash_sizes[t];
-	if (info->amap.window_size == 0) {
-		MAP_ERR(map, "invalid flash size detected\n");
-		goto err_out;
-	}
-
-	/* get flash bus width */
-	t = MPMC_READ(fdesc->mpmc_reg) & SC_MW_MASK;
-	map->bankwidth = flash_bankwidths[t];
-	if (map->bankwidth == 0) {
-		MAP_ERR(map, "invalid bus width detected\n");
-		goto err_out;
-	}
-
-	map->phys = fdesc->phys;
-	map->size = BANK_SIZE_MAX;
-
-	simple_map_init(map);
-	map->read = adm5120_flash_read;
-	map->write = adm5120_flash_write;
-	map->copy_from = adm5120_flash_copy_from;
-
-	if (pdata) {
-		map->set_vpp = pdata->set_vpp;
-		info->amap.switch_bank = pdata->switch_bank;
-	}
-
-	info->dev = dev;
-
-	MAP_INFO(map, "probing at 0x%lX, size:%ldKiB, width:%d bits\n",
-		(unsigned long)map->phys,
-		(unsigned long)info->amap.window_size >> 10,
-		map->bankwidth*8);
-
-	return 0;
-
-err_out:
-	return -ENODEV;
-}
-
-static void adm5120_flash_initbanks(struct adm5120_flash_info *info)
-{
-	struct map_info *map = &info->amap.map;
-
-	if (info->mtd->size <= BANK_SIZE)
-		/* no bank switching needed */
-		return;
-
-	if (info->amap.switch_bank) {
-		info->amap.window_size = info->mtd->size;
-		return;
-	}
-
-	MAP_ERR(map, "reduce visibility from %ldKiB to %ldKiB\n",
-		(unsigned long)map->size >> 10,
-		(unsigned long)info->mtd->size >> 10);
-
-	info->mtd->size = info->amap.window_size;
-}
-
-#ifdef CONFIG_MTD_PARTITIONS
-static int adm5120_flash_initparts(struct adm5120_flash_info *info)
-{
-	struct adm5120_flash_platform_data *pdata = info->dev->dev.platform_data;
-	struct map_info *map = &info->amap.map;
-	int num_parsers;
-	const char *parser[2];
-	int err = 0;
-	int nr_parts;
-	int i;
-
-	info->nr_parts = 0;
-
-	if (pdata == NULL)
-		goto out;
-
-	if (pdata->nr_parts) {
-		MAP_INFO(map, "adding static partitions\n");
-		err = add_mtd_partitions(info->mtd, pdata->parts,
-			pdata->nr_parts);
-		if (err == 0) {
-			info->nr_parts += pdata->nr_parts;
-			goto out;
-		}
-	}
-
-	num_parsers = ARRAY_SIZE(parse_types);
-	if (num_parsers > MAX_PARSED_PARTS)
-		num_parsers = MAX_PARSED_PARTS;
-
-	parser[1] = NULL;
-	for (i=0; i<num_parsers; i++) {
-		parser[0] = parse_types[i];
-
-		MAP_INFO(map, "parsing \"%s\" partitions\n",
-			parser[0]);
-		nr_parts = parse_mtd_partitions(info->mtd, parser,
-			&info->parts[i], 0);
-
-		if (nr_parts <= 0)
-			continue;
-
-		MAP_INFO(map, "adding \"%s\" partitions\n",
-			parser[0]);
-
-		err = add_mtd_partitions(info->mtd, info->parts[i], nr_parts);
-		if (err)
-			break;
-
-		info->nr_parts += nr_parts;
-	}
-out:
-	return err;
-}
-#else
-static int adm5120_flash_initparts(struct adm5120_flash_info *info)
-{
-	return 0;
-}
-#endif /* CONFIG_MTD_PARTITIONS */
-
-#ifdef CONFIG_MTD_PARTITIONS
-static void adm5120_flash_remove_mtd(struct adm5120_flash_info *info)
-{
-	int i;
-
-	if (info->nr_parts) {
-		del_mtd_partitions(info->mtd);
-		for (i=0; i<MAX_PARSED_PARTS; i++)
-			if (info->parts[i] != NULL)
-				kfree(info->parts[i]);
-	} else {
-		del_mtd_device(info->mtd);
-	}
-}
-#else
-static void adm5120_flash_remove_mtd(struct adm5120_flash_info *info)
-{
-	del_mtd_device(info->mtd);
-}
-#endif
-
-static int adm5120_flash_remove(struct platform_device *dev)
-{
-	struct adm5120_flash_info *info;
-
-	info = platform_get_drvdata(dev);
-	if (info == NULL)
-		return 0;
-
-	platform_set_drvdata(dev, NULL);
-
-	if (info->mtd != NULL) {
-		adm5120_flash_remove_mtd(info);
-		map_destroy(info->mtd);
-	}
-
-	if (info->amap.map.virt != NULL)
-		iounmap(info->amap.map.virt);
-
-	if (info->res != NULL) {
-		release_resource(info->res);
-		kfree(info->res);
-	}
-
-	return 0;
-}
-
-static int adm5120_flash_probe(struct platform_device *dev)
-{
-	struct adm5120_flash_info *info;
-	struct map_info *map;
-	const char **probe_type;
-	int err;
-
-	info = kzalloc(sizeof(*info), GFP_KERNEL);
-	if (info == NULL) {
-		err = -ENOMEM;
-		goto err_out;
-	}
-
-	platform_set_drvdata(dev, info);
-
-	err = adm5120_flash_initinfo(info, dev);
-	if (err)
-		goto err_out;
-
-	err = adm5120_flash_initres(info);
-	if (err)
-		goto err_out;
-
-	map = &info->amap.map;
-	for (probe_type = probe_types; info->mtd == NULL && *probe_type != NULL;
-		probe_type++)
-		info->mtd = do_map_probe(*probe_type, map);
-
-	if (info->mtd == NULL) {
-		MAP_ERR(map, "map_probe failed\n");
-		err = -ENXIO;
-		goto err_out;
-	}
-
-	adm5120_flash_initbanks(info);
-
-	if (info->mtd->size < info->amap.window_size) {
-		/* readjust resources */
-		iounmap(map->virt);
-		release_resource(info->res);
-		kfree(info->res);
-
-		info->amap.window_size = info->mtd->size;
-		map->size = info->mtd->size;
-		MAP_INFO(map, "reducing map size to %ldKiB\n",
-			(unsigned long)map->size >> 10);
-		err = adm5120_flash_initres(info);
-		if (err)
-			goto err_out;
-	}
-
-	MAP_INFO(map, "found at 0x%lX, size:%ldKiB, width:%d bits\n",
-		(unsigned long)map->phys, (unsigned long)info->mtd->size >> 10,
-		map->bankwidth*8);
-
-	info->mtd->owner = THIS_MODULE;
-
-	err = adm5120_flash_initparts(info);
-	if (err)
-		goto err_out;
-
-	if (info->nr_parts == 0) {
-		MAP_INFO(map, "no partitions available, registering whole flash\n");
-		add_mtd_device(info->mtd);
-	}
-
-	return 0;
-
-err_out:
-	adm5120_flash_remove(dev);
-	return err;
-}
-
-#ifdef CONFIG_PM
-static int adm5120_flash_suspend(struct platform_device *dev, pm_message_t state)
-{
-	struct adm5120_flash_info *info = platform_get_drvdata(dev);
-	int ret = 0;
-
-	if (info)
-		ret = info->mtd->suspend(info->mtd);
-
-	return ret;
-}
-
-static int adm5120_flash_resume(struct platform_device *dev)
-{
-	struct adm5120_flash_info *info = platform_get_drvdata(dev);
-
-	if (info)
-		info->mtd->resume(info->mtd);
-
-	return 0;
-}
-
-static void adm5120_flash_shutdown(struct platform_device *dev)
-{
-	struct adm5120_flash_info *info = platform_get_drvdata(dev);
-
-	if (info && info->mtd->suspend(info->mtd) == 0)
-		info->mtd->resume(info->mtd);
-}
-#endif
-
-static struct platform_driver adm5120_flash_driver = {
-	.probe		= adm5120_flash_probe,
-	.remove		= adm5120_flash_remove,
-#ifdef CONFIG_PM
-	.suspend	= adm5120_flash_suspend,
-	.resume		= adm5120_flash_resume,
-	.shutdown	= adm5120_flash_shutdown,
-#endif
-	.driver		= {
-		.name	= DRV_NAME,
-	},
-};
-
-static int __init adm5120_flash_init(void)
-{
-	int err;
-
-	err = platform_driver_register(&adm5120_flash_driver);
-
-	return err;
-}
-
-static void __exit adm5120_flash_exit(void)
-{
-	platform_driver_unregister(&adm5120_flash_driver);
-}
-
-module_init(adm5120_flash_init);
-module_exit(adm5120_flash_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION(DRV_DESC);
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c b/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
deleted file mode 100644
index ad207e5..0000000
--- a/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  $Id$
- *
- *  Parse MyLoader-style flash partition tables and produce a Linux partition
- *  array to match.
- *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on drivers/mtd/redboot.c
- *  Author: Red Hat, Inc. - David Woodhouse <dwmw2@cambridge.redhat.com>
- *
- *  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/slab.h>
-#include <linux/init.h>
-#include <linux/vmalloc.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
-#include <linux/byteorder/generic.h>
-
-#include <prom/myloader.h>
-
-#define NAME_LEN_MAX		20
-#define NAME_MYLOADER		"MyLoader"
-#define NAME_PARTITION_TABLE	"Partition Table"
-#define BLOCK_LEN_MIN		0x10000
-
-int parse_myloader_partitions(struct mtd_info *master,
-			struct mtd_partition **pparts,
-			unsigned long origin)
-{
-	struct mylo_partition_table *tab;
-	struct mylo_partition *part;
-	struct mtd_partition *mtd_parts;
-	struct mtd_partition *mtd_part;
-	int num_parts;
-	int ret, i;
-	size_t retlen;
-	size_t parts_len;
-	char *names;
-	unsigned long offset;
-	unsigned long blocklen;
-
-	tab = vmalloc(sizeof(*tab));
-	if (!tab) {
-		return -ENOMEM;
-		goto out;
-	}
-
-	blocklen = master->erasesize;
-	if (blocklen < BLOCK_LEN_MIN)
-		blocklen = BLOCK_LEN_MIN;
-
-	/* Partition Table is always located on the second erase block */
-	offset = blocklen;
-	printk(KERN_NOTICE "%s: searching for MyLoader partition table at "
-			"offset 0x%lx\n", master->name, offset);
-
-	ret = master->read(master, offset, sizeof(*tab), &retlen, (void *)tab);
-	if (ret)
-		goto out;
-
-	if (retlen != sizeof(*tab)) {
-		ret = -EIO;
-		goto out_free_buf;
-	}
-
-	/* Check for Partition Table magic number */
-	if (tab->magic != le32_to_cpu(MYLO_MAGIC_PARTITIONS)) {
-		printk(KERN_NOTICE "%s: no MyLoader partition table found\n",
-			master->name);
-		ret = 0;
-		goto out_free_buf;
-	}
-
-	/* The MyLoader and the Partition Table is always present */
-	num_parts = 2;
-
-	/* Detect number of used partitions */
-	for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
-		part = &tab->partitions[i];
-
-		if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
-			continue;
-
-		num_parts++;
-	}
-
-	mtd_parts = kzalloc((num_parts*sizeof(*mtd_part) + num_parts*NAME_LEN_MAX),
-			 GFP_KERNEL);
-
-	if (!mtd_parts) {
-		ret = -ENOMEM;
-		goto out_free_buf;
-	}
-
-	mtd_part = mtd_parts;
-	names = (char *)&mtd_parts[num_parts];
-
-	strncpy(names, NAME_MYLOADER, NAME_LEN_MAX-1);
-	mtd_part->name = names;
-	mtd_part->offset = 0;
-	mtd_part->size = blocklen;
-	mtd_part->mask_flags = MTD_WRITEABLE;
-	mtd_part++;
-	names += NAME_LEN_MAX;
-
-	strncpy(names, NAME_PARTITION_TABLE, NAME_LEN_MAX-1);
-	mtd_part->name = names;
-	mtd_part->offset = blocklen;
-	mtd_part->size = blocklen;
-	mtd_part->mask_flags = MTD_WRITEABLE;
-	mtd_part++;
-	names += NAME_LEN_MAX;
-
-	for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
-		part = &tab->partitions[i];
-
-		if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
-			continue;
-
-		sprintf(names, "partition%d", i);
-		mtd_part->offset = le32_to_cpu(part->addr);
-		mtd_part->size = le32_to_cpu(part->size);
-		mtd_part->name = names;
-		mtd_part++;
-		names += NAME_LEN_MAX;
-	}
-
-	*pparts = mtd_parts;
-	ret = num_parts;
-
-out_free_buf:
-	vfree(tab);
-out:
-	return ret;
-}
-
-static struct mtd_part_parser mylo_mtd_parser = {
-	.owner = THIS_MODULE,
-	.parse_fn = parse_myloader_partitions,
-	.name = NAME_MYLOADER,
-};
-
-static int __init mylo_mtd_parser_init(void)
-{
-	return register_mtd_parser(&mylo_mtd_parser);
-}
-
-static void __exit mylo_mtd_parser_exit(void)
-{
-	deregister_mtd_parser(&mylo_mtd_parser);
-}
-
-module_init(mylo_mtd_parser_init);
-module_exit(mylo_mtd_parser_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION("Parsing code for MyLoader partition tables");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c b/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
deleted file mode 100644
index 2e7059d..0000000
--- a/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*==============================================================================*/
-/* rbmipsnand.c                                                                 */
-/* This module is derived from the 2.4 driver shipped by Microtik for their     */
-/* Routerboard 1xx and 5xx series boards.  It provides support for the built in */
-/* NAND flash on the Routerboard 1xx series boards for Linux 2.6.19+.           */
-/* Licence: Original Microtik code seems not to have a licence.                 */
-/*          Rewritten code all GPL V2.                                          */
-/* Copyright(C) 2007 david.goodenough@linkchoose.co.uk (for rewriten code)      */
-/*==============================================================================*/
-
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/delay.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/bootinfo.h>
-#include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_defs.h>
-
-#define SMEM1(x) (*((volatile unsigned char *) (KSEG1ADDR(ADM5120_SRAM1_BASE) + x)))
-
-#define NAND_RW_REG	0x0	//data register
-#define NAND_SET_CEn	0x1	//CE# low
-#define NAND_CLR_CEn	0x2	//CE# high
-#define NAND_CLR_CLE	0x3	//CLE low
-#define NAND_SET_CLE	0x4	//CLE high
-#define NAND_CLR_ALE	0x5	//ALE low
-#define NAND_SET_ALE	0x6	//ALE high
-#define NAND_SET_SPn	0x7	//SP# low (use spare area)
-#define NAND_CLR_SPn	0x8	//SP# high (do not use spare area)
-#define NAND_SET_WPn	0x9	//WP# low
-#define NAND_CLR_WPn	0xA	//WP# high
-#define NAND_STS_REG	0xB	//Status register
-
-#define MEM32(x) *((volatile unsigned *) (x))
-
-static struct mtd_partition partition_info[] = {
-    {
-        name: "RouterBoard NAND Boot",
-        offset: 0,
-        size: 4 * 1024 * 1024
-    },
-    {
-        name: "rootfs",
-        offset: MTDPART_OFS_NXTBLK,
-        size: MTDPART_SIZ_FULL
-    }
-};
-
-static struct nand_ecclayout rb_ecclayout = {
-        .eccbytes = 6,
-        .eccpos = { 8, 9, 10, 13, 14, 15 },
-        .oobavail = 9,
-        .oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1} }
-};
-
-struct adm5120_nand_info {
-	struct nand_chip chip;
-	struct mtd_info mtd;
-	void __iomem *io_base;
-#ifdef CONFIG_MTD_PARTITIONS
-	int	nr_parts;
-	struct mtd_partition *parts;
-#endif
-	unsigned int	init_ok;
-};
-
-static int rb100_dev_ready(struct mtd_info *mtd)
-{
-	return SMEM1(NAND_STS_REG) & 0x80;
-}
-
-static void rbmips_hwcontrol100(struct mtd_info *mtd, int cmd, unsigned int ctrl)
-{
-    	struct nand_chip *chip = mtd->priv;
-	if (ctrl & NAND_CTRL_CHANGE)
-	{
-        	SMEM1((( ctrl & NAND_CLE) ? NAND_SET_CLE : NAND_CLR_CLE)) = 0x01;
-        	SMEM1((( ctrl & NAND_ALE) ? NAND_SET_ALE : NAND_CLR_ALE)) = 0x01;
-        	SMEM1((( ctrl & NAND_NCE) ? NAND_SET_CEn : NAND_CLR_CEn)) = 0x01;
-        }
-    	if (cmd != NAND_CMD_NONE)
-        	writeb( cmd, chip->IO_ADDR_W);
-}
-
-/*========================================================================*/
-/* We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader */
-/* will not be able to find the kernel that we load.  So set the oobinfo  */
-/* when creating the partitions.                                          */ 
-/*========================================================================*/
-
-
-unsigned get_rbnand_block_size(struct adm5120_nand_info *data)
-{
-	return data->init_ok ? data->mtd.writesize : 0;
-}
-
-EXPORT_SYMBOL(get_rbnand_block_size);
-
-static int rbmips_probe(struct platform_device *pdev)
-{
-	struct adm5120_nand_info *data;
-	int res = 0;
-
-	/* Allocate memory for the nand_chip structure */
-	data = kzalloc(sizeof(*data), GFP_KERNEL);
-	if (!data) {
-		dev_err(&pdev->dev, "Failed to allocate device structure\n");
-		return -ENOMEM;
-
-	}
-	
-	data->io_base = ioremap(pdev->resource[0].start, pdev->resource[0].end - pdev->resource[0].start + 1);
-
-	if (data->io_base == NULL) {
-		dev_err(&pdev->dev, "ioremap failed\n");
-		kfree(data);
-		return -EIO;
-	}
-
-	MEM32(0xB2000064) = 0x100;
-	MEM32(0xB2000008) = 0x1;
-	SMEM1(NAND_SET_SPn) = 0x01;
-	SMEM1(NAND_CLR_WPn) = 0x01;
-
-	data->chip.priv = &data;
-	data->mtd.priv = &data->chip;
-	data->mtd.owner = THIS_MODULE;
-
-	data->init_ok = 0;
-	data->chip.IO_ADDR_R = (unsigned char *)KSEG1ADDR(ADM5120_SRAM1_BASE);
-	data->chip.IO_ADDR_W = data->chip.IO_ADDR_R;
-	data->chip.cmd_ctrl = rbmips_hwcontrol100;
-	data->chip.dev_ready = rb100_dev_ready;
-	data->chip.ecc.mode = NAND_ECC_SOFT;
-	data->chip.ecc.layout = &rb_ecclayout;
-	data->chip.chip_delay = 25;
-	data->chip.options |= NAND_NO_AUTOINCR;
-
-	platform_set_drvdata(pdev, data);
-
-	/* Why do we need to scan 4 times ? */
-	if (nand_scan(&data->mtd, 1) && nand_scan(&data->mtd, 1) && nand_scan(&data->mtd, 1)  && nand_scan(&data->mtd, 1)) {
-		printk(KERN_INFO "RB1xxx nand device not found\n");
-		res = -ENXIO;
-		goto out;
-	}
-
-	add_mtd_partitions(&data->mtd, partition_info, 2);
-	data->init_ok = 1;
-
-	res = add_mtd_device(&data->mtd);
-	if (!res)
-		return res;
-
-	nand_release(&data->mtd);
-out:
-	platform_set_drvdata(pdev, NULL);
-	iounmap(data->io_base);
-	kfree(data);
-	return res;
-}
-
-static int __devexit rbmips_remove(struct platform_device *pdev)
-{
-	struct adm5120_nand_info *data = platform_get_drvdata(pdev);
-	
-	nand_release(&data->mtd);
-	iounmap(data->io_base);
-	kfree(data);
-	
-	return 0;
-}
-
-static struct platform_driver adm5120_nand_driver = {
-	.probe 		= rbmips_probe,
-	.remove 	= rbmips_remove,
-	.driver 	= {
-		.name	= "adm5120-nand",
-		.owner	= THIS_MODULE,
-	},
-};
-
-static int __init adm5120_nand_init(void)
-{
-	int err;
-	err = platform_driver_register(&adm5120_nand_driver);
-	return err;
-}
-
-static void __exit adm5120_nand_exit(void)
-{
-	platform_driver_unregister(&adm5120_nand_driver);
-}
-
-module_init(adm5120_nand_init);
-module_exit(adm5120_nand_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Goodenough, Florian Fainelli");
-MODULE_DESCRIPTION("RouterBOARD 100 NAND driver");
-