[KINETIS] Update demos (for HAL changes).

2 files changed, 16 insertions, 9 deletions

diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
index be132f5..1453c5e 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
@@ -89,7 +89,7 @@ PROJECT = ch
 CHIBIOS = ../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Startup files.

-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_k20x.mk

+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x5.mk

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS_CONTRIB)/os/hal/ports/KINETIS/K20x/platform.mk

diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h
index 198a03d..4a1adfc 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h
@@ -25,13 +25,13 @@
 

 /* Select the MCU clocking mode below by enabling the appropriate block. */

 

-/* Disable all clock intialization */

+/* Enable clock initialization by HAL */

 #define KINETIS_NO_INIT             FALSE

 

-/* PEE mode - external 8 MHz crystal with PLL for 48 MHz core/system clock. */

+/* PEE mode - external (8 MHz) crystal with PLL for 48 MHz core/system clock. */

 #if 1

 #define KINETIS_MCG_MODE            KINETIS_MCG_MODE_PEE

-#define KINETIS_XTAL_FREQUENCY      8000000UL

+#define KINETIS_PLLCLK_FREQUENCY    96000000UL

 #define KINETIS_SYSCLK_FREQUENCY    48000000UL

 #endif

 

@@ -41,28 +41,35 @@
 #define KINETIS_MCG_FLL_DMX32       1           /* Fine-tune for 32.768 kHz */

 #define KINETIS_MCG_FLL_DRS         1           /* 1464x FLL factor */

 #define KINETIS_SYSCLK_FREQUENCY    47972352UL  /* 32.768 kHz * 1464 (~48 MHz) */

+#define KINETIS_CLKDIV1_OUTDIV1     1           /* Divide MCGCLKOUT (~48MHz) by 1 to SYSCLK */

+#define KINETIS_CLKDIV1_OUTDIV2     1           /* Divide by 1 for (~48MHz) peripheral clock */

+#define KINETIS_CLKDIV1_OUTDIV4     2           /* Divide by 2 for (~24MHz) flash clock */

+#define KINETIS_BUSCLK_FREQUENCY    KINETIS_SYSCLK_FREQUENCY

+#define KINETIS_FLASHCLK_FREQUENCY  KINETIS_SYSCLK_FREQUENCY/2

 #endif /* 0 */

 

 /* FEE mode - 24 MHz with external 32.768 kHz crystal */

+/* not implemented */

 #if 0

 #define KINETIS_MCG_MODE            KINETIS_MCG_MODE_FEE

 #define KINETIS_MCG_FLL_DMX32       1           /* Fine-tune for 32.768 kHz */

 #define KINETIS_MCG_FLL_DRS         0           /* 732x FLL factor */

-#define KINETIS_MCG_FLL_OUTDIV1     1           /* Divide 48 MHz FLL by 1 => 24 MHz */

-#define KINETIS_MCG_FLL_OUTDIV4     2           /* Divide OUTDIV1 output by 2 => 12 MHz */

+#define KINETIS_CLKDIV1_OUTDIV1     1           /* Divide 48 MHz FLL by 1 => 24 MHz */

+#define KINETIS_CLKDIV1_OUTDIV4     2           /* Divide OUTDIV1 output by 2 => 12 MHz */

 #define KINETIS_SYSCLK_FREQUENCY    23986176UL  /* 32.768 kHz*732 (~24 MHz) */

 #define KINETIS_UART0_CLOCK_FREQ    (32768 * 732) /* FLL output */

 #define KINETIS_UART0_CLOCK_SRC     1           /* Select FLL clock */

-#define KINETIS_BUSCLK_FREQUENCY    (KINETIS_SYSCLK_FREQUENCY / KINETIS_MCG_FLL_OUTDIV4)

+#define KINETIS_BUSCLK_FREQUENCY    (KINETIS_SYSCLK_FREQUENCY / KINETIS_CLKDIV1_OUTDIV4)

 #endif /* 0 */

 

 /* FEE mode - 48 MHz */

+/* not implemented */

 #if 0

 #define KINETIS_MCG_MODE            KINETIS_MCG_MODE_FEE

 #define KINETIS_MCG_FLL_DMX32       1           /* Fine-tune for 32.768 kHz */

 #define KINETIS_MCG_FLL_DRS         1           /* 1464x FLL factor */

-#define KINETIS_MCG_FLL_OUTDIV1     1           /* Divide 48 MHz FLL by 1 => 48 MHz */

-#define KINETIS_MCG_FLL_OUTDIV4     2           /* Divide OUTDIV1 output by 2 => 24 MHz */

+#define KINETIS_CLKDIV1_OUTDIV1     1           /* Divide 48 MHz FLL by 1 => 48 MHz */

+#define KINETIS_CLKDIV1_OUTDIV4     2           /* Divide OUTDIV1 output by 2 => 24 MHz */

 #define KINETIS_SYSCLK_FREQUENCY    47972352UL  /* 32.768 kHz * 1464 (~48 MHz) */

 #endif /* 0 */