Overclocking and optimizer settings for M4 boards (arduino#100)

ladyada · web-flow · commit bc8d8b861f05 · 2019-04-21T01:47:47.000-04:00
diff --git a/boards.txt b/boards.txt
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
@@ -160,7 +160,8 @@ void SystemInit( void )
   //PLL0 is 120MHz
   GCLK->PCHCTRL[OSCCTRL_GCLK_ID_FDPLL0].reg = (1 << GCLK_PCHCTRL_CHEN_Pos) | GCLK_PCHCTRL_GEN(GCLK_PCHCTRL_GEN_GCLK5_Val);
   
-  OSCCTRL->Dpll[0].DPLLRATIO.reg = OSCCTRL_DPLLRATIO_LDRFRAC(0x00) | OSCCTRL_DPLLRATIO_LDR(119); //120 Mhz
+  // This rounds to nearest full-MHz increment; not currently using frac
+  OSCCTRL->Dpll[0].DPLLRATIO.reg = OSCCTRL_DPLLRATIO_LDRFRAC(0x00) | OSCCTRL_DPLLRATIO_LDR((F_CPU - 500000) / 1000000);
   
   while(OSCCTRL->Dpll[0].DPLLSYNCBUSY.bit.DPLLRATIO);
   
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
@@ -25,8 +25,7 @@ extern "C" {
 
 
 #if defined(__SAMD51__)
-//CHANGE THIS IF YOU CHANGE THE CLOCK SPEED
-uint32_t SystemCoreClock=120000000ul ;
+uint32_t SystemCoreClock=F_CPU;
 #else
 /*
  * System Core Clock is at 1MHz (8MHz/8) at Reset.
diff --git a/variants/arduino_mzero/variant.h b/variants/arduino_mzero/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/circuitplay/variant.h b/variants/circuitplay/variant.h
@@ -31,7 +31,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/crickit_m0/variant.h b/variants/crickit_m0/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/feather_m0/variant.h b/variants/feather_m0/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/feather_m0_express/variant.h b/variants/feather_m0_express/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/feather_m4/variant.h b/variants/feather_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK        (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/gemma_m0/variant.h b/variants/gemma_m0/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/grand_central_m4/variant.h b/variants/grand_central_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK        (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/hallowing_m0_express/variant.h b/variants/hallowing_m0_express/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/itsybitsy_m0/variant.h b/variants/itsybitsy_m0/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/itsybitsy_m4/variant.h b/variants/itsybitsy_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK        (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/metro_m0/variant.h b/variants/metro_m0/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/metro_m4/variant.h b/variants/metro_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK	(F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/metro_m4_airlift/variant.h b/variants/metro_m4_airlift/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK        (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/mkr1000/variant.h b/variants/mkr1000/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/mkrfox1200/variant.h b/variants/mkrfox1200/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/mkrgsm1400/variant.h b/variants/mkrgsm1400/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
@@ -196,4 +196,4 @@ extern Uart Serial2;
 #define SerialGSM                   Serial2
 
 #define ARDUINO_GSM_COMPATIBILITY_WRAPPER
-#define GSM_DEFAULT_STREAM          SerialGSM
+#define GSM_DEFAULT_STREAM          SerialGSM
diff --git a/variants/mkrnb1500/variant.h b/variants/mkrnb1500/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/mkrwan1300/variant.h b/variants/mkrwan1300/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/mkrwifi1010/variant.h b/variants/mkrwifi1010/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/mkrzero/variant.h b/variants/mkrzero/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC (32768ul)
 
 // Master clock frequency
-#define VARIANT_MCK     (48000000ul)
+#define VARIANT_MCK     (F_CPU)
 
 // Pins
 // ----
diff --git a/variants/pirkey/variant.h b/variants/pirkey/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/pybadge_m4/variant.h b/variants/pybadge_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK	   (120000000ul)
+#define VARIANT_MCK	   (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/pygamer_m4/variant.h b/variants/pygamer_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK	   (120000000ul)
+#define VARIANT_MCK	(F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/pyportal_m4/variant.h b/variants/pyportal_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK        (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/trellis_m4/variant.h b/variants/trellis_m4/variant.h
@@ -30,9 +30,9 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (120000000ul)
+#define VARIANT_MCK        (F_CPU)
 
-#define VARIANT_GCLK0_FREQ (120000000UL)
+#define VARIANT_GCLK0_FREQ (F_CPU)
 #define VARIANT_GCLK1_FREQ (48000000UL)
 #define VARIANT_GCLK2_FREQ (100000000UL)
 
diff --git a/variants/trinket_m0/variant.h b/variants/trinket_m0/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
diff --git a/variants/zero_radio/variant.h b/variants/zero_radio/variant.h
@@ -30,7 +30,7 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK	(F_CPU)
 
 /*----------------------------------------------------------------------------
  *        Headers
