From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VPSJf-0000sq-Jx for barebox@lists.infradead.org; Fri, 27 Sep 2013 07:18:19 +0000 From: Sascha Hauer Date: Fri, 27 Sep 2013 09:17:51 +0200 Message-Id: <1380266272-931-4-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1380266272-931-1-git-send-email-s.hauer@pengutronix.de> References: <1380266272-931-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 3/4] ARM: OMAP: unconditionally use /boot/barebox.env To: barebox@lists.infradead.org The startup process falls back to /dev/defaultenv automatically, no need to decide here. Signed-off-by: Sascha Hauer --- 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 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox