Commit 482126e27b3dbf0e69a6445da8b94b3551adf05d
1 parent
460c2ce362
Exists in
master
and in
54 other branches
Prepare v2010.06-rc3
Signed-off-by: Wolfgang Denk <wd@denx.de>
Showing 4 changed files with 824 additions and 72 deletions Side-by-side Diff
CHANGELOG
1 | +commit 460c2ce362e56890c2a029e2c3b1ff2796c7fc54 | |
2 | +Author: Wolfgang Denk <wd@denx.de> | |
3 | +Date: Mon Jun 21 22:29:59 2010 +0200 | |
4 | + | |
5 | + MPC5200: workaround data corruption for unaligned local bus accesses | |
6 | + | |
7 | + The MPC5200 has a nasty problem that will cause silent data corruption | |
8 | + when performing unaligned 16 or 32 byte accesses when reading from the | |
9 | + local bus - typically this affects reading from flash. The problem can | |
10 | + be easily shown: | |
11 | + | |
12 | + => md fc0c0000 10 | |
13 | + fc0c0000: 323e4337 01626f6f 74636d64 3d72756e 2>C7.bootcmd=run | |
14 | + fc0c0010: 206e6574 5f6e6673 00626f6f 7464656c net_nfs.bootdel | |
15 | + fc0c0020: 61793d35 00626175 64726174 653d3131 ay=5.baudrate=11 | |
16 | + fc0c0030: 35323030 00707265 626f6f74 3d656368 5200.preboot=ech | |
17 | + => md fc0c0001 10 | |
18 | + fc0c0001: 65636801 00000074 0000003d 00000020 ech....t...=... | |
19 | + fc0c0011: 0000005f 00000000 00000074 00000061 ..._.......t...a | |
20 | + fc0c0021: 00000000 00000064 00000065 00000035 .......d...e...5 | |
21 | + fc0c0031: 00000000 00000062 0000003d 0000006f .......b...=...o | |
22 | + => md.w fc0c0001 10 | |
23 | + fc0c0001: 0000 3701 0000 6f74 0000 643d 0000 6e20 ..7...ot..d=..n | |
24 | + fc0c0011: 0000 745f 0000 7300 0000 6f74 0000 6c61 ..t_..s...ot..la | |
25 | + | |
26 | + This commit implements a workaround at least for the most blatant | |
27 | + problem: using memcpy() from NOR flash. We rename the assembler | |
28 | + routine into __memcpy() and provide a wrapper, which will use a | |
29 | + byte-wise copy loop for unaligned source or target addresses when | |
30 | + reading from NOR flash, and branch to the optimized __memcpy() | |
31 | + in all other cases, thus minimizing the performance impact. | |
32 | + | |
33 | + Tested on lite5200b and TQM5200S. | |
34 | + | |
35 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
36 | + Cc: Detlev Zundel <dzu@denx.de> | |
37 | + | |
38 | +commit 47ea6edfb3004fb2d2a979e19c3f6e4e32f45e51 | |
39 | +Author: Minkyu Kang <mk7.kang@samsung.com> | |
40 | +Date: Fri Jun 18 19:31:10 2010 +0900 | |
41 | + | |
42 | + ARM: remove unused VIDEOLFB ATAG | |
43 | + | |
44 | + ATAG_VIDEOLFB is not used anywhere. | |
45 | + The belowing warning is occurred due to this ATAG. | |
46 | + | |
47 | + [ 0.000000] Ignoring unrecognised tag 0x54410008 | |
48 | + | |
49 | + This patch fixed it. | |
50 | + | |
51 | + Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> | |
52 | + Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> | |
53 | + Acked-by: Martin Krause <Martin.Krause@tqs.de> | |
54 | + | |
55 | +commit ceeba0030844b2e84ce4e47f4be7ad347cd1e827 | |
56 | +Author: Peter Horton <zero@colonel-panic.org> | |
57 | +Date: Sat Jun 12 10:11:56 2010 +0900 | |
58 | + | |
59 | + UBI: initialise update marker | |
60 | + | |
61 | + UBI: initialise update marker | |
62 | + | |
63 | + The in kernel copy of a volume's update marker is not initialised from the | |
64 | + volume table. This means that volumes where an update was unfinnished will | |
65 | + not be treated as "forbidden to use". This is basically that the update | |
66 | + functionality was broken. | |
67 | + | |
68 | + Signed-off-by: Peter Horton <zero@colonel-panic.org> | |
69 | + Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | |
70 | + Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> | |
71 | + Acked-by: Stefan Roese <sr@denx.de> | |
72 | + | |
73 | +commit b8c4eea56b5f41f9bdbb89d3d5c79b7d282d513c | |
74 | +Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de> | |
75 | +Date: Wed Apr 14 15:32:06 2010 +0200 | |
76 | + | |
77 | + remove myself as a maintainer of several ARM boards | |
78 | + | |
79 | + Since I haven't been actively maintaining these boards for a long while, | |
80 | + keeping myself as their maintainer makes no sense. | |
81 | + | |
82 | + Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> | |
83 | + | |
84 | +commit d6b937142008463d628ef26a753f9c20c57f3617 | |
85 | +Author: Ilya Yanok <yanok@emcraft.com> | |
86 | +Date: Mon Jun 21 18:13:21 2010 +0400 | |
87 | + | |
88 | + Makefile: always call date with LC_ALL=C set | |
89 | + | |
90 | + Ensure that date is called only with LC_ALL=C locale set to make dates | |
91 | + locale neutral thus preventing lurking of non-ASCII characters into | |
92 | + U-Boot binary. | |
93 | + | |
94 | + Signed-off-by: Ilya Yanok <yanok@emcraft.com> | |
95 | + | |
96 | + Changed LANG= into LC_ALL= as suggested by Mike Frysinger <vapier@gentoo.org> | |
97 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
98 | + | |
99 | +commit 23fdf0580660edf38cb7118f05b8865f2f73c674 | |
100 | +Author: Albert Aribaud <[albert.aribaud@free.fr]> | |
101 | +Date: Tue Jun 22 15:50:28 2010 +0530 | |
102 | + | |
103 | + Fix wrong orion5x MPP and GIPO writel arguments | |
104 | + | |
105 | + Orion5x MPP and GPIO setting code had writel arguments | |
106 | + the wrong way around. Fixed and tested. | |
107 | + | |
108 | + Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> | |
109 | + | |
110 | +commit 95bc39e848dd3f741a064c826d1c282c48125d41 | |
111 | +Author: Terry Lv <r65388@freescale.com> | |
112 | +Date: Thu May 6 18:30:55 2010 +0800 | |
113 | + | |
114 | + ARM: fix bug in macro __arch_ioremap. | |
115 | + | |
116 | + Signed-off-by: Terry Lv <r65388@freescale.com> | |
117 | + | |
118 | + Fix commit message and code formatting. | |
119 | + | |
120 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
121 | + | |
122 | +commit a71da1b6c96205549ca2e7cf991e2340181bbfcf | |
123 | +Author: Vitaly Kuzmichev <vkuzmichev@mvista.com> | |
124 | +Date: Tue Jun 15 22:18:11 2010 +0400 | |
125 | + | |
126 | + ARM: Align stack to 8 bytes | |
127 | + | |
128 | + The ARM ABI requires that the stack be aligned to 8 bytes as it is noted | |
129 | + in Procedure Call Standard for the ARM Architecture: | |
130 | + http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/index.html | |
131 | + | |
132 | + Unaligned SP also causes the problem with variable-length arrays | |
133 | + allocation when VLA address becomes less than stack pointer during | |
134 | + aligning of this address, so the next 'push' in the stack overwrites | |
135 | + first 4 bytes of VLA. | |
136 | + | |
137 | + Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> | |
138 | + | |
139 | + Tested on tx25(mx25), imx27lite(mx27), qong(mx31) and trab(s3c2400) | |
140 | + Tested-by: Wolfgang Denk <wd@denx.de> | |
141 | + | |
142 | +commit 6de27bdc788e7c4532ee0721ae291aeb5df475dc | |
143 | +Author: Wolfgang Denk <wd@denx.de> | |
144 | +Date: Sun Jun 20 12:32:37 2010 +0200 | |
145 | + | |
146 | + net/eth.c: eth_mac_skip() is only needed when CONFIG_NET_MULTI is set | |
147 | + | |
148 | + Move it inside the #ifdef CONFIG_NET_MULTI to avoid | |
149 | + | |
150 | + eth.c:64: warning: 'eth_mac_skip' defined but not used | |
151 | + | |
152 | + messages from a number of old, non-CONFIG_NET_MULTI boards. | |
153 | + | |
154 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
155 | + Signed-off-by: Ben Warren <biggerbadderben@gmail.com> | |
156 | + | |
157 | +commit e397e59e861aa818cda12a23206dde06f7e9f660 | |
158 | +Author: Fillod Stephane <stephane.fillod@grassvalley.com> | |
159 | +Date: Fri Jun 11 19:26:43 2010 +0200 | |
160 | + | |
161 | + ip/defrag: fix processing of last short fragment | |
162 | + | |
163 | + TFTP'ing a file of size 1747851 bytes with CONFIG_IP_DEFRAG and | |
164 | + CONFIG_TFTP_BLOCKSIZE set to 4096 fails with a timeout, because | |
165 | + the last fragment is not taken into account. This patch fixes | |
166 | + IP fragments having less than 8 bytes of payload. | |
167 | + | |
168 | + Signed-off-by: Stephane Fillod <stephane.fillod@grassvalley.com> | |
169 | + Acked-by: Alessandro Rubini <rubini@gnudd.com> | |
170 | + Signed-off-by: Ben Warren <biggerbadderben@gmail.com> | |
171 | + | |
172 | +commit 9c00b2f0a3fe0f779761607024f99b7690c9776c | |
173 | +Author: Wolfgang Denk <wd@denx.de> | |
174 | +Date: Sun Jun 20 12:30:22 2010 +0200 | |
175 | + | |
176 | + net/eth.c: eth_mac_skip() is only needed when CONFIG_NET_MULTI is set | |
177 | + | |
178 | + Move it inside the #ifdef CONFIG_NET_MULTI to avoid | |
179 | + | |
180 | + eth.c:64: warning: 'eth_mac_skip' defined but not used | |
181 | + | |
182 | + messages from anumber of old, non-CONFIG_NET_MULTI boards. | |
183 | + | |
184 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
185 | + Cc: Ben Warren <biggerbadderben@gmail.com> | |
186 | + | |
187 | +commit 9312bba01a41191f20821b66b84b3ff1d2902e8a | |
188 | +Author: Wolfgang Denk <wd@denx.de> | |
189 | +Date: Sun Jun 20 02:16:44 2010 +0200 | |
190 | + | |
191 | + include/compiler.h: remove redundant declaration of errno | |
192 | + | |
193 | + Commit 37566090 "compiler.h: unify system ifdef cruft here" added both | |
194 | + a "#include <errno.h>" and a "extern int errno;" to include/compiler.h | |
195 | + which is causing build warnings for some systems, for example for the | |
196 | + "netstar" board: | |
197 | + | |
198 | + In file included from /home/wd/git/u-boot/work/lib/crc32.c:15: | |
199 | + include/compiler.h:28: warning: function declaration isn't a prototype | |
200 | + | |
201 | + The declaration of "errno" should be redundant, as <errno.h> is | |
202 | + supposed to provide a correct declaration, so drop it. | |
203 | + | |
204 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
205 | + Cc: Mike Frysinger <vapier@gentoo.org> | |
206 | + | |
207 | +commit cd040a4953e55efe89dc3af4acf0302d5923026f | |
208 | +Author: Wolfgang Denk <wd@denx.de> | |
209 | +Date: Fri Jun 18 15:55:15 2010 +0200 | |
210 | + | |
211 | + arch/arm/cpu/arm_cortexa8/omap3/cache.S: make build with older tools | |
212 | + | |
213 | + The push / pop instructions used in this file are available only with | |
214 | + more recent tool chains: | |
215 | + | |
216 | + cache.S: Assembler messages: | |
217 | + cache.S:133: Error: bad instruction `push {r0,r1,r2,lr}' | |
218 | + cache.S:160: Error: bad instruction `pop {r1,r2,r3,pc}' | |
219 | + cache.S:164: Error: bad instruction `push {r0,r1,r2,lr}' | |
220 | + cache.S:191: Error: bad instruction `pop {r1,r2,r3,pc}' | |
221 | + | |
222 | + Change push/pop into stmfd/ldmfd instructions to support older | |
223 | + versions of binutils as well. | |
224 | + | |
225 | + I verified that the modified source code generates exactly the same | |
226 | + binary code. | |
227 | + | |
228 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
229 | + Cc: Sandeep Paulraj <s-paulraj@ti.com> | |
230 | + Cc: Tom Rix <tom@bumblecow.com> | |
231 | + | |
232 | +commit ce9c227cc71afc3b4c78dcc0a565c40d4ad943e4 | |
233 | +Author: Albert Aribaud <[albert.aribaud@free.fr]> | |
234 | +Date: Thu Jun 17 19:38:21 2010 +0530 | |
235 | + | |
236 | + Add support for the LaCie ED Mini V2 board | |
237 | + | |
238 | + This patch adds support for the LaCie ED Mini V2 product | |
239 | + which is based on the Marvell Orion5x SoC. | |
240 | + | |
241 | + Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> | |
242 | + | |
243 | +commit 83142c112d30ee3da23b62387909d33db064bdc4 | |
244 | +Author: Albert Aribaud <[albert.aribaud@free.fr]> | |
245 | +Date: Thu Jun 17 19:37:01 2010 +0530 | |
246 | + | |
247 | + Add Orion5x support to 16550 device driver | |
248 | + | |
249 | + This patch provides access to the 16550-compatible | |
250 | + serial device of the Orion5x SoC. | |
251 | + | |
252 | + Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> | |
253 | + | |
254 | +commit 0c61e6f9257ef416959b740ee3cf191bf682007d | |
255 | +Author: Albert Aribaud <[albert.aribaud@free.fr]> | |
256 | +Date: Thu Jun 17 19:36:07 2010 +0530 | |
257 | + | |
258 | + Initial support for Marvell Orion5x SoC | |
259 | + | |
260 | + This patch adds support for the Marvell Orion5x SoC. | |
261 | + It has no use alone, and must be followed by a patch | |
262 | + to add Orion5x support for serial, then support for | |
263 | + the ED Mini V2, an Orion5x-based product from LaCie. | |
264 | + | |
265 | + Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> | |
266 | + | |
267 | +commit 376e7fadbad3285231e390c6534feb5af86d594b | |
268 | +Author: Minkyu Kang <mk7.kang@samsung.com> | |
269 | +Date: Tue Jun 8 14:40:47 2010 +0900 | |
270 | + | |
271 | + SAMSUNG: goni: add the GPL licence | |
272 | + | |
273 | + Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> | |
274 | + Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> | |
275 | + Acked-by: Tom <Tom@bumblecow.com> | |
276 | + | |
277 | +commit c474a8ebb880e564df0c701c6a8cf73b7779b1d2 | |
278 | +Author: Minkyu Kang <mk7.kang@samsung.com> | |
279 | +Date: Mon May 31 22:02:42 2010 +0900 | |
280 | + | |
281 | + s5pc1xx: Add support for Samsung Goni board | |
282 | + | |
283 | + This patch adds support for the Samsung Goni board (S5PC110 SoC) | |
284 | + | |
285 | + Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> | |
286 | + Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> | |
287 | + | |
288 | +commit ffb4b02554d9972d66502efbe97b3933620c8a31 | |
289 | +Author: Minkyu Kang <mk7.kang@samsung.com> | |
290 | +Date: Fri May 28 12:34:29 2010 +0900 | |
291 | + | |
292 | + s5pc1xx: gpio: bug fix at gpio_set_pull function | |
293 | + | |
294 | + When set to PULL_NONE, gpio_set_pull function is returned without write the register. | |
295 | + This patch fixed it. | |
296 | + | |
297 | + Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> | |
298 | + | |
299 | +commit a9046b9e1aeeedc66ddf1d00474ad0ce8c6aa6e4 | |
300 | +Author: Wolfgang Denk <wd@denx.de> | |
301 | +Date: Sun Jun 13 17:48:15 2010 +0200 | |
302 | + | |
303 | + Prepare v2010-rc2 | |
304 | + | |
305 | + Signed-off-by: Wolfgang Denk <wd@denx.de> | |
306 | + | |
307 | +commit 3a96ad851f4f9267e1199b700cb838a77334e4b2 | |
308 | +Author: Marek Vasut <marek.vasut@gmail.com> | |
309 | +Date: Sun Apr 11 08:53:55 2010 +0200 | |
310 | + | |
311 | + PXA: Align stack to 8 bytes | |
312 | + | |
313 | + Part of this patch is by: Mikhail Kshevetskiy. | |
314 | + | |
315 | + Stack must be aligned to 8 bytes on PXA (possibly all armv5te) for LDRD/STRD | |
316 | + instructions. In case LDRD/STRD is issued on an unaligned address, the behaviour | |
317 | + is undefined. | |
318 | + | |
319 | + The issue was observed when working with the NAND code, which was rendered | |
320 | + disfunctional. Also, the vsprintf() function had serious problems with printing | |
321 | + 64bit wide long longs. After aligning the stack, this wrong behaviour is no | |
322 | + longer present. | |
323 | + | |
324 | + Tested on: | |
325 | + Marvell Littleton PXA310 board | |
326 | + Toradex Colibri PXA320 board | |
327 | + Aeronix Zipit Z2 PXA270 handheld | |
328 | + Voipac PXA270 board | |
329 | + | |
330 | + Signed-off-by: Marek Vasut <marek.vasut@gmail.com> | |
331 | + | |
332 | +commit 89b765c7f6ddfde07ba673dd4adbeb5da391a81b | |
333 | +Author: Sudhakar Rajashekhara <sudhakar.raj@ti.com> | |
334 | +Date: Thu Jun 10 15:18:15 2010 +0530 | |
335 | + | |
336 | + TI: DaVinci: Add board specific code for da850 EVM | |
337 | + | |
338 | + Provides initial support for TI OMAP-L138/DA850 SoC devices on | |
339 | + a Logic PD EVM board. | |
340 | + | |
341 | + Provides: | |
342 | + Initial boot and configuration. | |
343 | + Support for i2c. | |
344 | + UART support (console). | |
345 | + | |
346 | + Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> | |
347 | + Acked-by: Ben Gardiner <bengardiner@nanometrics.ca> | |
348 | + Reviewed-by: Wolfgang Denk <wd@denx.de> | |
349 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
350 | + | |
351 | +commit 158557001afe167dcb848bb14ba0f2f20aeb25a1 | |
352 | +Author: Sudhakar Rajashekhara <sudhakar.raj@ti.com> | |
353 | +Date: Tue Jun 8 11:01:58 2010 +0530 | |
354 | + | |
355 | + TI: DaVinci: Prepare for da850 support | |
356 | + | |
357 | + DA850/OMAP-L138 is a new SoC from Texas Instruments | |
358 | + (http://focus.ti.com/docs/prod/folders/print/omap-l138.html). | |
359 | + This SoC is similar to DA830/OMAP-L137 in many aspects. Hence | |
360 | + rename the da830 specific files and folders to da8xx to | |
361 | + accommodate DA850/OMAP-L138. | |
362 | + | |
363 | + Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> | |
364 | + Acked-by: Ben Gardiner <bengardiner@nanometrics.ca> | |
365 | + Reviewed-by: Wolfgang Denk <wd@denx.de> | |
366 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
367 | + | |
368 | +commit 9d79956029ec379e7137948ba3a7debbea61325f | |
369 | +Author: Sudhakar Rajashekhara <sudhakar.raj@ti.com> | |
370 | +Date: Mon Jun 7 12:39:59 2010 +0530 | |
371 | + | |
372 | + da830: Move common code out of da830evm.c file | |
373 | + | |
374 | + TI's DA850/OMAP-L138 platform is similar to DA830/OMAP-L137 | |
375 | + in many aspects. So instead of repeating the same code in | |
376 | + multiple files, move the common code to a different file | |
377 | + and call those functions from the respective da830/da850 | |
378 | + files. | |
379 | + | |
380 | + Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> | |
381 | + Acked-by: Nick Thompson <nick.thompson@ge.com> | |
382 | + Acked-by: Ben Gardiner <bengardiner@nanometrics.ca> | |
383 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
384 | + | |
385 | +commit 5246d01edd8935e04cdf79a5b9a03874509a31b1 | |
386 | +Author: Grazvydas Ignotas <notasas@gmail.com> | |
387 | +Date: Tue Jun 8 17:19:22 2010 -0400 | |
388 | + | |
389 | + OMAP3: pandora: enable battery backup capacitor | |
390 | + | |
391 | + Pandora has a capacitor connected as backup battery, which allows | |
392 | + retaining RTC for some time while main battery is removed. Enable backup | |
393 | + battery charge function to charge that capacitor. | |
394 | + | |
395 | + Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> | |
396 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
397 | + | |
398 | +commit 9268236529161312c877e638a14c011fd3c883e1 | |
399 | +Author: Delio Brignoli <dbrignoli@audioscience.com> | |
400 | +Date: Mon Jun 7 17:16:13 2010 -0400 | |
401 | + | |
402 | + DaVinci: Improve DaVinci SPI speed. | |
403 | + | |
404 | + I have updated this patch based on the comments [1] by Wolfgang Denk and | |
405 | + removed unused variables. | |
406 | + [1][http://lists.denx.de/pipermail/u-boot/2010-May/071728.html] | |
407 | + | |
408 | + Reduce the number of reads per byte transferred on the BUF register from 2 to 1 and | |
409 | + take advantage of the TX buffer in the SPI module. On LogicPD OMAP-L138 EVM, | |
410 | + SPI read throughput goes up from ~0.8Mbyte/s to ~1.3Mbyte/s. Tested with a 2Mbyte image file. | |
411 | + Remove unused variables in the spi_xfer() function. | |
412 | + | |
413 | + Signed-off-by: Delio Brignoli <dbrignoli@audioscience.com> | |
414 | + Tested-by: Ben Gardiner <bengardiner@nanometrics.ca> | |
415 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
416 | + | |
417 | +commit 1a5038ca6831e31875cf67c46226f04743574032 | |
418 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
419 | +Date: Mon Jun 7 15:20:53 2010 -0400 | |
420 | + | |
421 | + AM35x: Add support for EMIF4 | |
422 | + | |
423 | + This patch adds support for the EMIF4 interface | |
424 | + available in the AM35x processors. | |
425 | + | |
426 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
427 | + Signed-off-by: Sanjeev Premi <premi@ti.com> | |
428 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
429 | + | |
430 | +commit ed01e45cfa20d60ee83a4ee0128d843730055294 | |
431 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
432 | +Date: Mon Jun 7 15:20:43 2010 -0400 | |
433 | + | |
434 | + AM35x: Add support for AM3517EVM | |
435 | + | |
436 | + This patch adds basic support for the AM3517EVM. | |
437 | + It includes: | |
438 | + - Board files (.c and .h) | |
439 | + - Default configuration file | |
440 | + - Updates for Makefile | |
441 | + | |
442 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
443 | + Signed-off-by: Sanjeev Premi <premi@ti.com> | |
444 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
445 | + | |
446 | +commit cae377b59a179e34d27cd6b79dee24d967de839c | |
447 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
448 | +Date: Mon Jun 7 15:20:34 2010 -0400 | |
449 | + | |
450 | + omap3: Consolidate SDRC related operations | |
451 | + | |
452 | + Consolidated SDRC related functions into one file - sdrc.c | |
453 | + | |
454 | + And also replaced sdrc_init with generic memory init | |
455 | + function (mem_init), this generalization of omap memory setup | |
456 | + is necessary to support the new emif4 interface introduced in AM3517. | |
457 | + | |
458 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
459 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
460 | + | |
461 | +commit d11212e3772c8fe43a1f487bbf58f3341118a241 | |
462 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
463 | +Date: Mon Jun 7 15:20:29 2010 -0400 | |
464 | + | |
465 | + omap3: Calculate CS1 size only when SDRC is | |
466 | + | |
467 | + initialized for CS1 | |
468 | + | |
469 | + From: Vaibhav Hiremath <hvaibhav@ti.com> | |
470 | + | |
471 | + The patch makes sure that size for SDRC CS1 gets calculated | |
472 | + only when the CS1 SDRC is initialized. | |
473 | + | |
474 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
475 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
476 | + | |
477 | +commit 675e0eaf0f0429aac3c6fb41634fbcea2350fe49 | |
478 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
479 | +Date: Mon Jun 7 15:20:19 2010 -0400 | |
480 | + | |
481 | + OMAP3EVM: Added NAND support | |
482 | + | |
483 | + The EVMS have been shipping with NAND (instead of OneNAND) as default. | |
484 | + So, this patch sets NAND as default. | |
485 | + | |
486 | + To choose OneNAND, define CMD_ONENAND instead of CMD_NAND in the | |
487 | + config file omap3_evm.h. | |
488 | + | |
489 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
490 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
491 | + | |
492 | +commit 5cc48f7e55df0d74a12d338de2117f05951fc536 | |
493 | +Author: Cyril Chemparathy <cyril@ti.com> | |
494 | +Date: Mon Jun 7 14:13:36 2010 -0400 | |
495 | + | |
496 | + TI: TNETV107X EVM initial support | |
497 | + | |
498 | + TNETV107X is a Texas Instruments SoC based on an ARM1176 core, and with a | |
499 | + bunch on on-chip integrated peripherals. This patch adds support for the | |
500 | + TNETV107X EVM board. | |
501 | + | |
502 | + Signed-off-by: Cyril Chemparathy <cyril@ti.com> | |
503 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
504 | + | |
505 | +commit 3712367c4830e87b4e7af5b480e82d316bab1251 | |
506 | +Author: Cyril Chemparathy <cyril@ti.com> | |
507 | +Date: Mon Jun 7 14:13:32 2010 -0400 | |
508 | + | |
509 | + ARM1176: TI: TNETV107X soc initial support | |
510 | + | |
511 | + TNETV107X is a Texas Instruments SoC based on an ARM1176 core, and with a | |
512 | + bunch on on-chip integrated peripherals. This is an initial commit with | |
513 | + basic functionality, more commits with drivers, etc. to follow. | |
514 | + | |
515 | + Signed-off-by: Cyril Chemparathy <cyril@ti.com> | |
516 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
517 | + | |
518 | +commit 678e008c3a3a27fe2d30cf423679d2d11d0fa5c2 | |
519 | +Author: Cyril Chemparathy <cyril@ti.com> | |
520 | +Date: Mon Jun 7 14:13:27 2010 -0400 | |
521 | + | |
522 | + ARM1176: Coexist with other ARM1176 platforms | |
523 | + | |
524 | + The current ARM1176 CPU specific code is too specific to the SMDK6400 | |
525 | + architecture. The following changes were necessary prerequisites for the | |
526 | + addition of other SoCs based on ARM1176. | |
527 | + | |
528 | + Existing board's (SMDK6400) configuration has been modified to keep behavior | |
529 | + unchanged despite these changes. | |
530 | + | |
531 | + 1. Peripheral port remap configurability | |
532 | + The earlier code had hardcoded remap values specific to s3c64xx in start.S. | |
533 | + This change makes the peripheral port remap addresses and sizes configurable. | |
534 | + | |
535 | + 2. U-Boot code relocation support | |
536 | + Most architectures allow u-boot code to run initially at a different | |
537 | + address (possibly in NOR) and then get relocated to its final resting place | |
538 | + in RAM. Added support for this capability in ARM1176 architecture. | |
539 | + | |
540 | + 3. Disable TCM if necessary | |
541 | + If a ROM based bootloader happened to have initialized TCM, we disable it here | |
542 | + to keep things sane. | |
543 | + | |
544 | + 4. Remove unnecessary SoC specific includes | |
545 | + ARM1176 code does not really need this SoC specific include. The presence | |
546 | + of this include prevents builds on other ARM1176 archs. | |
547 | + | |
548 | + 5. Modified virt-to-phys conversion during MMU disable | |
549 | + The original MMU disable code masks out too many bits from the load address | |
550 | + when it tries to figure out the physical address of the jump target label. | |
551 | + Consequently, it ends up branching to the wrong address after disabling the | |
552 | + MMU. | |
553 | + | |
554 | + Signed-off-by: Cyril Chemparathy <cyril@ti.com> | |
555 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
556 | + | |
557 | +commit 23911740486c59851df57521c49bfd81ce1865ec | |
558 | +Author: Delio Brignoli <dbrignoli@audioscience.com> | |
559 | +Date: Mon Jun 7 17:16:13 2010 -0400 | |
560 | + | |
561 | + DaVinci: Improve DaVinci SPI speed. | |
562 | + | |
563 | + I have updated this patch based on the comments [1] by Wolfgang Denk and | |
564 | + removed unused variables. | |
565 | + [1][http://lists.denx.de/pipermail/u-boot/2010-May/071728.html] | |
566 | + | |
567 | + Reduce the number of reads per byte transferred on the BUF register from 2 to 1 and | |
568 | + take advantage of the TX buffer in the SPI module. On LogicPD OMAP-L138 EVM, | |
569 | + SPI read throughput goes up from ~0.8Mbyte/s to ~1.3Mbyte/s. Tested with a 2Mbyte image file. | |
570 | + Remove unused variables in the spi_xfer() function. | |
571 | + | |
572 | + Signed-off-by: Delio Brignoli <dbrignoli@audioscience.com> | |
573 | + Tested-by: Ben Gardiner <bengardiner@nanometrics.ca> | |
574 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
575 | + | |
576 | +commit 05ee415e316e3b1617aba06a747649f4d4053d41 | |
577 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
578 | +Date: Mon Jun 7 15:20:53 2010 -0400 | |
579 | + | |
580 | + AM35x: Add support for EMIF4 | |
581 | + | |
582 | + This patch adds support for the EMIF4 interface | |
583 | + available in the AM35x processors. | |
584 | + | |
585 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
586 | + Signed-off-by: Sanjeev Premi <premi@ti.com> | |
587 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
588 | + | |
589 | +commit 3d9f0ffddaf1ece95a826785b971860ebdadf424 | |
590 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
591 | +Date: Mon Jun 7 15:20:43 2010 -0400 | |
592 | + | |
593 | + AM35x: Add support for AM3517EVM | |
594 | + | |
595 | + This patch adds basic support for the AM3517EVM. | |
596 | + It includes: | |
597 | + - Board files (.c and .h) | |
598 | + - Default configuration file | |
599 | + - Updates for Makefile | |
600 | + | |
601 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
602 | + Signed-off-by: Sanjeev Premi <premi@ti.com> | |
603 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
604 | + | |
605 | +commit 8aa5c7cdc4e534df9129485ba317a2871c4f9880 | |
606 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
607 | +Date: Mon Jun 7 15:20:34 2010 -0400 | |
608 | + | |
609 | + omap3: Consolidate SDRC related operations | |
610 | + | |
611 | + Consolidated SDRC related functions into one file - sdrc.c | |
612 | + | |
613 | + And also replaced sdrc_init with generic memory init | |
614 | + function (mem_init), this generalization of omap memory setup | |
615 | + is necessary to support the new emif4 interface introduced in AM3517. | |
616 | + | |
617 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
618 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
619 | + | |
620 | +commit 16807ee411d83762804d075a3fe11f0a2b5eaf39 | |
621 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
622 | +Date: Mon Jun 7 15:20:29 2010 -0400 | |
623 | + | |
624 | + omap3: Calculate CS1 size only when SDRC is | |
625 | + | |
626 | + initialized for CS1 | |
627 | + | |
628 | + From: Vaibhav Hiremath <hvaibhav@ti.com> | |
629 | + | |
630 | + The patch makes sure that size for SDRC CS1 gets calculated | |
631 | + only when the CS1 SDRC is initialized. | |
632 | + | |
633 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
634 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
635 | + | |
636 | +commit 7ca4766bd7f74e5f7371fb331b573ec384230c1d | |
637 | +Author: Vaibhav Hiremath <hvaibhav@ti.com> | |
638 | +Date: Mon Jun 7 15:20:19 2010 -0400 | |
639 | + | |
640 | + OMAP3EVM: Added NAND support | |
641 | + | |
642 | + The EVMS have been shipping with NAND (instead of OneNAND) as default. | |
643 | + So, this patch sets NAND as default. | |
644 | + | |
645 | + To choose OneNAND, define CMD_ONENAND instead of CMD_NAND in the | |
646 | + config file omap3_evm.h. | |
647 | + | |
648 | + Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> | |
649 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
650 | + | |
651 | +commit 04cbc19fedb55265d08cddea294c3b6d9f8b2d18 | |
652 | +Author: Cyril Chemparathy <cyril@ti.com> | |
653 | +Date: Mon Jun 7 14:13:36 2010 -0400 | |
654 | + | |
655 | + TI: TNETV107X EVM initial support | |
656 | + | |
657 | + TNETV107X is a Texas Instruments SoC based on an ARM1176 core, and with a | |
658 | + bunch on on-chip integrated peripherals. This patch adds support for the | |
659 | + TNETV107X EVM board. | |
660 | + | |
661 | + Signed-off-by: Cyril Chemparathy <cyril@ti.com> | |
662 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
663 | + | |
664 | +commit da1ec42aafcc821ce6b5d316a2d4105292960d6b | |
665 | +Author: Cyril Chemparathy <cyril@ti.com> | |
666 | +Date: Mon Jun 7 14:13:32 2010 -0400 | |
667 | + | |
668 | + ARM1176: TI: TNETV107X soc initial support | |
669 | + | |
670 | + TNETV107X is a Texas Instruments SoC based on an ARM1176 core, and with a | |
671 | + bunch on on-chip integrated peripherals. This is an initial commit with | |
672 | + basic functionality, more commits with drivers, etc. to follow. | |
673 | + | |
674 | + Signed-off-by: Cyril Chemparathy <cyril@ti.com> | |
675 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
676 | + | |
677 | +commit b87996d24a41cfc15fea125e5c805163af4acba1 | |
678 | +Author: Cyril Chemparathy <cyril@ti.com> | |
679 | +Date: Mon Jun 7 14:13:27 2010 -0400 | |
680 | + | |
681 | + ARM1176: Coexist with other ARM1176 platforms | |
682 | + | |
683 | + The current ARM1176 CPU specific code is too specific to the SMDK6400 | |
684 | + architecture. The following changes were necessary prerequisites for the | |
685 | + addition of other SoCs based on ARM1176. | |
686 | + | |
687 | + Existing board's (SMDK6400) configuration has been modified to keep behavior | |
688 | + unchanged despite these changes. | |
689 | + | |
690 | + 1. Peripheral port remap configurability | |
691 | + The earlier code had hardcoded remap values specific to s3c64xx in start.S. | |
692 | + This change makes the peripheral port remap addresses and sizes configurable. | |
693 | + | |
694 | + 2. U-Boot code relocation support | |
695 | + Most architectures allow u-boot code to run initially at a different | |
696 | + address (possibly in NOR) and then get relocated to its final resting place | |
697 | + in RAM. Added support for this capability in ARM1176 architecture. | |
698 | + | |
699 | + 3. Disable TCM if necessary | |
700 | + If a ROM based bootloader happened to have initialized TCM, we disable it here | |
701 | + to keep things sane. | |
702 | + | |
703 | + 4. Remove unnecessary SoC specific includes | |
704 | + ARM1176 code does not really need this SoC specific include. The presence | |
705 | + of this include prevents builds on other ARM1176 archs. | |
706 | + | |
707 | + 5. Modified virt-to-phys conversion during MMU disable | |
708 | + The original MMU disable code masks out too many bits from the load address | |
709 | + when it tries to figure out the physical address of the jump target label. | |
710 | + Consequently, it ends up branching to the wrong address after disabling the | |
711 | + MMU. | |
712 | + | |
713 | + Signed-off-by: Cyril Chemparathy <cyril@ti.com> | |
714 | + Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> | |
715 | + | |
716 | +commit b5d289fc29842095d5cd0f82cceab1b0b2e824ba | |
717 | +Author: Asen Dimov <dimov@ronetix.at> | |
718 | +Date: Tue Apr 20 22:49:04 2010 +0300 | |
719 | + | |
720 | + add new board pm9g45 | |
721 | + | |
722 | + Add the new board PM9G45 from Ronetix GmbH. | |
723 | + * AT91SAM9G45 MCU at 400Mhz. | |
724 | + * 128MB DDR2 SDRAM | |
725 | + * 256MB NAND | |
726 | + * 10/100 MBits Ethernet DP83848 | |
727 | + * Serial number chip DS2401 | |
728 | + | |
729 | + The board is made as SODIMM200 module. | |
730 | + For more info www.ronatix.at or info@ronetix.at. | |
731 | + | |
732 | + Signed-off-by: Asen Dimov <dimov@ronetix.at> | |
733 | + | |
1 | 734 | commit f986325dd569faeaec4186f678d113505c5c4828 |
2 | 735 | Author: Ron Madrid <ron_madrid@sbcglobal.net> |
3 | 736 | Date: Tue Jun 1 17:00:49 2010 -0700 |
... | ... | @@ -12,6 +745,25 @@ |
12 | 745 | |
13 | 746 | Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net> |
14 | 747 | Signed-off-by: Kim Phillips <kim.phillips@freescale.com> |
748 | + | |
749 | +commit 409a07c9d72b0d833c1cce264bdb4bb2628fe28e | |
750 | +Author: George G. Davis <gdavis@mvista.com> | |
751 | +Date: Tue May 11 10:15:36 2010 -0400 | |
752 | + | |
753 | + ARM1136: Fix cache_flush() error and correct cpu_init_crit() comments | |
754 | + | |
755 | + The ARM1136 cache_flush() function uses the "mcr p15, 0, rn, c7, c7, 0" | |
756 | + instruction which means "Invalidate Both Caches" when in fact the intent | |
757 | + is to clean and invalidate all caches. So add an "mcr p15, 0, %0, c7, | |
758 | + c10, 0" instruction to "Clean Entire Data Cache" prior to the "Invalidate | |
759 | + Both Caches" instruction to insure that memory is consistent with any | |
760 | + dirty cache lines. | |
761 | + | |
762 | + Also fix a couple of "flush v*" comments in ARM1136 cpu_init_crit() so | |
763 | + that they correctly describe the actual ARM1136 CP15 C7 Cache Operations | |
764 | + used. | |
765 | + | |
766 | + Signed-off-by: George G. Davis <gdavis@mvista.com> | |
15 | 767 | |
16 | 768 | commit 3057c6be5efda781a72ca04432e0a4ed6e670030 |
17 | 769 | Author: Kim Phillips <kim.phillips@freescale.com> |
Makefile
arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S
... | ... | @@ -87,30 +87,30 @@ |
87 | 87 | lowlevel_init: |
88 | 88 | |
89 | 89 | /* Use 'r4 as the base for internal register accesses */ |
90 | - ldr r4, =ORION5X_REGS_PHY_BASE | |
90 | + ldr r4, =ORION5X_REGS_PHY_BASE | |
91 | 91 | |
92 | 92 | /* move internal registers from the default 0xD0000000 |
93 | 93 | * to their intended location, defined by SoC */ |
94 | 94 | ldr r3, =0xD0000000 |
95 | 95 | add r3, r3, #0x20000 |
96 | - str r4, [r3, #0x80] | |
96 | + str r4, [r3, #0x80] | |
97 | 97 | |
98 | 98 | /* Use R3 as the base for DRAM registers */ |
99 | - add r3, r4, #0x01000 | |
99 | + add r3, r4, #0x01000 | |
100 | 100 | |
101 | 101 | /*DDR SDRAM Initialization Control */ |
102 | 102 | ldr r6, =0x00000001 |
103 | 103 | str r6, [r3, #0x480] |
104 | 104 | |
105 | 105 | /* Use R3 as the base for PCI registers */ |
106 | - add r3, r4, #0x31000 | |
106 | + add r3, r4, #0x31000 | |
107 | 107 | |
108 | 108 | /* Disable arbiter */ |
109 | 109 | ldr r6, =0x00000030 |
110 | 110 | str r6, [r3, #0xd00] |
111 | 111 | |
112 | 112 | /* Use R3 as the base for DRAM registers */ |
113 | - add r3, r4, #0x01000 | |
113 | + add r3, r4, #0x01000 | |
114 | 114 | |
115 | 115 | /* set all dram windows to 0 */ |
116 | 116 | mov r6, #0 |
117 | 117 | |
118 | 118 | |
119 | 119 | |
120 | 120 | |
121 | 121 | |
122 | 122 | |
123 | 123 | |
124 | 124 | |
125 | 125 | |
126 | 126 | |
127 | 127 | |
128 | 128 | |
... | ... | @@ -127,63 +127,63 @@ |
127 | 127 | ldr r6, =SDRAM_CONTROL |
128 | 128 | str r6, [r3, #0x404] |
129 | 129 | |
130 | - /* 3) Write SDRAM address control register */ | |
130 | + /* 3) Write SDRAM address control register */ | |
131 | 131 | ldr r6, =SDRAM_ADDR_CTRL |
132 | 132 | str r6, [r3, #0x410] |
133 | 133 | |
134 | - /* 4) Write SDRAM bank 0 size register */ | |
134 | + /* 4) Write SDRAM bank 0 size register */ | |
135 | 135 | ldr r6, =SDRAM_BANK0_SIZE |
136 | 136 | str r6, [r3, #0x504] |
137 | 137 | /* keep other banks disabled */ |
138 | 138 | |
139 | - /* 5) Write SDRAM open pages control register */ | |
139 | + /* 5) Write SDRAM open pages control register */ | |
140 | 140 | ldr r6, =SDRAM_OPEN_PAGE_EN |
141 | 141 | str r6, [r3, #0x414] |
142 | 142 | |
143 | - /* 6) Write SDRAM timing Low register */ | |
143 | + /* 6) Write SDRAM timing Low register */ | |
144 | 144 | ldr r6, =SDRAM_TIME_CTRL_LOW |
145 | 145 | str r6, [r3, #0x408] |
146 | 146 | |
147 | - /* 7) Write SDRAM timing High register */ | |
147 | + /* 7) Write SDRAM timing High register */ | |
148 | 148 | ldr r6, =SDRAM_TIME_CTRL_HI |
149 | 149 | str r6, [r3, #0x40C] |
150 | 150 | |
151 | - /* 8) Write SDRAM mode register */ | |
152 | - /* The CPU must not attempt to change the SDRAM Mode register setting */ | |
153 | - /* prior to DRAM controller completion of the DRAM initialization */ | |
154 | - /* sequence. To guarantee this restriction, it is recommended that */ | |
155 | - /* the CPU sets the SDRAM Operation register to NOP command, performs */ | |
156 | - /* read polling until the register is back in Normal operation value, */ | |
157 | - /* and then sets SDRAM Mode register to its new value. */ | |
151 | + /* 8) Write SDRAM mode register */ | |
152 | + /* The CPU must not attempt to change the SDRAM Mode register setting */ | |
153 | + /* prior to DRAM controller completion of the DRAM initialization */ | |
154 | + /* sequence. To guarantee this restriction, it is recommended that */ | |
155 | + /* the CPU sets the SDRAM Operation register to NOP command, performs */ | |
156 | + /* read polling until the register is back in Normal operation value, */ | |
157 | + /* and then sets SDRAM Mode register to its new value. */ | |
158 | 158 | |
159 | 159 | /* 8.1 write 'nop' to SDRAM operation */ |
160 | - ldr r6, =SDRAM_OP_NOP | |
160 | + ldr r6, =SDRAM_OP_NOP | |
161 | 161 | str r6, [r3, #0x418] |
162 | 162 | |
163 | - /* 8.2 poll SDRAM operation until back in 'normal' mode. */ | |
163 | + /* 8.2 poll SDRAM operation until back in 'normal' mode. */ | |
164 | 164 | 1: |
165 | 165 | ldr r6, [r3, #0x418] |
166 | 166 | cmp r6, #0 |
167 | 167 | bne 1b |
168 | 168 | |
169 | - /* 8.3 Now its safe to write new value to SDRAM Mode register */ | |
169 | + /* 8.3 Now its safe to write new value to SDRAM Mode register */ | |
170 | 170 | ldr r6, =SDRAM_MODE |
171 | 171 | str r6, [r3, #0x41C] |
172 | 172 | |
173 | - /* 8.4 Set new mode */ | |
174 | - ldr r6, =SDRAM_OP_SETMODE | |
173 | + /* 8.4 Set new mode */ | |
174 | + ldr r6, =SDRAM_OP_SETMODE | |
175 | 175 | str r6, [r3, #0x418] |
176 | 176 | |
177 | - /* 8.5 poll SDRAM operation until back in 'normal' mode. */ | |
177 | + /* 8.5 poll SDRAM operation until back in 'normal' mode. */ | |
178 | 178 | 2: |
179 | 179 | ldr r6, [r3, #0x418] |
180 | 180 | cmp r6, #0 |
181 | 181 | bne 2b |
182 | 182 | |
183 | - /* DDR SDRAM Address/Control Pads Calibration */ | |
183 | + /* DDR SDRAM Address/Control Pads Calibration */ | |
184 | 184 | ldr r6, [r3, #0x4C0] |
185 | 185 | |
186 | - /* Set Bit [31] to make the register writable */ | |
186 | + /* Set Bit [31] to make the register writable */ | |
187 | 187 | orr r6, r6, #SDRAM_PAD_CTRL_WR_EN |
188 | 188 | str r6, [r3, #0x4C0] |
189 | 189 | |
190 | 190 | |
191 | 191 | |
192 | 192 | |
... | ... | @@ -192,20 +192,20 @@ |
192 | 192 | bic r6, r6, #SDRAM_PAD_CTRL_DRVN_MASK |
193 | 193 | bic r6, r6, #SDRAM_PAD_CTRL_DRVP_MASK |
194 | 194 | |
195 | - /* Get the final N locked value of driving strength [22:17] */ | |
196 | - mov r1, r6 | |
197 | - mov r1, r1, LSL #9 | |
198 | - mov r1, r1, LSR #26 /* r1[5:0]<DrvN> = r3[22:17]<LockN> */ | |
199 | - orr r1, r1, r1, LSL #6 /* r1[11:6]<DrvP> = r1[5:0]<DrvN> */ | |
195 | + /* Get the final N locked value of driving strength [22:17] */ | |
196 | + mov r1, r6 | |
197 | + mov r1, r1, LSL #9 | |
198 | + mov r1, r1, LSR #26 /* r1[5:0]<DrvN> = r3[22:17]<LockN> */ | |
199 | + orr r1, r1, r1, LSL #6 /* r1[11:6]<DrvP> = r1[5:0]<DrvN> */ | |
200 | 200 | |
201 | - /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6] */ | |
201 | + /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6] */ | |
202 | 202 | orr r6, r6, r1 |
203 | 203 | str r6, [r3, #0x4C0] |
204 | 204 | |
205 | - /* DDR SDRAM Data Pads Calibration */ | |
205 | + /* DDR SDRAM Data Pads Calibration */ | |
206 | 206 | ldr r6, [r3, #0x4C4] |
207 | 207 | |
208 | - /* Set Bit [31] to make the register writable */ | |
208 | + /* Set Bit [31] to make the register writable */ | |
209 | 209 | orr r6, r6, #SDRAM_PAD_CTRL_WR_EN |
210 | 210 | str r6, [r3, #0x4C4] |
211 | 211 | |
212 | 212 | |
213 | 213 | |
214 | 214 | |
... | ... | @@ -214,21 +214,21 @@ |
214 | 214 | bic r6, r6, #SDRAM_PAD_CTRL_DRVN_MASK |
215 | 215 | bic r6, r6, #SDRAM_PAD_CTRL_DRVP_MASK |
216 | 216 | |
217 | - /* Get the final N locked value of driving strength [22:17] */ | |
218 | - mov r1, r6 | |
219 | - mov r1, r1, LSL #9 | |
220 | - mov r1, r1, LSR #26 | |
221 | - orr r1, r1, r1, LSL #6 /* r1[5:0] = r3[22:17]<LockN> */ | |
217 | + /* Get the final N locked value of driving strength [22:17] */ | |
218 | + mov r1, r6 | |
219 | + mov r1, r1, LSL #9 | |
220 | + mov r1, r1, LSR #26 | |
221 | + orr r1, r1, r1, LSL #6 /* r1[5:0] = r3[22:17]<LockN> */ | |
222 | 222 | |
223 | - /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6] */ | |
223 | + /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6] */ | |
224 | 224 | orr r6, r6, r1 |
225 | 225 | |
226 | 226 | str r6, [r3, #0x4C4] |
227 | 227 | |
228 | - /* Implement Guideline (GL# MEM-3) Drive Strength Value */ | |
229 | - /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0 */ | |
228 | + /* Implement Guideline (GL# MEM-3) Drive Strength Value */ | |
229 | + /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0 */ | |
230 | 230 | |
231 | - ldr r1, =DDR1_PAD_STRENGTH_DEFAULT | |
231 | + ldr r1, =DDR1_PAD_STRENGTH_DEFAULT | |
232 | 232 | |
233 | 233 | /* Enable writes to DDR SDRAM Addr/Ctrl Pads Calibration register */ |
234 | 234 | ldr r6, [r3, #0x4C0] |
235 | 235 | |
236 | 236 | |
237 | 237 | |
238 | 238 | |
239 | 239 | |
240 | 240 | |
241 | 241 | |
... | ... | @@ -252,43 +252,43 @@ |
252 | 252 | orr r6, r6, r1 |
253 | 253 | str r6, [r3, #0x4C4] |
254 | 254 | |
255 | - /* Implement Guideline (GL# MEM-4) DQS Reference Delay Tuning */ | |
256 | - /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0 */ | |
255 | + /* Implement Guideline (GL# MEM-4) DQS Reference Delay Tuning */ | |
256 | + /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0 */ | |
257 | 257 | |
258 | - /* Get the "sample on reset" register for the DDR frequancy */ | |
258 | + /* Get the "sample on reset" register for the DDR frequancy */ | |
259 | 259 | ldr r3, =0x10000 |
260 | - ldr r6, [r3, #0x010] | |
261 | - ldr r1, =MSAR_ARMDDRCLCK_MASK | |
262 | - and r1, r6, r1 | |
260 | + ldr r6, [r3, #0x010] | |
261 | + ldr r1, =MSAR_ARMDDRCLCK_MASK | |
262 | + and r1, r6, r1 | |
263 | 263 | |
264 | - ldr r6, =FTDLL_DDR1_166MHZ | |
265 | - cmp r1, #MSAR_ARMDDRCLCK_333_167 | |
266 | - beq 3f | |
267 | - cmp r1, #MSAR_ARMDDRCLCK_500_167 | |
268 | - beq 3f | |
269 | - cmp r1, #MSAR_ARMDDRCLCK_667_167 | |
270 | - beq 3f | |
264 | + ldr r6, =FTDLL_DDR1_166MHZ | |
265 | + cmp r1, #MSAR_ARMDDRCLCK_333_167 | |
266 | + beq 3f | |
267 | + cmp r1, #MSAR_ARMDDRCLCK_500_167 | |
268 | + beq 3f | |
269 | + cmp r1, #MSAR_ARMDDRCLCK_667_167 | |
270 | + beq 3f | |
271 | 271 | |
272 | - ldr r6, =FTDLL_DDR1_200MHZ | |
273 | - cmp r1, #MSAR_ARMDDRCLCK_400_200_1 | |
274 | - beq 3f | |
275 | - cmp r1, #MSAR_ARMDDRCLCK_400_200 | |
276 | - beq 3f | |
277 | - cmp r1, #MSAR_ARMDDRCLCK_600_200 | |
278 | - beq 3f | |
279 | - cmp r1, #MSAR_ARMDDRCLCK_800_200 | |
280 | - beq 3f | |
272 | + ldr r6, =FTDLL_DDR1_200MHZ | |
273 | + cmp r1, #MSAR_ARMDDRCLCK_400_200_1 | |
274 | + beq 3f | |
275 | + cmp r1, #MSAR_ARMDDRCLCK_400_200 | |
276 | + beq 3f | |
277 | + cmp r1, #MSAR_ARMDDRCLCK_600_200 | |
278 | + beq 3f | |
279 | + cmp r1, #MSAR_ARMDDRCLCK_800_200 | |
280 | + beq 3f | |
281 | 281 | |
282 | - ldr r6, =0 | |
282 | + ldr r6, =0 | |
283 | 283 | |
284 | 284 | 3: |
285 | 285 | /* Use R3 as the base for DRAM registers */ |
286 | - add r3, r4, #0x01000 | |
286 | + add r3, r4, #0x01000 | |
287 | 287 | |
288 | 288 | ldr r2, [r3, #0x484] |
289 | 289 | orr r2, r2, r6 |
290 | 290 | str r2, [r3, #0x484] |
291 | 291 | |
292 | 292 | /* Return to U-boot via saved link register */ |
293 | - mov pc, lr | |
293 | + mov pc, lr |