From fe492cee35f0628c9d813f1799e4d49ef6b4e6d4 Mon Sep 17 00:00:00 2001 From: Barak Wasserstrom Date: Wed, 27 Feb 2013 08:48:41 +0000 Subject: [PATCH] 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 --- common/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/main.c b/common/main.c index e2d2e09bf9..b0472da8a8 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 */ -- 2.25.1