summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-04-09 11:51:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-04-28 11:37:42 +0200
commit54bea204e298daea8ea545c03f278fe3e778198c (patch)
tree0d501d481e2d5d20fe00d6c48f60bd8c55c2d24d /common
parent0af79fbb6779921d3f1962773adb7fb57d3c89d4 (diff)
downloadbarebox-54bea204e298daea8ea545c03f278fe3e778198c.tar.gz
barebox-54bea204e298daea8ea545c03f278fe3e778198c.tar.xz
environment: drop envfs_register_partition
The purpose of envfs_register_partition is to print an error message when the partition does not exist. Print an error message from generic code instead and drop this function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r--common/environment.c50
1 files changed, 3 insertions, 47 deletions
diff --git a/common/environment.c b/common/environment.c
index f2ac17d5d6..e55df401dc 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -395,7 +395,9 @@ int envfs_load(const char *filename, const char *dir, unsigned flags)
envfd = open(filename, O_RDONLY);
if (envfd < 0) {
- printf("Open %s %s\n", filename, errno_str());
+ printf("environment load %s: %s\n", filename, errno_str());
+ if (errno == ENOENT)
+ printf("Maybe you have to create the partition.\n");
return -1;
}
@@ -451,49 +453,3 @@ out:
return ret;
}
-
-#ifdef __BAREBOX__
-/**
- * Try to register an environment storage on a device's partition
- * @return 0 on success
- *
- * We rely on the existence of a usable storage device, already attached to
- * our system, to get something like a persistent memory for our environment.
- * We need to specify the partition number to use on this device.
- * @param[in] devname Name of the device
- * @param[in] partnr Partition number
- * @return 0 on success, anything else in case of failure
- */
-
-int envfs_register_partition(const char *devname, unsigned int partnr)
-{
- struct cdev *cdev, *part;
- char *partname;
-
- if (!devname)
- return -EINVAL;
-
- cdev = cdev_by_name(devname);
- if (cdev == NULL) {
- pr_err("No %s present\n", devname);
- return -ENODEV;
- }
- partname = asprintf("%s.%d", devname, partnr);
- cdev = cdev_by_name(partname);
- if (cdev == NULL) {
- pr_err("No %s partition available\n", partname);
- pr_info("Please create the partition %s to store the env\n", partname);
- return -ENODEV;
- }
-
- part = devfs_add_partition(partname, 0, cdev->size,
- DEVFS_PARTITION_FIXED, "env0");
- if (part)
- return 0;
-
- free(partname);
-
- return -EINVAL;
-}
-EXPORT_SYMBOL(envfs_register_partition);
-#endif