From patchwork Thu Oct 25 22:15:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 194404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6B9322C0091 for ; Fri, 26 Oct 2012 20:22:50 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CB93531209; Fri, 26 Oct 2012 09:22:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rx1mpPu3ZCAF; Fri, 26 Oct 2012 09:22:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D0DC731203; Fri, 26 Oct 2012 09:22:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DDF128F74A for ; Fri, 26 Oct 2012 09:22:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 70C4A8D467 for ; Fri, 26 Oct 2012 09:22:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w-oCulgJcZ6w for ; Fri, 26 Oct 2012 09:22:23 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from glau.bulix.org (glau.bulix.org [91.121.137.100]) by whitealder.osuosl.org (Postfix) with ESMTPS id A2B9F8D419 for ; Fri, 26 Oct 2012 09:22:22 +0000 (UTC) Received: from alex by glau.bulix.org with local (Exim 4.77) (envelope-from ) id 1TRfqA-00070h-FX for buildroot@busybox.net; Fri, 26 Oct 2012 11:04:30 +0200 Resent-From: Alexandre Belloni Resent-Date: Fri, 26 Oct 2012 02:04:30 -0700 Resent-Message-ID: <20121026090430.GB26928@piout.net> Resent-To: buildroot@busybox.net Received: from 128-79-216-144.hfc.dyn.abo.bbox.fr ([128.79.216.144] helo=narya.piout.net) by glau.bulix.org with esmtp (Exim 4.77) (envelope-from ) id 1TRVjc-0004BF-RR for alexandre.belloni@piout.net; Fri, 26 Oct 2012 00:17:10 +0200 Received: by narya.piout.net (Postfix, from userid 1000) id 5005DC4227; Fri, 26 Oct 2012 00:15:52 +0200 (CEST) From: Alexandre Belloni To: buildroot@busybox.net Date: Fri, 26 Oct 2012 00:15:31 +0200 Message-Id: <1351203333-26588-2-git-send-email-alexandre.belloni@piout.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351203333-26588-1-git-send-email-alexandre.belloni@piout.net> References: <1351203333-26588-1-git-send-email-alexandre.belloni@piout.net> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: alex@piout.net X-SA-Exim-Scanned: No (on glau.bulix.org); SAEximRunCond expanded to false Subject: [Buildroot] [PATCH 1/3] at91bootstrap: update patch for latest u-boot X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The u-boot patch got mainlined but not exactly as it was submitted to buildroot. Update the at91bootstrap to match what is in the mainline. Signed-off-by: Alexandre Belloni --- .../at91bootstrap-1.16-u-boot-relocation-fix.patch | 127 +++++++++----------- 1 file changed, 56 insertions(+), 71 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch index 884519c..0c9b911 100644 --- a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch +++ b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch @@ -1,3 +1,8 @@ +From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001 +From: Alexandre Belloni +Date: Thu, 25 Oct 2012 22:57:14 +0200 +Subject: [PATCH] u-boot relocation fix + Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because of the relocation changes. @@ -8,13 +13,11 @@ I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be converted yet. But anyway, that means that it is either not working or doesn't care so changing it here shouldn't harm. -I also chose to "repartition" the dataflash. u-boot is now living at -0x4000, letting 16kB for the bootstrap. We also have to increase the -IMG_SIZE as u-boot as grown larger than the default value. -As requested on the u-boot ML, we assume that it could be up to 512kB -big. +We also have to increase the IMG_SIZE as u-boot as grown larger than the +default value. As requested on the u-boot ML, we assume that it could +be up to 495kB big. -It means that now, you have to flash your kernel at 0x0008C000 instead +It means that now, you have to flash your kernel at 0x00084000 instead of 0x00042000. And so you also have to load it from that adress from u-boot. @@ -22,36 +25,34 @@ Then, remember that you could decrease IMG_SIZE to boot faster. Signed-off-by: Alexandre Belloni --- - board/at91sam9260ek/dataflash/at91sam9260ek.h | 6 +++--- + board/at91sam9260ek/dataflash/at91sam9260ek.h | 4 ++-- board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +- - board/at91sam9261ek/dataflash/at91sam9261ek.h | 6 +++--- + board/at91sam9261ek/dataflash/at91sam9261ek.h | 4 ++-- board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +- - board/at91sam9263ek/dataflash/at91sam9263ek.h | 6 +++--- + board/at91sam9263ek/dataflash/at91sam9263ek.h | 4 ++-- board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +- - board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 6 +++--- + board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 4 ++-- board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +- - board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 6 +++--- + board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 4 ++-- board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +- - board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 4 ++-- - .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 4 ++-- - board/at91sam9rlek/dataflash/at91sam9rlek.h | 6 +++--- + board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 2 +- + .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 2 +- + board/at91sam9rlek/dataflash/at91sam9rlek.h | 4 ++-- board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +- - board/at91sam9xeek/dataflash/at91sam9xeek.h | 6 +++--- + board/at91sam9xeek/dataflash/at91sam9xeek.h | 4 ++-- board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +- - 16 files changed, 32 insertions(+), 32 deletions(-) + 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h -index 1834246..5c52bc6 100644 +index 1834246..91081a1 100644 --- a/board/at91sam9260ek/dataflash/at91sam9260ek.h +++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h -@@ -73,11 +73,11 @@ - /* ******************************************************************* */ +@@ -74,10 +74,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -73,17 +74,15 @@ index 2cac601..f8fdff2 100644 /* ******************************************************************* */ /* Application Settings */ diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h -index 8ce30e9..675f80b 100644 +index 8ce30e9..276ba3d 100644 --- a/board/at91sam9261ek/dataflash/at91sam9261ek.h +++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h -@@ -96,11 +96,11 @@ - /* ******************************************************************* */ +@@ -97,10 +97,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -105,17 +104,15 @@ index badc3ac..e628c97 100644 /* ******************************************************************* */ /* Application Settings */ diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h -index 5c9da4b..d07b5d1 100644 +index 5c9da4b..870f9e2 100644 --- a/board/at91sam9263ek/dataflash/at91sam9263ek.h +++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h -@@ -95,11 +95,11 @@ - /* ******************************************************************* */ +@@ -96,10 +96,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -137,17 +134,15 @@ index 505afc7..8ab4f46 100644 /* ******************************************************************* */ /* Application Settings */ diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -index b2faf44..0882644 100644 +index b2faf44..f4f556b 100644 --- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h +++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -@@ -97,11 +97,11 @@ - /* ******************************************************************* */ +@@ -98,10 +98,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -169,17 +164,15 @@ index 66c40a3..6c3ecda 100644 /* ******************************************************************* */ /* Application Settings */ diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -index eea0439..44bd578 100644 +index eea0439..7fc70d6 100644 --- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h +++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -@@ -74,11 +74,11 @@ - /* ******************************************************************* */ +@@ -75,10 +75,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -201,47 +194,41 @@ index 31bd499..e797e4d 100644 /* ******************************************************************* */ /* Application Settings */ diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -index a60fd41..144dd6d 100644 +index a60fd41..5587a00 100644 --- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h +++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -@@ -88,8 +88,8 @@ - /* ******************************************************************* */ +@@ -89,7 +89,7 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */ #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -index 5c726b5..3152b79 100644 +index 5c726b5..9090097 100644 --- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h +++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -@@ -84,8 +84,8 @@ - /* ******************************************************************* */ +@@ -85,7 +85,7 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */ #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h -index 05c42dc..be277b6 100644 +index 05c42dc..150f17e 100644 --- a/board/at91sam9rlek/dataflash/at91sam9rlek.h +++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h -@@ -88,11 +88,11 @@ - /* ******************************************************************* */ +@@ -89,10 +89,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -263,17 +250,15 @@ index 656b4ba..594db8f 100644 /* ******************************************************************* */ /* Application Settings */ diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h -index 27d1822..e3172da 100644 +index 27d1822..08e515d 100644 --- a/board/at91sam9xeek/dataflash/at91sam9xeek.h +++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h -@@ -73,11 +73,11 @@ - /* ******************************************************************* */ +@@ -74,10 +74,10 @@ #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ --#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ + #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ -#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x80000 /* Image Size in DataFlash */ ++#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ -#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ @@ -295,5 +280,5 @@ index 5dbc63e..9fac7cb 100644 /* ******************************************************************* */ /* Application Settings */ -- -1.7.5.4 +1.7.9.5