summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBarak Wasserstrom <wbarak@gmail.com>2013-02-27 08:48:41 +0000
committerTom Rini <trini@ti.com>2013-03-12 12:43:31 -0400
commitfe492cee35f0628c9d813f1799e4d49ef6b4e6d4 (patch)
treecbdd3099a65ac99c16b07cf911d3c9c04c248963 /common
parent7d85591dda47f62e73d878d2d0ea5bd0ff2528ad (diff)
downloadu-boot-imx-fe492cee35f0628c9d813f1799e4d49ef6b4e6d4.zip
u-boot-imx-fe492cee35f0628c9d813f1799e4d49ef6b4e6d4.tar.gz
u-boot-imx-fe492cee35f0628c9d813f1799e4d49ef6b4e6d4.tar.bz2
common/main: move set_working_fdt_addr to enable usage of $fdtaddr
When using $fdtaddr in $bootcmd and $bootcmd is automatically called, $fdtaddr is yet not defined. Signed-off-by: Barak Wasserstrom <wbarak@gmail.com>
Diffstat (limited to 'common')
-rw-r--r--common/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/main.c b/common/main.c
index e2d2e09..b0472da 100644
--- a/common/main.c
+++ b/common/main.c
@@ -378,6 +378,10 @@ void main_loop (void)
bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
+#if defined CONFIG_OF_CONTROL
+ set_working_fdt_addr((void *)gd->fdt_blob);
+#endif /* CONFIG_OF_CONTROL */
+
#ifdef CONFIG_BOOTCOUNT_LIMIT
bootcount = bootcount_load();
bootcount++;
@@ -500,10 +504,6 @@ void main_loop (void)
#endif /* CONFIG_MENUKEY */
#endif /* CONFIG_BOOTDELAY */
-#if defined CONFIG_OF_CONTROL
- set_working_fdt_addr((void *)gd->fdt_blob);
-#endif /* CONFIG_OF_CONTROL */
-
/*
* Main Loop for Monitor Command Processing
*/