[PATCH 3/4] ARM: OMAP: unconditionally use /boot/barebox.env

Sascha Hauer s.hauer at pengutronix.de
Fri Sep 27 03:17:51 EDT 2013


The startup process falls back to /dev/defaultenv automatically,
no need to decide here.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/mach-omap/omap_generic.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c
index 595ecbe..517cc2c 100644
--- a/arch/arm/mach-omap/omap_generic.c
+++ b/arch/arm/mach-omap/omap_generic.c
@@ -122,10 +122,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;
 }
-- 
1.8.4.rc3




More information about the barebox mailing list