From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1alxut-0002rX-Cf for barebox@lists.infradead.org; Fri, 01 Apr 2016 12:11:10 +0000 From: Sascha Hauer Date: Fri, 1 Apr 2016 14:10:44 +0200 Message-Id: <1459512644-8581-7-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1459512644-8581-1-git-send-email-s.hauer@pengutronix.de> References: <1459512644-8581-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" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 7/7] ARM: i.MX: xload-esdhc: Find entry in image To: Barebox List The binary image generated by barebox contains an instruction at the very beginning to jump over the header. However, when the image is written to a SD card and the first 512 bytes are skipped in order to preserve the partition table then this jump instruction is lost. Instead of relying on the jump instruction at the image beginning calculate the image entry from the i.MX header instead of relying on the beginning of the image being the entry point. Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/xload-esdhc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/xload-esdhc.c b/arch/arm/mach-imx/xload-esdhc.c index 0ff58c8..e774e4e 100644 --- a/arch/arm/mach-imx/xload-esdhc.c +++ b/arch/arm/mach-imx/xload-esdhc.c @@ -260,6 +260,7 @@ int imx6_esdhc_start_image(int instance) u32 *ivt = buf + SZ_1K; int ret, len; void __noreturn (*bb)(void); + unsigned int ofs; len = imx_image_size(); len = ALIGN(len, SECTOR_SIZE); @@ -283,7 +284,9 @@ int imx6_esdhc_start_image(int instance) pr_debug("Image loaded successfully\n"); - bb = buf; + ofs = *(ivt + 1) - *(ivt + 8); + + bb = buf + ofs; bb(); } -- 2.7.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox