boards.txt fixes

Author: Spegs21

boards.txt

@@ -40,7 +40,8 @@ arduino_zero_edbg.build.usb_product="Arduino Zero"
 arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
 arduino_zero_edbg.build.board=SAMD_ZERO
 arduino_zero_edbg.build.core=arduino
-arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ -DUSBCON {build.usb_flags}
+arduino_zero_edbg.build.flags.usbstack=-DUSBCON
+arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
 arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
 arduino_zero_edbg.build.variant=arduino_zero
@@ -101,7 +102,7 @@ arduino_zero_native.bootloader.file=zero/samd21_sam_ba.bin
 arduino_zero_native.menu.usbstack.enabled=Enabled
 arduino_zero_native.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 arduino_zero_native.menu.usbstack.disabled=Disabled
-arduino_zero_native.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+arduino_zero_native.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR1000
 # -----------------------
@@ -152,7 +153,7 @@ mkr1000.bootloader.file=mkr1000/samd21_sam_ba_arduino_mkr1000.bin
 mkr1000.menu.usbstack.enabled=Enabled
 mkr1000.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkr1000.menu.usbstack.disabled=Disabled
-mkr1000.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkr1000.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKRZero
 # ---------------
@@ -195,7 +196,7 @@ mkrzero.bootloader.file=mkrzero/samd21_sam_ba_arduino_mkrzero.bin
 mkrzero.menu.usbstack.enabled=Enabled
 mkrzero.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrzero.menu.usbstack.disabled=Disabled
-mkrzero.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrzero.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR WiFi 1010
 # --------------------
@@ -236,10 +237,10 @@ mkrwifi1010.bootloader.tool.default=openocd
 mkrwifi1010.bootloader.file=mkrwifi1010/samd21_sam_ba_arduino_mkrwifi1010.bin
 #mkrwifi1010.arduinoota.extraflags=-d
 
-mkrzero.menu.usbstack.enabled=Enabled
-mkrzero.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
-mkrzero.menu.usbstack.disabled=Disabled
-mkrzero.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrwifi1010.menu.usbstack.enabled=Enabled
+mkrwifi1010.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
+mkrwifi1010.menu.usbstack.disabled=Disabled
+mkrwifi1010.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino NANO 33 IoT
 # --------------------
@@ -282,7 +283,7 @@ nano_33_iot.bootloader.file=nano_33_iot/samd21_sam_ba_arduino_nano_33_iot.bin
 nano_33_iot.menu.usbstack.enabled=Enabled
 nano_33_iot.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 nano_33_iot.menu.usbstack.disabled=Disabled
-nano_33_iot.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+nano_33_iot.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR FOX 1200
 # --------------------
@@ -325,7 +326,7 @@ mkrfox1200.bootloader.file=mkrfox1200/samd21_sam_ba_arduino_mkrfox1200.bin
 mkrfox1200.menu.usbstack.enabled=Enabled
 mkrfox1200.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrfox1200.menu.usbstack.disabled=Disabled
-mkrfox1200.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrfox1200.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR WAN 1300
 # --------------------
@@ -368,7 +369,7 @@ mkrwan1300.bootloader.file=mkrwan1300/samd21_sam_ba_arduino_mkrwan1300.bin
 mkrwan1300.menu.usbstack.enabled=Enabled
 mkrwan1300.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrwan1300.menu.usbstack.disabled=Disabled
-mkrwan1300.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrwan1300.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR WAN 1310
 # --------------------
@@ -411,7 +412,7 @@ mkrwan1310.bootloader.file=mkrwan1300/samd21_sam_ba_arduino_mkrwan1310.bin
 mkrwan1310.menu.usbstack.enabled=Enabled
 mkrwan1310.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrwan1310.menu.usbstack.disabled=Disabled
-mkrwan1310.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrwan1310.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR GSM 1400
 # --------------------
@@ -454,7 +455,7 @@ mkrgsm1400.bootloader.file=mkrgsm1400/samd21_sam_ba_arduino_mkrgsm1400.bin
 mkrgsm1400.menu.usbstack.enabled=Enabled
 mkrgsm1400.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrgsm1400.menu.usbstack.disabled=Disabled
-mkrgsm1400.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrgsm1400.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR NB 1500
 # --------------------
@@ -497,7 +498,7 @@ mkrnb1500.bootloader.file=mkrnb1500/samd21_sam_ba_arduino_mkrnb1500.bin
 mkrnb1500.menu.usbstack.enabled=Enabled
 mkrnb1500.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrnb1500.menu.usbstack.disabled=Disabled
-mkrnb1500.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrnb1500.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino MKR Vidor 4000
 # --------------------
@@ -540,7 +541,7 @@ mkrvidor4000.bootloader.file=mkrvidor4000/samd21_sam_ba_arduino_mkrvidor4000.bin
 mkrvidor4000.menu.usbstack.enabled=Enabled
 mkrvidor4000.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mkrvidor4000.menu.usbstack.disabled=Disabled
-mkrvidor4000.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mkrvidor4000.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Adafruit Circuit Playground M0
 # ------------------------------
@@ -583,7 +584,7 @@ adafruit_circuitplayground_m0.bootloader.file=circuitplay/circuitplay_m0_samd21g
 adafruit_circuitplayground_m0.menu.usbstack.enabled=Enabled
 adafruit_circuitplayground_m0.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 adafruit_circuitplayground_m0.menu.usbstack.disabled=Disabled
-adafruit_circuitplayground_m0.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+adafruit_circuitplayground_m0.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino M0 PRO (with) bootloader - Programming port
 # ---------------------------------------------------
@@ -605,7 +606,8 @@ mzero_pro_bl_dbg.build.f_cpu=48000000L
 mzero_pro_bl_dbg.build.usb_product="Arduino M0 Pro"
 mzero_pro_bl_dbg.build.board=SAM_ZERO
 mzero_pro_bl_dbg.build.core=arduino
-mzero_pro_bl_dbg.build.extra_flags=-D__SAMD21G18A__ -mthumb -DUSBCON {build.usb_flags}
+mzero_pro_bl_dbg.build.flags.usbstack=-DUSBCON
+mzero_pro_bl_dbg.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
 mzero_pro_bl_dbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 mzero_pro_bl_dbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
 mzero_pro_bl_dbg.build.variant=arduino_mzero
@@ -675,7 +677,7 @@ mzero_pro_bl.bootloader.low_fuses=0xff
 mzero_pro_bl.menu.usbstack.enabled=Enabled
 mzero_pro_bl.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mzero_pro_bl.menu.usbstack.disabled=Disabled
-mzero_pro_bl.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mzero_pro_bl.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino M0 (with) Bootloader
 # ----------------------------
@@ -730,7 +732,7 @@ mzero_bl.bootloader.file=mzero/Bootloader_D21_M0_150515.hex
 mzero_bl.menu.usbstack.enabled=Enabled
 mzero_bl.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 mzero_bl.menu.usbstack.disabled=Disabled
-mzero_bl.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+mzero_bl.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino Tian (with) Bootloader
 # ------------------------------
@@ -778,7 +780,7 @@ tian.drivers=SiliconLabs-CP2105/Silicon Labs VCP Driver.pkg
 tian.menu.usbstack.enabled=Enabled
 tian.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
 tian.menu.usbstack.disabled=Disabled
-tian.menu.usbstack.disabled.build.flags.usbstack=-CDC_DISABLED
+tian.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED
 
 # Arduino Tian Console port (not for upload)
 # ------------------------------------------