introduce cdev

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

3 files changed, 6 insertions, 361 deletions

diff --git a/common/Makefile b/common/Makefile
index f0555a628e..e6e2efb382 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -12,7 +12,6 @@ obj-y += clock.o
 obj-y += command.o
 obj-$(CONFIG_CONSOLE_FULL) += console.o
 obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o
-obj-$(CONFIG_PARTITION) += partition.o
 obj-y += env.o
 obj-y += startup.o
 obj-y += misc.o
diff --git a/common/partition.c b/common/partition.c
deleted file mode 100644
index d374e6c031..0000000000
--- a/common/partition.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * (C) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/**
- * @file
- * @brief Partition handling on top of devices
- */
-
-#include <common.h>
-#include <init.h>
-#include <driver.h>
-#include <malloc.h>
-#include <errno.h>
-#include <partition.h>
-#include <xfuncs.h>
-#include <ioctl.h>
-#include <nand.h>
-#include <linux/mtd/mtd-abi.h>
-
-/**
- * Add one partition on top of a device, as a device.
- * @param[in] dev The device to add a partition on
- * @param[in] offset Start offset of the partition inside the whole device
- * @param[in] size Size of the new partition
- * @param[in] flags FIXME
- * @param[in] name Partition name (can be obtained with devinfo command)
- * @return The device representing the new partition.
- */
-struct device_d *dev_add_partition(struct device_d *dev, unsigned long offset,
-		size_t size, int flags, const char *name)
-{
-	struct partition *part;
-
-	if (offset + size > dev->size)
-		return NULL;
-
-	part = xzalloc(sizeof(struct partition));
-
-	strcpy(part->device.name, "partition");
-	part->device.map_base = dev->map_base + offset;
-	part->device.size = size;
-	part->device.type_data = part;
-	part->device.type = DEVICE_TYPE_PARTITION;
-	get_free_deviceid(part->device.id, name);
-
-	part->offset = offset;
-	part->physdev = dev;
-	part->flags = flags;
-
-	register_device(&part->device);
-	dev_add_child(dev, &part->device);
-
-	if (part->device.driver)
-		return &part->device;
-
-	unregister_device(&part->device);
-	free(part);
-	return 0;
-}
-
-/**
- * Erase partition content.
- * @param[in] dev The partition info as a device
- * @param[in] count Length in bytes to erase
- * @param[in] offset Start offset within the partition
- * @return -1 if no erase feature for this device is available, anything else
- * the erase function returns.
- */
-static int part_erase(struct device_d *dev, size_t count, unsigned long offset)
-{
-	struct partition *part = dev->type_data;
-
-	if (part->flags & PARTITION_READONLY)
- 		return -EROFS;
-
-	return dev_erase(part->physdev, count, offset + part->offset);
-}
-
-/**
- * Protecting a partition.
- * @param[in] dev The partition info as a device
- * @param[in] count Length in bytes to protect
- * @param[in] offset Start offset within the partition
- * @param[in] prot FIXME
- * @return -1 if FIXME.
- */
-static int part_protect(struct device_d *dev, size_t count, unsigned long offset, int prot)
-{
-	struct partition *part = dev->type_data;
-
-	return dev_protect(part->physdev, count, offset + part->offset, prot);
-}
-
-/**
- * FIXME.
- * @param[in] dev The partition info as a device
- * @param[in] map FXIME
- * @param[in] flags FIXME
- * @return -1 if FIXME.
- */
-static int part_memmap(struct device_d *dev, void **map, int flags)
-{
-	struct partition *part = dev->type_data;
-	int ret;
-
-	if (part->physdev->driver->memmap) {
-		ret = part->physdev->driver->memmap(part->physdev, map, flags);
-		if (ret)
-			return ret;
-		*map = (void *)((unsigned long)*map + part->offset);
-		return 0;
-	}
-
-	return -ENOSYS;
-}
-
-/**
- * FIXME.
- * @param[in] dev The partition info as a device
- * @param[in] buf FXIME
- * @param[in] count FXIME
- * @param[in] offset FXIME
- * @param[in] flags FIXME
- * @return FIXME.
- */
-static ssize_t part_read(struct device_d *dev, void *buf, size_t count,
-	unsigned long offset, ulong flags)
-{
-	struct partition *part = dev->type_data;
-
-	return dev_read(part->physdev, buf, count, offset + part->offset, flags);
-}
-
-/**
- * FIXME.
- * @param[in] dev The partition info as a device
- * @param[in] buf FXIME
- * @param[in] count FXIME
- * @param[in] offset FXIME
- * @param[in] flags FIXME
- * @return FIXME.
- */
-static ssize_t part_write(struct device_d *dev, const void *buf, size_t count,
-	unsigned long offset, ulong flags)
-{
-	struct partition *part = dev->type_data;
-
-	if (part->flags & PARTITION_READONLY)
- 		return -EROFS;
-	else
-		return dev_write(part->physdev, buf, count, offset + part->offset, flags);
-}
-
-static off_t part_lseek(struct device_d *dev, off_t ofs)
-{
-	struct partition *part = dev->type_data;
-
-	return dev_lseek(part->physdev, ofs);
-}
-
-static int part_open(struct device_d *dev, struct filep *f)
-{
-	struct partition *part = dev->type_data;
-
-	return dev_open(part->physdev, f);
-}
-
-static int part_close(struct device_d *dev, struct filep *f)
-{
-	struct partition *part = dev->type_data;
-
-	return dev_close(part->physdev, f);
-}
-
-static int part_ioctl(struct device_d *dev, int request,
-	void *buf)
-{
-	struct partition *part = dev->type_data;
-	off_t offset;
-
-	switch (request) {
-	case MEMSETBADBLOCK:
-	case MEMGETBADBLOCK:
-		offset = (off_t)buf;
-		offset += part->offset;
-		return dev_ioctl(part->physdev, request, (void *)offset);
-	case MEMGETINFO:
-		return dev_ioctl(part->physdev, request, buf);
-	}
-
-	return -ENOSYS;
-}
-
-/**
- * FIXME.
- * @param[in] dev The partition info as a device
- * @return FIXME.
- */
-static int part_probe(struct device_d *dev)
-{
-#ifdef DEBUG
-	struct partition *part = dev->type_data;
-#endif
-
-	debug("registering partition %s on device %s (size=0x%08x, name=%s)\n",
-			dev->id, part->physdev->id, dev->size, part->name);
-	return 0;
-}
-
-/**
- * FIXME.
- * @param[in] dev The partition info as a device
- */
-static void part_remove(struct device_d *dev)
-{
-}
-
-/**
- * Partition driver description
- */
-struct driver_d part_driver = {
-	.name  	= "partition",
-	.probe 	= part_probe,
-	.remove = part_remove,
-	.open   = part_open,
-	.close  = part_close,
-	.ioctl  = part_ioctl,
-	.read  	= part_read,
-	.write 	= part_write,
-	.lseek  = part_lseek,
-	.erase 	= part_erase,
-	.protect= part_protect,
-	.memmap = part_memmap,
-	.type	= DEVICE_TYPE_PARTITION,
-};
-
-static int partition_init(void)
-{
-	return register_driver(&part_driver);
-}
-
-device_initcall(partition_init);
-
-/**
-@page partitions Partition Handling
-
-Partitions are runtime informartion only, not permanent. So they must be set
-everytime the system starts. The required command can be embedded into the
-default environment.
-
-@note Partitions defined in this way are intended to be used with the kernel
-command line partition parsing feature. In Uboot2 these types of partitions are
-handled in the same way as every other device.
-
-@par The addpart command
-
-What we want:
-
-@verbatim
- device nor0
-    |--- partition 0
-    |--- partition 1
-    |--- partition 2
-    |--- partition 3
-    `--- partition 4
-@endverbatim
-
-How to get:
-
-@verbatim
-$ addpart /dev/nor0 256k(uboot),128k(env),256k(bla),1024k(blubb),2048k(friesel)
-$ devinfo
- |---nor0.uboot
- |---nor0.env
- |---nor0.bla
- |---nor0.blubb
- |---nor0.friesel
-@endverbatim
-
-@par Partitions with sub partitions:
-
-Partitions are based on devices. And partitions will result into devices. So
-there is a way to create sub partitions on partitions.
-
-What we want:
-
-@verbatim
- device nor0
-    |--- partition 0
-    |--- partition 1
-    |--- partition 2
-    |--- partition 3
-    `--- partition 4
-           |--- partition 0
-           `--- partition 1
-@endverbatim
-
-How to get:
-
-@verbatim
-$ addpart /dev/nor0 256k(uboot),128k(env),256k(bla),1M(blubb),2048k(friesel)
-$ devinfo
- |---nor0.uboot
- |---nor0.env
- |---nor0.bla
- |---nor0.blubb
- |---nor0.friesel
-
-$ addpart /dev/nor0.friesel 1024(fussel),1024k(boerks)
-$ devinfo
- |---nor0.uboot
- |---nor0.env
- |---nor0.bla
- |---nor0.blubb
- |---nor0.friesel
-        |---nor0.friesel.fussel
-        `---nor0.friesel.boerks
-@endverbatim
-
-@par Forwarding partitions to the kernel:
-
-@verbatim
-$ device="nor0"
-$ partitions="256k(uboot),128k(env),256k(bla),1024k(blubb),2048k(friesel)"
-$ addpart /dev/$device:$partitions
-@endverbatim
-
-@par Removing partitions:
-
-As partitions are a logically information only, they can be removed from a
-device at runtime. You can't remove a single partition within others on the
-same device. Only all partitions on the given device can be removed with this
-command.
-
-As sub partitions occure as devices you also can remove sub partitions from
-their parent in this way. Partitions cannot be removed as long as they are
-mounted or have subpartitions.
-
-*/
diff --git a/common/startup.c b/common/startup.c
index 7179f81203..0f67ca43af 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -77,9 +77,13 @@ void early_init (void)
 #ifdef CONFIG_DEFAULT_ENVIRONMENT
 #include <uboot_default_env.h>
 
+static struct memory_platform_data default_env_platform_data = {
+	.name = "defaultenv",
+};
+
 static struct device_d default_env_dev = {
-	.name     = "rom",
-	.id       = "defaultenv",
+	.name		= "mem",
+	.platform_data	= &default_env_platform_data,
 };
 
 static void register_default_env(void)