1From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001 2From: Alexandre Belloni <alexandre.belloni@piout.net> 3Date: Thu, 25 Oct 2012 22:57:14 +0200 4Subject: [PATCH] u-boot relocation fix 5 6Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because 7of the relocation changes. 8 9We have to get JUMP_ADDR consistant with what is used by u-boot 10(CONFIG_SYS_TEXT_BASE). 11 12I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be 13converted yet. But anyway, that means that it is either not working or 14doesn't care so changing it here shouldn't harm. 15 16We also have to increase the IMG_SIZE as u-boot as grown larger than the 17default value. As requested on the u-boot ML, we assume that it could 18be up to 495kB big. 19 20It means that now, you have to flash your kernel at 0x00084000 instead 21of 0x00042000. And so you also have to load it from that adress from 22u-boot. 23 24Then, remember that you could decrease IMG_SIZE to boot faster. 25 26Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net> 27--- 28 board/at91sam9260ek/dataflash/at91sam9260ek.h | 4 ++-- 29 board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +- 30 board/at91sam9261ek/dataflash/at91sam9261ek.h | 4 ++-- 31 board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +- 32 board/at91sam9263ek/dataflash/at91sam9263ek.h | 4 ++-- 33 board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +- 34 board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 4 ++-- 35 board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +- 36 board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 4 ++-- 37 board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +- 38 board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 2 +- 39 .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 2 +- 40 board/at91sam9rlek/dataflash/at91sam9rlek.h | 4 ++-- 41 board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +- 42 board/at91sam9xeek/dataflash/at91sam9xeek.h | 4 ++-- 43 board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +- 44 16 files changed, 23 insertions(+), 23 deletions(-) 45 46diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h 47index 1834246..91081a1 100644 48--- a/board/at91sam9260ek/dataflash/at91sam9260ek.h 49+++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h 50@@ -74,10 +74,10 @@ 51 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */ 52 53 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 54-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 55+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 56 57 #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ 58-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 59+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 60 61 /* ******************************************************************* */ 62 /* Application Settings */ 63diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9260ek.h 64index 2cac601..f8fdff2 100644 65--- a/board/at91sam9260ek/nandflash/at91sam9260ek.h 66+++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h 67@@ -92,7 +92,7 @@ 68 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 69 70 #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ 71-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 72+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 73 74 /* ******************************************************************* */ 75 /* Application Settings */ 76diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h 77index 8ce30e9..276ba3d 100644 78--- a/board/at91sam9261ek/dataflash/at91sam9261ek.h 79+++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h 80@@ -97,10 +97,10 @@ 81 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ 82 83 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 84-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 85+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 86 87 #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ 88-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 89+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 90 91 /* ******************************************************************* */ 92 /* Application Settings */ 93diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9261ek.h 94index badc3ac..e628c97 100644 95--- a/board/at91sam9261ek/nandflash/at91sam9261ek.h 96+++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h 97@@ -114,7 +114,7 @@ 98 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 99 100 #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ 101-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 102+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 103 104 /* ******************************************************************* */ 105 /* Application Settings */ 106diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h 107index 5c9da4b..870f9e2 100644 108--- a/board/at91sam9263ek/dataflash/at91sam9263ek.h 109+++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h 110@@ -96,10 +96,10 @@ 111 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ 112 113 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 114-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 115+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 116 117 #define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */ 118-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 119+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 120 121 /* ******************************************************************* */ 122 /* Application Settings */ 123diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9263ek.h 124index 505afc7..8ab4f46 100644 125--- a/board/at91sam9263ek/nandflash/at91sam9263ek.h 126+++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h 127@@ -108,7 +108,7 @@ 128 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 129 130 #define MACH_TYPE 1202 /* AT91SAM9263-EK */ 131-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 132+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 133 134 /* ******************************************************************* */ 135 /* Application Settings */ 136diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h 137index b2faf44..f4f556b 100644 138--- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h 139+++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h 140@@ -98,10 +98,10 @@ 141 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ 142 143 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 144-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 145+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 146 147 #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ 148-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 149+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 150 151 /* ******************************************************************* */ 152 /* Application Settings */ 153diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h 154index 66c40a3..6c3ecda 100644 155--- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h 156+++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h 157@@ -115,7 +115,7 @@ 158 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 159 160 #define MACH_TYPE 0x350 /* AT91SAM9G10-EK */ 161-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 162+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 163 164 /* ******************************************************************* */ 165 /* Application Settings */ 166diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h 167index eea0439..7fc70d6 100644 168--- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h 169+++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h 170@@ -75,10 +75,10 @@ 171 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ 172 173 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 174-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 175+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 176 177 #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ 178-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 179+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 180 181 /* ******************************************************************* */ 182 /* Application Settings */ 183diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h 184index 31bd499..e797e4d 100644 185--- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h 186+++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h 187@@ -93,7 +93,7 @@ 188 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 189 190 #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ 191-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 192+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 193 194 /* ******************************************************************* */ 195 /* Application Settings */ 196diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h 197index a60fd41..5587a00 100644 198--- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h 199+++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h 200@@ -89,7 +89,7 @@ 201 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ 202 203 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 204-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 205+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 206 207 #define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */ 208 #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ 209diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h 210index 5c726b5..9090097 100644 211--- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h 212+++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h 213@@ -85,7 +85,7 @@ 214 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ 215 216 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 217-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 218+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 219 220 #define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */ 221 #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ 222diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h 223index 05c42dc..150f17e 100644 224--- a/board/at91sam9rlek/dataflash/at91sam9rlek.h 225+++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h 226@@ -89,10 +89,10 @@ 227 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ 228 229 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 230-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 231+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 232 233 #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ 234-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 235+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 236 237 /* ******************************************************************* */ 238 /* Application Settings */ 239diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rlek.h 240index 656b4ba..594db8f 100644 241--- a/board/at91sam9rlek/nandflash/at91sam9rlek.h 242+++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h 243@@ -112,7 +112,7 @@ 244 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 245 246 #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ 247-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 248+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 249 250 /* ******************************************************************* */ 251 /* Application Settings */ 252diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h 253index 27d1822..08e515d 100644 254--- a/board/at91sam9xeek/dataflash/at91sam9xeek.h 255+++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h 256@@ -74,10 +74,10 @@ 257 #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ 258 259 #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ 260-#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ 261+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ 262 263 #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ 264-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 265+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 266 267 /* ******************************************************************* */ 268 /* Application Settings */ 269diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xeek.h 270index 5dbc63e..9fac7cb 100644 271--- a/board/at91sam9xeek/nandflash/at91sam9xeek.h 272+++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h 273@@ -94,7 +94,7 @@ 274 #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ 275 276 #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ 277-#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ 278+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ 279 280 /* ******************************************************************* */ 281 /* Application Settings */ 282-- 2831.7.9.5 284 285