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-0000qc-6k for barebox@lists.infradead.org; Fri, 11 Jan 2013 13:24:47 +0000 From: Sascha Hauer Date: Fri, 11 Jan 2013 14:24:30 +0100 Message-Id: <1357910676-4231-11-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 10/16] ARM bootm: only use concatenated oftree when no other is available To: barebox@lists.infradead.org When an oftree is already specified use it. This lets the user boot a kernel with an oftree he provided himself rather than hardcoding the concatenated one. Signed-off-by: Sascha Hauer --- arch/arm/lib/bootm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index b7dc96e..dc29004 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -138,6 +138,9 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data) u32 end; + if (data->oftree) + return -ENXIO; + header = &__header; ret = read(fd, header, sizeof(*header)); if (ret < sizeof(*header)) -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox