From c1f8427805b237b248c67eed6b44d853cbff91d1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 15 Aug 2011 10:57:27 +0200 Subject: [PATCH] ARM i.MX25/35: initialize barebox_loc earlier Now that env_push_context is in a coredevice_initcall we can initialize barebox_loc earlier so that we can use it inside later initcalls. Signed-off-by: Sascha Hauer tested-by: Marc Reilly --- arch/arm/mach-imx/boot.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index b4bf93bc3..8482b60f4 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -41,7 +41,7 @@ * Note also that I suspect that the boot source pins are only sampled at * power up. */ -static int imx_boot_save_loc(void) +static int imx_25_35_boot_save_loc(void) { const char *bareboxloc = NULL; uint32_t reg; @@ -86,10 +86,6 @@ static int imx_boot_save_loc(void) return 0; } -/* - * This can only be called after env_push_context() has been called - * so it is a late_initcall. - */ -late_initcall(imx_boot_save_loc); +coredevice_initcall(imx_25_35_boot_save_loc); #endif