[PATCH v4 2/3] imx23-olinuxino: swith to generic peristent env

[Eric Bénard]

Signed-off-by: Eric Bénard <eric at eukrea.com>
---
v4: rename function and move to envfs.h

 arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 45 ++--------------------
 1 file changed, 3 insertions(+), 42 deletions(-)

diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index 0482638..9620e85 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -25,6 +25,7 @@
 #include <init.h>
 #include <gpio.h>
 #include <environment.h>
+#include <envfs.h>
 #include <errno.h>
 #include <mci.h>
 #include <asm/armlinux.h>
@@ -111,46 +112,6 @@ static void olinuxino_init_usb(void)
 	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, IMX_USB_BASE, NULL);
 }
 
-/**
- * Try to register an environment storage on the attached MCI card
- * @return 0 on success
- *
- * We rely on the existence of a usable SD card, already attached to
- * our system, to get something like a persistent memory for our environment.
- * If this SD card is also the boot media, we can use the second partition
- * for our environment purpose (if present!).
- */
-static int register_persistant_environment(void)
-{
-	struct cdev *cdev;
-
-	/*
-	 * The imx23-olinuxino only has one MCI card socket.
-	 * So, we expect its name as "disk0".
-	 */
-	cdev = cdev_by_name("disk0");
-	if (cdev == NULL) {
-		pr_err("No MCI card preset\n");
-		return -ENODEV;
-	}
-
-
-
-	/* MCI card is present, also a useable partition on it? */
-	cdev = cdev_by_name("disk0.1");
-	if (cdev == NULL) {
-		pr_err("No second partition available\n");
-		pr_info("Please create at least a second partition with"
-			" 256 kiB...512 kiB in size (your choice)\n");
-		return -ENODEV;
-	}
-
-	/* use the full partition as our persistent environment storage */
-	return devfs_add_partition("disk0.1", 0, cdev->size,
-						DEVFS_PARTITION_FIXED, "env0");
-}
-
-
 static int imx23_olinuxino_devices_init(void)
 {
 	int i, rc;
@@ -174,9 +135,9 @@ static int imx23_olinuxino_devices_init(void)
 
 	olinuxino_init_usb();
 
-	rc = register_persistant_environment();
+	rc = envfs_register_partition("disk0", 1);
 	if (rc != 0)
-		printf("Cannot create the 'env0' persistant "
+		printf("Cannot create the 'env0' persistent "
 			 "environment storage (%d)\n", rc);
 
 	return 0;
-- 
1.7.11.7