boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch

4 Subject: [PATCH] u-boot relocation fix
9 We have to get JUMP_ADDR consistant with what is used by u-boot
16 We also have to increase the IMG_SIZE as u-boot as grown larger than the
17 default value. As requested on the u-boot ML, we assume that it could
22 u-boot.
26 Signed-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(-)
46 diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9…
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 */
54 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
57  #define MACH_TYPE       0x44B       /* AT91SAM9260-EK */
58 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
63 diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9…
65 --- a/board/at91sam9260ek/nandflash/at91sam9260ek.h
66 +++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h
67 @@ -92,7 +92,7 @@
70  #define MACH_TYPE       	0x44B		/* AT91SAM9260-EK */
71 -#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
76 diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9…
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 */
84 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
87  #define MACH_TYPE       0x350       /* AT91SAM9261-EK */
88 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
93 diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9…
95 --- a/board/at91sam9261ek/nandflash/at91sam9261ek.h
96 +++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h
97 @@ -114,7 +114,7 @@
100  #define MACH_TYPE       	0x350		/* AT91SAM9261-EK */
101 -#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
106 diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9…
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 */
114 -#define	IMG_SIZE			0x33900			/* Image Size in DataFlash    */
117  #define MACH_TYPE       		0x4B2       		/* AT91SAM9263-EK */
118 -#define JUMP_ADDR			0x23F00000		/* Final Jump Address 	      */
123 diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9…
125 --- a/board/at91sam9263ek/nandflash/at91sam9263ek.h
126 +++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h
127 @@ -108,7 +108,7 @@
130  #define MACH_TYPE       1202       	/* AT91SAM9263-EK */
131 -#define JUMP_ADDR	0x23F00000	/* Final Jump Address 	      */
136 diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9…
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 */
144 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
147  #define MACH_TYPE       0x350       /* AT91SAM9261-EK */
148 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
153 diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9…
155 --- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
156 +++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
157 @@ -115,7 +115,7 @@
160  #define MACH_TYPE       	0x350		/* AT91SAM9G10-EK */
161 -#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
166 diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9…
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 */
174 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
177  #define MACH_TYPE		0x658			/* AT91SAM9G20-EK */
178 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
183 diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9…
185 --- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
186 +++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
187 @@ -93,7 +93,7 @@
190  #define MACH_TYPE		0x658			/* AT91SAM9G20-EK */
191 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
196 diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at…
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 */
204 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
207  #define MACH_TYPE		0x9CD			/* AT91SAM9M10-EKES */
209 diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash…
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 */
217 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
220  #define MACH_TYPE		0x726			/* AT91SAM9M10G45-EK */
222 diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rle…
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 */
230 -#define	IMG_SIZE	0x33900		/* Image Size in DataFlash    */
233  #define MACH_TYPE       1326       	/* AT91SAM9RL-EK */
234 -#define JUMP_ADDR	0x23F00000	/* Final Jump Address 	      */
239 diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rle…
241 --- a/board/at91sam9rlek/nandflash/at91sam9rlek.h
242 +++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h
243 @@ -112,7 +112,7 @@
246  #define MACH_TYPE       1326       		/* AT91SAM9RL-EK */
247 -#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
252 diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xee…
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 */
260 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
263  #define MACH_TYPE		0x44B			/* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
264 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
269 diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xee…
271 --- a/board/at91sam9xeek/nandflash/at91sam9xeek.h
272 +++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h
273 @@ -94,7 +94,7 @@
276  #define MACH_TYPE		0x44B			/* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
277 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
282 --