From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TtebB-0000qi-6K for barebox@lists.infradead.org; Fri, 11 Jan 2013 13:24:47 +0000 From: Sascha Hauer Date: Fri, 11 Jan 2013 14:24:23 +0100 Message-Id: <1357910676-4231-4-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1357910676-4231-1-git-send-email-s.hauer@pengutronix.de> References: <1357910676-4231-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 03/16] ARM android image: remove double of_fix_tree To: barebox@lists.infradead.org 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 Cc: Jean-Christophe PLAGNIOL-VILLARD --- 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 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox