[PATCH 03/16] ARM android image: remove double of_fix_tree

[Sascha Hauer]

With bootm of_fix_tree() will already be called from the generic bootm
code, so do not do this again in the Android image handler.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 arch/arm/lib/bootm.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 51ac9af..b7dc96e 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -402,12 +402,6 @@ static int do_bootm_aimage(struct image_data *data)
 	if (!getenv("aimage_noverwrite_tags"))
 		armlinux_set_bootparams((void*)header->tags_addr);
 
-	if (IS_ENABLED(CONFIG_OFTREE) && data->oftree) {
-		ret = of_fix_tree(data->oftree);
-		if (ret)
-			goto err_out;
-	}
-
 	cmp = &header->second_stage;
 	if (cmp->size) {
 		void (*second)(void);
-- 
1.7.10.4