diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-26 14:52:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-27 16:13:19 +0200 |
| commit | 41dd510b5cc8c697791b4d27a943617e96993997 (patch) | |
| tree | aad135d75c5f5e80950f09a0a63aea40acf65da1 /arch/arm/mach-omap/omap_generic.c | |
| parent | 5913b71943decdf18b431bd0e0f959855aeb01c7 (diff) | |
| download | barebox-41dd510b5cc8c697791b4d27a943617e96993997.tar.gz barebox-41dd510b5cc8c697791b4d27a943617e96993997.tar.xz | |
ARM: OMAP: unconditionally use /boot/barebox.env
The startup process falls back to /dev/defaultenv automatically,
no need to decide here.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-omap/omap_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/omap_generic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c index aabd5e09f0..79e37e2341 100644 --- a/arch/arm/mach-omap/omap_generic.c +++ b/arch/arm/mach-omap/omap_generic.c @@ -124,10 +124,7 @@ static int omap_env_init(void) return 0; } - if (IS_ENABLED(CONFIG_OMAP_BUILD_IFT)) - default_environment_path = "/dev/defaultenv"; - else - default_environment_path = "/boot/barebox.env"; + default_environment_path = "/boot/barebox.env"; return 0; } |