kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

boards: use boards.h to indicated UF2 bootloader usage

Browse Source 
Using `CFLAGS += -DBOOTLOADER_UF2` poisens the ccache. Using the
`board.h` only adds entropy to the files actually including that header.

The single user of that flag has been updated accordingly.

Co-authored-by: crasbe <crasbe@gmail.com>
This commit is contained in:
Marian Buschsieweke 2025-12-15 17:35:51 +01:00
parent 70160a8e58
commit bee4d7e291
No known key found for this signature in database
GPG Key ID: 758BD52517F79C41
15 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/adafruit-grand-central-m4-express/Makefile.include
View File

@ -1,5 +1,3 @@
CFLAGS += -DBOOTLOADER_UF2
PROG_TTY_BOARD_FILTER := --vendor 'Adafruit Industries' --model 'Grand Central M4 Express'
# Include all definitions for flashing with bossa other USB

2
boards/adafruit-grand-central-m4-express/include/board.h
View File

@ -85,6 +85,8 @@ extern "C" {
#endif
/** @} */
#define BOOTLOADER_UF2 1 /**< This board uses the UF2 bootloader */
#ifdef __cplusplus
}
#endif

2
boards/adafruit-itsybitsy-m4/Makefile.include
View File

@ -1,5 +1,3 @@
CFLAGS += -DBOOTLOADER_UF2
# Include all definitions for flashing with bossa other USB
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include
# Include handling of serial and non-bossa programmers (if selected by user)

2
boards/adafruit-itsybitsy-m4/include/board.h
View File

@ -60,6 +60,8 @@ extern "C" {
#define XTIMER_HZ (1000000ul)
/** @} */
#define BOOTLOADER_UF2 1 /**< This board uses the UF2 bootloader */
#ifdef __cplusplus
}
#endif

2
boards/adafruit-metro-m4-express/Makefile.include
View File

@ -1,5 +1,3 @@
CFLAGS += -DBOOTLOADER_UF2
PROG_TTY_BOARD_FILTER := --vendor 'Adafruit Industries' --model 'Metro M4 Express'
# Include all definitions for flashing with bossa other USB

2
boards/adafruit-metro-m4-express/include/board.h
View File

@ -66,6 +66,8 @@ extern "C" {
#define MTD_0 mtd_dev_get(0) /**< MTD device for the 8 MiB QSPI Flash */
/** @} */
#define BOOTLOADER_UF2 1 /**< This board uses the UF2 bootloader */
#ifdef __cplusplus
}
#endif

2
boards/adafruit-pybadge/Makefile.include
View File

@ -1,5 +1,3 @@
CFLAGS += -DBOOTLOADER_UF2
# stdio over usb takes several seconds to be up after flashing
TERM_DELAY ?= 4

2
boards/adafruit-pybadge/include/board.h
View File

@ -107,6 +107,8 @@ extern "C" {
#define XTIMER_HZ (1000000ul) /**< Default timer runs at 1MHz */
/** @} */
#define BOOTLOADER_UF2 1 /**< This board uses the UF2 bootloader */
#ifdef __cplusplus
}
#endif

15
boards/common/samdx1-arduino-bootloader/reset.c
View File

@ -20,21 +20,22 @@
#define USB_H_USER_IS_RIOT_INTERNAL
#include "board.h"
#include "cpu.h"
#include "usb_board_reset.h"
#ifdef HMCRAMC0_ADDR
#define DBL_TAP_PTR ((volatile uint32_t *)(HMCRAMC0_ADDR + HMCRAMC0_SIZE - 4))
# define DBL_TAP_PTR ((volatile uint32_t *)(HMCRAMC0_ADDR + HMCRAMC0_SIZE - 4))
#else
#define DBL_TAP_PTR ((volatile uint32_t *)(HSRAM_ADDR + HSRAM_SIZE - 4))
# define DBL_TAP_PTR ((volatile uint32_t *)(HSRAM_ADDR + HSRAM_SIZE - 4))
#endif
#ifdef BOOTLOADER_UF2
#define SAMD21_DOUBLE_TAP_ADDR DBL_TAP_PTR
#define SAMD21_DOUBLE_TAP_MAGIC_NUMBER (0xF01669EFUL)
#if BOOTLOADER_UF2
# define SAMD21_DOUBLE_TAP_ADDR DBL_TAP_PTR
# define SAMD21_DOUBLE_TAP_MAGIC_NUMBER (0xF01669EFUL)
#else
#define SAMD21_DOUBLE_TAP_ADDR (0x20007FFCUL)
#define SAMD21_DOUBLE_TAP_MAGIC_NUMBER (0x07738135UL)
# define SAMD21_DOUBLE_TAP_ADDR (0x20007FFCUL)
# define SAMD21_DOUBLE_TAP_MAGIC_NUMBER (0x07738135UL)
#endif
void usb_board_reset_in_bootloader(void)

5
boards/feather-m0/Makefile.include
View File

@ -1,8 +1,3 @@
# Boards after around 2018 use the more modern UF2 bootloader.
# Comment out for the old BOSSA bootloader or upgrade to
# the UF2 bootloader.
CFLAGS += -DBOOTLOADER_UF2
# setup the flash tool used
ifeq ($(PROGRAMMER),jlink)
# in case J-Link is attached to SWD pins, use a plain CPU memory model

9
boards/feather-m0/include/board.h
View File

@ -67,6 +67,15 @@ extern "C" {
#define SX127X_PARAM_PASELECT (SX127X_PA_BOOST)
/** @} */
/**
* @brief This board uses the UF2 bootloader
*
* @details Boards after around 2018 use the more modern UF2 bootloader.
* Comment out for the old BOSSA bootloader or upgrade to
* the UF2 bootloader.
*/
#define BOOTLOADER_UF2 1
#ifdef __cplusplus
}
#endif

2
boards/seeeduino_xiao/Makefile.include
View File

@ -1,5 +1,3 @@
CFLAGS += -DBOOTLOADER_UF2
# Include all definitions for flashing with bossa other USB
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include
# Include handling of serial and non-bossa programmers (if selected by user)

2
boards/seeeduino_xiao/include/board.h
View File

@ -65,6 +65,8 @@ extern "C" {
#define INTERNAL_PERIPHERAL_PID (0x0057)
/** @} */
#define BOOTLOADER_UF2 1 /**< This board uses the UF2 bootloader */
#ifdef __cplusplus
}
#endif

2
boards/serpente/Makefile.include
View File

@ -1,5 +1,3 @@
CFLAGS += -DBOOTLOADER_UF2
# Include all definitions for flashing with bossa other USB
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.include
# Include handling of serial and non-bossa programmers (if selected by user)

2
boards/serpente/include/board.h
View File

@ -85,6 +85,8 @@ extern "C" {
#define INTERNAL_PERIPHERAL_PID (0x0057)
/** @} */
#define BOOTLOADER_UF2 1 /**< This board uses the UF2 bootloader */
#ifdef __cplusplus
}
#endif