summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-09-06 19:45:28 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-09-06 19:45:28 +0000
commit74c1e661abf325a99cc8185492214a7bde852fd5 (patch)
tree41990bd67021c7565880fb65de498fd0f4f842cd
parenta0858f5dc80ec94952af4b32903194c40f61c857 (diff)
downloadnuttx-74c1e661abf325a99cc8185492214a7bde852fd5.tar.gz
nuttx-74c1e661abf325a99cc8185492214a7bde852fd5.tar.bz2
nuttx-74c1e661abf325a99cc8185492214a7bde852fd5.zip
This is the correct fix to the problem
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2924 42af7a65-404d-4744-a932-0658087f49c3
-rwxr-xr-xnuttx/arch/arm/src/lpc313x/lpc313x_boot.c10
-rwxr-xr-xnuttx/arch/arm/src/lpc313x/lpc313x_resetclks.c2
2 files changed, 1 insertions, 11 deletions
diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_boot.c b/nuttx/arch/arm/src/lpc313x/lpc313x_boot.c
index 0a6ad34bf..6f9934b87 100755
--- a/nuttx/arch/arm/src/lpc313x/lpc313x_boot.c
+++ b/nuttx/arch/arm/src/lpc313x/lpc313x_boot.c
@@ -385,16 +385,6 @@ void up_boot(void)
lpc313x_lowsetup();
- /* NOTE: Something in the operation of lpc313x_resetclks() causes the first
- * 6 words of memory to be zeroed, wiping out the interrupt vectors. However,
- * moving the vector initialization until after the clock setup seems to hang
- * the system (and I can't step though the clock setup to find why without
- * losing my JTAG connection). So, the simplest work-around is to simply
- * initialize the vectors twice.
- */
-
- up_copyvectorblock();
-
/* Perform early serial initialization if we are going to use the serial driver */
#ifdef CONFIG_USE_EARLYSERIALINIT
diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_resetclks.c b/nuttx/arch/arm/src/lpc313x/lpc313x_resetclks.c
index 7f349c2f7..257430f8e 100755
--- a/nuttx/arch/arm/src/lpc313x/lpc313x_resetclks.c
+++ b/nuttx/arch/arm/src/lpc313x/lpc313x_resetclks.c
@@ -146,6 +146,6 @@ void lpc313x_resetclks(void)
regaddr = LPC313X_CGU_FDC(i);
regval = getreg32(regaddr);
regval &= ~CGU_FDC_RUN;
- putreg32(regval, i);
+ putreg32(regval, regaddr);
}
}