djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add build option for UF2 flash offset

Browse Source
This commit is contained in:
Lucian Copeland 2020-01-31 13:12:58 -05:00
parent d8016bd52b
commit b4dcecb266
7 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ports/stm32f4/Makefile
View File

@ -26,11 +26,11 @@
# Select the board to build for. # Select the board to build for.
ifeq ($(BOARD),) ifeq ($(BOARD),)
$(error You must provide a BOARD parameter) $(error You must provide a BOARD parameter)
else else
ifeq ($(wildcard boards/$(BOARD)/.),) ifeq ($(wildcard boards/$(BOARD)/.),)
$(error Invalid BOARD specified) $(error Invalid BOARD specified)
endif endif
endif endif
# If the build directory is not given, make it reflect the board name. # If the build directory is not given, make it reflect the board name.
@ -80,19 +80,16 @@ INC += -I../../supervisor/shared/usb
#Debugging/Optimization #Debugging/Optimization
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -ggdb CFLAGS += -ggdb
# You may want to enable these flags to make setting breakpoints easier. # You may want to enable these flags to make setting breakpoints easier.
CFLAGS += -fno-inline -fno-ipa-sra CFLAGS += -fno-inline -fno-ipa-sra
else else
CFLAGS += -Os -DNDEBUG CFLAGS += -Os -DNDEBUG
CFLAGS += -ggdb CFLAGS += -ggdb
# TODO: Test with -flto # TODO: Test with -flto
### CFLAGS += -flto ### CFLAGS += -flto
endif endif
ifndef BOOTLOADER_OFFSET
BOOTLOADER_OFFSET := 0x8000000
endif
C_DEFS = -DMCU_PACKAGE=$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(CMSIS_MCU) C_DEFS = -DMCU_PACKAGE=$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(CMSIS_MCU)
@ -115,6 +112,22 @@ CFLAGS += \
# TODO: check this # TODO: check this
CFLAGS += -D__START=main CFLAGS += -D__START=main
#need both command and valid file to use uf2 bootloader
ifndef LD_FILE
ifneq ($(and $(UF2_BOOTLOADER),$(LD_BOOT)),)
LD_FILE = $(LD_BOOT)
BOOTLOADER_OFFSET = $(UF2_OFFSET)
CFLAGS += -DUF2_BOOTLOADER_ENABLED
else
LD_FILE = $(LD_FS)
endif
endif
# Add bootloader specific items
ifndef BOOTLOADER_OFFSET
BOOTLOADER_OFFSET := 0x8000000
endif
LDFLAGS = $(CFLAGS) -fshort-enums -Wl,-nostdlib -Wl,-T,$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs LDFLAGS = $(CFLAGS) -fshort-enums -Wl,-nostdlib -Wl,-T,$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
LIBS := -lgcc -lc LIBS := -lgcc -lc
@ -210,12 +223,12 @@ SRC_S = \
boards/startup_$(MCU_SUB_VARIANT).s boards/startup_$(MCU_SUB_VARIANT).s
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \ SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \ $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
$(addprefix common-hal/, $(SRC_COMMON_HAL)) $(addprefix common-hal/, $(SRC_COMMON_HAL))
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
$(addprefix shared-module/, $(SRC_SHARED_MODULE)) \ $(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
$(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL)) $(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
ifneq ($(FROZEN_MPY_DIR),) ifneq ($(FROZEN_MPY_DIR),)

4
ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
View File

@ -41,7 +41,9 @@
#define SPI_FLASH_CS_PIN (&pin_PA15) #define SPI_FLASH_CS_PIN (&pin_PA15)
// Bootloader only // Bootloader only
#define BOARD_VTOR_DEFER //Leave VTOR relocation to bootloader #ifdef UF2_BOOTLOADER_ENABLED
#define BOARD_VTOR_DEFER //Leave VTOR relocation to bootloader
#endif
#define DEFAULT_I2C_BUS_SCL (&pin_PB06) #define DEFAULT_I2C_BUS_SCL (&pin_PB06)
#define DEFAULT_I2C_BUS_SDA (&pin_PB07) #define DEFAULT_I2C_BUS_SDA (&pin_PB07)

8
ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk
View File

@ -9,12 +9,12 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = GD25Q16C
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
BOOTLOADER_OFFSET = 0x8010000
MCU_SERIES = m4 MCU_SERIES = m4
MCU_VARIANT = stm32f4 MCU_VARIANT = stm32f4
MCU_SUB_VARIANT = stm32f405xx MCU_SUB_VARIANT = stm32f405xx
MCU_PACKAGE = 64 MCU_PACKAGE = 64
CMSIS_MCU = STM32F405xx CMSIS_MCU = STM32F405xx
LD_FILE = boards/STM32F405_boot.ld # use for bootloader (external fs only)
# LD_FILE = boards/STM32F405_fs.ld # use for internal filesystem LD_FS = boards/STM32F405_fs.ld # Default to internal FS
LD_BOOT = boards/STM32F405_boot.ld # UF2 boot option
UF2_OFFSET = 0x8010000

3
ports/stm32f4/boards/pyboard_v11/mpconfigboard.mk
View File

@ -13,5 +13,4 @@ MCU_SUB_VARIANT = stm32f405xx
MCU_PACKAGE = 64 MCU_PACKAGE = 64
CMSIS_MCU = STM32F405xx CMSIS_MCU = STM32F405xx
LD_FILE = boards/STM32F405.ld LD_FILE = boards/STM32F405.ld
TEXT0_ADDR = 0x08000000
TEXT1_ADDR = 0x08010000

3
ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.mk
View File

@ -18,5 +18,4 @@ MCU_SUB_VARIANT = stm32f411xe
MCU_PACKAGE = 48 MCU_PACKAGE = 48
CMSIS_MCU = STM32F411xE CMSIS_MCU = STM32F411xE
LD_FILE = boards/STM32F411VETx_FLASH.ld LD_FILE = boards/STM32F411VETx_FLASH.ld
TEXT0_ADDR = 0x08000000
TEXT1_ADDR = 0x08020000

2
ports/stm32f4/boards/stm32f411ve_discovery/mpconfigboard.mk
View File

@ -13,5 +13,3 @@ MCU_SUB_VARIANT = stm32f411xe
MCU_PACKAGE = 100 MCU_PACKAGE = 100
CMSIS_MCU = STM32F411xE CMSIS_MCU = STM32F411xE
LD_FILE = boards/STM32F411VETx_FLASH.ld LD_FILE = boards/STM32F411VETx_FLASH.ld
TEXT0_ADDR = 0x08000000
TEXT1_ADDR = 0x08020000

3
ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.mk
View File

@ -18,6 +18,5 @@ MCU_SUB_VARIANT = stm32f412zx
MCU_PACKAGE = 144 MCU_PACKAGE = 144
CMSIS_MCU = STM32F412Zx CMSIS_MCU = STM32F412Zx
LD_FILE = boards/STM32F412ZGTx_FLASH.ld LD_FILE = boards/STM32F412ZGTx_FLASH.ld
TEXT0_ADDR = 0x08000000
TEXT1_ADDR = 0x08020000