Kim,
Yes I just cut-n-pasted it.
I hope it's better now.
Regards,
Norbert.
Kim Phillips wrote:
On Wed, 11 Mar 2009 13:22:05 -0500
Scott Wood <scottw...@freescale.com> wrote:
On Wed, Mar 11, 2009 at 12:57:43PM -0500, Kim Phillips wrote:
heh, I thought it wouldn't be a problem, but you're right Heiko:
Applying: 83xx: correctly set encryption and I2C bus 0 clock
error: mpc83xx/cpu_init.c: does not exist in index
Patch failed at 0001.
When you have resolved this problem run "git am -i --resolved".
If you would prefer to skip this patch, instead run "git am -i --skip".
To restore the original branch and stop patching run "git am -i --abort".
even patch(1) asks which file to patch.
Try "git am -p0".
right. That yields another problem:
Applying: 83xx: correctly set encryption and I2C bus 0 clock
error: patch failed: cpu/mpc83xx/cpu_init.c:106
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".
To restore the original branch and stop patching run "git am --abort".
It appears Norbert cut-n-pasted the diff and thus introduced whitespace
errors.
I can obviously apply this by hand but I'd rather get Norbert up to
speed with submitting patches, esp. for the sake of future, potentially
unwieldy, contributions.
Kim
>From 1414c12b58c917bd11f8b3e91fbc260962d51c47 Mon Sep 17 00:00:00 2001
From: Norbert van Bolhuis <nvbolh...@linpc062.aimsys.nl>
Date: Thu, 12 Mar 2009 07:52:19 +0100
Subject: [PATCH] 83xx: correctly set encryption and I2C bus 0 clock
This patch makes sure the correct mask is applied when setting
the encryption and I2C bus 0 clock in SCCR.
Failing to do so may lead to ENCCM being 0 in which case I2C bus 0
won't function.
diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c
index 491c2e5..8e9c875 100644
--- a/cpu/mpc83xx/cpu_init.c
+++ b/cpu/mpc83xx/cpu_init.c
@@ -106,7 +106,7 @@ void cpu_init_f (volatile immap_t * im)
#ifdef CONFIG_SYS_SCCR_ENCCM
/* Encryption clock mode */
im->clk.sccr = (im->clk.sccr & ~SCCR_ENCCM) |
- (CONFIG_SYS_SCCR_ENCCM << SCCR_PCICM_SHIFT);
+ (CONFIG_SYS_SCCR_ENCCM << SCCR_ENCCM_SHIFT);
#endif
#ifdef CONFIG_SYS_SCCR_PCICM
--
1.5.2.2
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
