<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
<title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
Kim,<br>
<br>
doing a git-pull gives "Already up-to-date."<br>
The patch is produced with "git-diff --patch-with-stat
cpu/mpc83xx/cpu_init.c"<br>
<br>
Am I doing anything wrong ?<br>
<br>
Since all my patches have problems in getting applied there's obviously
a problem on my side ...<br>
<br>
<br>
<br>
regards,<br>
Andre<br>
<br>
Kim Phillips schrieb:
<blockquote
cite="mid:20080417155615.43fa3791.kim.phillips@freescale.com"
type="cite">
<pre wrap="">On Thu, 17 Apr 2008 19:28:17 +0200
Andre Schwarz <a class="moz-txt-link-rfc2396E" href="mailto:andre.schwarz@matrix-vision.de"><andre.schwarz@matrix-vision.de></a> wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Kim,
</pre>
</blockquote>
<pre wrap=""><!---->Hello Andre,
I can't apply this:
Applying fix system config overwrite @ MPC834x
error: patch failed: cpu/mpc83xx/cpu_init.c:59
error: cpu/mpc83xx/cpu_init.c: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
</pre>
<blockquote type="cite">
<pre wrap="">during 83xx setup the "System I/O configuration register high" gets
overwritten
with user defined value if CFG_SICRH is defined.
Regarding to the MPC834x manual (Table 5-28 reve.1) bits 28+29 of SICRH
must keep
their reset value regardless of configuration.
On my board (using RGMII) those bits are set after reset - yet it's
unclear where they come from.
The patch keeps both bits on MPC834x.
Cheers,
Andre
Signed-off-by: Andre Schwarz <a class="moz-txt-link-rfc2396E" href="mailto:andre.schwarz@matrix-vision.de"><andre.schwarz@matrix-vision.de></a>
--
</pre>
</blockquote>
<pre wrap=""><!---->
fyi, commit message text you don't want applied in the tree history
(such as "Kim," and "Cheers, Andre") goes here, below the '---' line.
</pre>
<blockquote type="cite">
<pre wrap=""> /* System General Purpose Register */
#ifdef CFG_SICRH
- im->sysconf.sicrh = CFG_SICRH;
+#ifdef CONFIG_MPC834X
+ /* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
+ tmp_sicrh = im->sysconf.sicrh & 0x0000000C;
+#endif
+ im->sysconf.sicrh = CFG_SICRH | tmp_sicrh;
#endif
</pre>
</blockquote>
<pre wrap=""><!---->
also, can you extend the ifdef to include CONFIG_MPC8313 in addition to
the MPC834X? That's the only other one that could use this fix.
Thanks,
Kim
</pre>
</blockquote>
<br>
<BR>
MATRIX VISION GmbH, Talstraße 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschäftsführer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
<BR>
</body>
</html>