LPC4330のコアが204MHzで動作するように調整。LPC1830のPLLも制御ロジックを合わせた。

diff --git a/asp/arch/arm_m_gcc/lpc1800_gcc/chip_config.c b/asp/arch/arm_m_gcc/lpc1800_gcc/chip_config.c
index b18ba53..10d022b 100644 (file)
--- a/asp/arch/arm_m_gcc/lpc1800_gcc/chip_config.c
+++ b/asp/arch/arm_m_gcc/lpc1800_gcc/chip_config.c
@@ -85,6 +85,7 @@ extern void initPLL1( unsigned int  Hz  )
             // wait for lock
     while ( ! LPC_CGU->PLL1_STAT )
        ;
+    LPC_CGU->BASE_M3_CLK = 0x09000800;          // select PLL1, auto hold
         // Set PLL1 frequency to desired
         // PLL reference is 4MHz (12MHz/3). So, the multiplier have to be ( desired freq / 4 )-1
     LPC_CGU->PLL1_CTRL =
@@ -98,9 +99,6 @@ extern void initPLL1( unsigned int  Hz  )
                 0 << 1  |   // 1,     BYPASS=0 ( 1 : input, 0 : CCO )
                      0;      // 0,     PD = 0   ( 1 : power down, 0 active );
     // wait for lock
-    while ( ! LPC_CGU->PLL1_STAT )
-        ;
-    LPC_CGU->BASE_M3_CLK = 0x09000800;          // select PLL1, auto hold
 
 }
 

diff --git a/asp/arch/arm_m_gcc/lpc4300_gcc/chip_config.c b/asp/arch/arm_m_gcc/lpc4300_gcc/chip_config.c
index b6b26cb..dbfa73d 100644 (file)
--- a/asp/arch/arm_m_gcc/lpc4300_gcc/chip_config.c
+++ b/asp/arch/arm_m_gcc/lpc4300_gcc/chip_config.c
@@ -85,6 +85,7 @@ extern void initPLL1( unsigned int    Hz      )
             // wait for lock
     while ( ! LPC_CGU->PLL1_STAT )
        ;
+    LPC_CGU->BASE_M4_CLK = 0x09000800;          // select PLL1, auto hold
         // Set PLL1 frequency to desired
         // PLL reference is 4MHz (12MHz/3). So, the multiplier have to be ( desired freq / 4 )-1
     LPC_CGU->PLL1_CTRL =
@@ -98,9 +99,6 @@ extern void initPLL1( unsigned int    Hz      )
                 0 << 1  |   // 1,     BYPASS=0 ( 1 : input, 0 : CCO )
                      0;      // 0,     PD = 0   ( 1 : power down, 0 active );
     // wait for lock
-    while ( ! LPC_CGU->PLL1_STAT )
-        ;
-    LPC_CGU->BASE_M4_CLK = 0x09000800;          // select PLL1, auto hold
 
 }
 

diff --git a/asp/target/lpc4330_generic_gcc/lpc4330_generic.h b/asp/target/lpc4330_generic_gcc/lpc4330_generic.h
index f8b0e5c..2166641 100644 (file)
--- a/asp/target/lpc4330_generic_gcc/lpc4330_generic.h
+++ b/asp/target/lpc4330_generic_gcc/lpc4330_generic.h
@@ -99,7 +99,7 @@
  * \details
  * CORTEX-M4Fコアに入力する動作クロックの周波数[Hz]。現在のチップ依存部の制限により、周波数は4の倍数にする。
  */
-#define SYS_CLOCK        192000000    // コアに入力するクロック
+#define SYS_CLOCK        204000000    // コアに入力するクロック
 
 
 #ifndef TOPPERS_MACRO_ONLY