Skip to content

Commit be280ec

Browse files
authored
Merge branch 'master' into autoconf_sketch_start_banzai_mainline
2 parents ce5405f + 68d4a93 commit be280ec

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ SECTIONS
168168
PROVIDE_HIDDEN (__fini_array_end = .);
169169

170170
KEEP(*(.jcr*))
171-
. = ALIGN(4);
171+
. = ALIGN(16);
172172
/* All data end */
173173
__data_end__ = .;
174174

variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ SECTIONS
169169
PROVIDE_HIDDEN (__fini_array_end = .);
170170

171171
KEEP(*(.jcr*))
172-
. = ALIGN(4);
172+
. = ALIGN(16);
173173
/* All data end */
174174
__data_end__ = .;
175175

variants/mkr1000/linker_scripts/gcc/flash_with_bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ SECTIONS
168168
PROVIDE_HIDDEN (__fini_array_end = .);
169169

170170
KEEP(*(.jcr*))
171-
. = ALIGN(4);
171+
. = ALIGN(16);
172172
/* All data end */
173173
__data_end__ = .;
174174

variants/mkr1000/linker_scripts/gcc/flash_without_bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ SECTIONS
169169
PROVIDE_HIDDEN (__fini_array_end = .);
170170

171171
KEEP(*(.jcr*))
172-
. = ALIGN(4);
172+
. = ALIGN(16);
173173
/* All data end */
174174
__data_end__ = .;
175175

variants/mkrzero/linker_scripts/gcc/flash_with_bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ SECTIONS
168168
PROVIDE_HIDDEN (__fini_array_end = .);
169169

170170
KEEP(*(.jcr*))
171-
. = ALIGN(4);
171+
. = ALIGN(16);
172172
/* All data end */
173173
__data_end__ = .;
174174

variants/mkrzero/linker_scripts/gcc/flash_without_bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ SECTIONS
169169
PROVIDE_HIDDEN (__fini_array_end = .);
170170

171171
KEEP(*(.jcr*))
172-
. = ALIGN(4);
172+
. = ALIGN(16);
173173
/* All data end */
174174
__data_end__ = .;
175175

variants/mkrzero/variant.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ const PinDescription g_APinDescription[] = {
153153

154154
{ PORTA, 28, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
155155
{ PORTB, 8, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
156-
{ PORTB, 9, PIO_ANALOG, (PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel3, PWM4_CH1, TC4_CH1, EXTERNAL_INT_9 },
156+
{ PORTB, 9, PIO_ANALOG, (PIN_ATTR_PWM|PIN_ATTR_TIMER ), ADC_Channel3, PWM4_CH1, TC4_CH1, EXTERNAL_INT_9 },
157157

158158
{ PORTA, 0, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
159159
{ PORTA, 1, PIO_DIGITAL, (PIN_ATTR_NONE ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },

variants/mkrzero/variant.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#define portInputRegister(port) (&(port->IN.reg))
5151
#define portModeRegister(port) (&(port->DIR.reg))
5252
#define digitalPinHasPWM(P) (g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER)
53-
#define digitalPinToInterrupt(P) (g_APinDescription[P].ulExtInt)
5453

5554
/*
5655
* digitalPinToTimer(..) is AVR-specific and is not defined for SAMD

0 commit comments

Comments
 (0)