diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:28:41 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:28:41 +0100 |
commit | 9fdf56c8d47d1084fef065f2a234a9b42c694279 (patch) | |
tree | 578156bbfb3cdf2508b80c6fa1ba7efd79507c6f /arch | |
parent | 31860b483182e06201000aabb35348dbe5011b3e (diff) | |
parent | 353065f934aad90adb6412ce9a8bbdd528ebc048 (diff) | |
download | barebox-9fdf56c8d47d1084fef065f2a234a9b42c694279.tar.gz barebox-9fdf56c8d47d1084fef065f2a234a9b42c694279.tar.xz |
Merge branch 'for-next/omap'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap/omap_generic.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c index 071a1bfced..4e26c6ba0b 100644 --- a/arch/arm/mach-omap/omap_generic.c +++ b/arch/arm/mach-omap/omap_generic.c @@ -111,7 +111,6 @@ const char *omap_get_bootmmc_devname(void) #define ENV_PATH "/boot/barebox.env" static int omap_env_init(void) { - struct stat s; char *partname; const char *diskdev; int ret; @@ -128,25 +127,19 @@ static int omap_env_init(void) partname = asprintf("/dev/%s.0", diskdev); - ret = stat(partname, &s); - - free(partname); - - if (ret) { - pr_err("Failed to load environment: no device '%s'\n", diskdev); - return 0; - } - mkdir("/boot", 0666); - ret = mount(diskdev, "fat", "/boot", NULL); + ret = mount(partname, "fat", "/boot", NULL); if (ret) { - pr_err("Failed to load environment: mount %s failed (%d)\n", diskdev, ret); - return 0; + pr_err("Failed to load environment: mount %s failed (%d)\n", partname, ret); + goto out; } - pr_debug("Loading default env from %s on device %s\n", ENV_PATH, diskdev); + pr_debug("Loading default env from %s on device %s\n", ENV_PATH, partname); default_environment_path_set(ENV_PATH); +out: + free(partname); + return 0; } late_initcall(omap_env_init); |