summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-15 10:57:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-24 19:41:29 +0200
commitc1f8427805b237b248c67eed6b44d853cbff91d1 (patch)
treea44c3401e084cc6d2aa0de9b3e1d5d4e2c125383
parent1e926b80bb29568993813534dcaf6e9c7d020415 (diff)
downloadbarebox-c1f8427805b237b248c67eed6b44d853cbff91d1.tar.gz
barebox-c1f8427805b237b248c67eed6b44d853cbff91d1.tar.xz
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 <s.hauer@pengutronix.de> tested-by: Marc Reilly <marc@cpdesign.com.au>
-rw-r--r--arch/arm/mach-imx/boot.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index b4bf93bc35..8482b60f40 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