bootloader: use correct SERCOMx_GCLK definition from CMSIS

cmaglie · sandeepmistry · commit e8a08304fc5b · 2016-12-07T09:19:46.000-05:00
diff --git a/bootloaders/zero/board_definitions_arduino_mkr1000.h b/bootloaders/zero/board_definitions_arduino_mkr1000.h
@@ -47,7 +47,7 @@
 
 #define BOOT_USART_MODULE                 SERCOM0
 #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
-#define BOOT_USART_PER_CLOCK_INDEX        GCLK_ID_SERCOM0_CORE
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
 #define BOOT_USART_PAD2                   PINMUX_PA10C_SERCOM0_PAD2
diff --git a/bootloaders/zero/board_definitions_arduino_zero.h b/bootloaders/zero/board_definitions_arduino_zero.h
@@ -47,7 +47,7 @@
 
 #define BOOT_USART_MODULE                 SERCOM0
 #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
-#define BOOT_USART_PER_CLOCK_INDEX        GCLK_ID_SERCOM0_CORE
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
 #define BOOT_USART_PAD2                   PINMUX_PA10C_SERCOM0_PAD2
diff --git a/bootloaders/zero/board_definitions_genuino_mkr1000.h b/bootloaders/zero/board_definitions_genuino_mkr1000.h
@@ -47,7 +47,7 @@
 
 #define BOOT_USART_MODULE                 SERCOM0
 #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
-#define BOOT_USART_PER_CLOCK_INDEX        GCLK_ID_SERCOM0_CORE
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
 #define BOOT_USART_PAD2                   PINMUX_PA10C_SERCOM0_PAD2
diff --git a/bootloaders/zero/board_definitions_genuino_zero.h b/bootloaders/zero/board_definitions_genuino_zero.h
@@ -47,7 +47,7 @@
 
 #define BOOT_USART_MODULE                 SERCOM0
 #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
-#define BOOT_USART_PER_CLOCK_INDEX        GCLK_ID_SERCOM0_CORE
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
 #define BOOT_USART_PAD2                   PINMUX_PA10C_SERCOM0_PAD2
diff --git a/bootloaders/zero/board_driver_serial.h b/bootloaders/zero/board_driver_serial.h
@@ -25,7 +25,6 @@
 #include <sam.h>
 
 #define PINMUX_UNUSED          0xFFFFFFFF
-#define GCLK_ID_SERCOM0_CORE   0x14
 
 /* SERCOM UART available pad settings */
 enum uart_pad_settings {
