Signed-off-by: Eric Bénard <e...@eukrea.com>
---
arch/arm/boards/chumby_falconwing/falconwing.c | 38 +-------------------------
1 file changed, 1 insertion(+), 37 deletions(-)
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c
b/arch/arm/boards/chumby_falconwing/falconwing.c
index 0818666..3a7b830 100644
--- a/arch/arm/boards/chumby_falconwing/falconwing.c
+++ b/arch/arm/boards/chumby_falconwing/falconwing.c
@@ -265,42 +265,6 @@ static int falconwing_mem_init(void)
}
mem_initcall(falconwing_mem_init);
-/**
- * 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 chumby one 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");
-}
-
#define GPIO_USB_HUB_RESET 29
#define GPIO_USB_HUB_POWER 26
@@ -338,7 +302,7 @@ static int falconwing_devices_init(void)
armlinux_set_bootparams((void *)IMX_MEMORY_BASE + 0x100);
armlinux_set_architecture(MACH_TYPE_CHUMBY);
- rc = register_persistant_environment();
+ rc = register_persistant_environment("disk0", 1);
if (rc != 0)
printf("Cannot create the 'env0' persistant environment storage
(%d)\n", rc);
--
1.7.11.7
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
