-
Notifications
You must be signed in to change notification settings - Fork 178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
In Review: Support WeAct mini stm32h7 #144
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule cmsis_device_h7
added at
834d18
Submodule stm32h7xx_hal_driver
added at
3ba4eb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# List of git submodules that is included as part of the UF2 version | ||
GIT_SUBMODULES = st/cmsis_device_h7 st/stm32h7xx_hal_driver tinyusb uf2 | ||
|
||
include ../make.mk | ||
include port.mk | ||
|
||
LD_FILES ?= \ | ||
$(PORT_DIR)/linker/memory.ld \ | ||
$(PORT_DIR)/linker/common.ld \ | ||
$(PORT_DIR)/linker/$(MCU).ld | ||
|
||
SRC_C += \ | ||
$(TOP)/$(PORT_DIR)/boards.c \ | ||
$(TOP)/$(PORT_DIR)/board_flash.c \ | ||
$(TOP)/$(PORT_DIR)/board_hmi.c \ | ||
$(TOP)/$(PORT_DIR)/board_irq.c | ||
|
||
include ../rules.mk | ||
|
||
#---------- Self udpate ---------- | ||
# Compile apps/self_update/self_update.c | ||
# This uf2 will be loaded into RAM | ||
# TODO: this needs to build the actual uf2 binary first | ||
self-update: $(BUILD)/$(OUTNAME).bin | ||
$(PYTHON3) $(TOP)/lib/uf2/utils/uf2conv.py --carray $^ -o apps/self_update/_build/bootloader_bin.c | ||
$(MAKE) -C $(TOP)/$(PORT_DIR)/apps/self_update uf2 | ||
|
||
self-update-clean: | ||
$(MAKE) -C $(TOP)/$(PORT_DIR)/apps/self_update clean | ||
|
||
#---------- Erase app ---------- | ||
# Compile apps/erase_firmware/erase_firmware.c | ||
# This uf2 will be loaded into RAM | ||
erase-app: | ||
$(MAKE) -C $(TOP)/$(PORT_DIR)/apps/erase_firmware uf2 | ||
|
||
erase-app-clean: | ||
$(MAKE) -C $(TOP)/$(PORT_DIR)/apps/erase_firmware clean | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# TinyUF2 for STM32H7 | ||
|
||
TinyUF2 reserves 64KB like the F4 port to be compatible with existing application. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
PORT = stm32h7 | ||
|
||
# skip bootloader source for apps | ||
BUILD_APPLICATION = 1 | ||
|
||
include ../../../make.mk | ||
include $(TOP)/$(PORT_DIR)/port.mk | ||
|
||
LD_FILES ?= \ | ||
$(PORT_DIR)/linker/memory.ld \ | ||
$(PORT_DIR)/linker/common.ld \ | ||
$(PORT_DIR)/linker/$(MCU).ld | ||
|
||
CFLAGS += \ | ||
-DVECT_TAB_SRAM \ | ||
-Wl,--defsym=RAMCODE=0 | ||
|
||
include $(TOP)/ports/rules.mk | ||
|
||
# Load app into AXISRAM to run | ||
APPLICATION_ADDR = 0x24000000 | ||
|
||
# Self-update uf2 file | ||
uf2: $(BUILD)/$(OUTNAME).uf2 | ||
|
||
$(BUILD)/$(OUTNAME).uf2: $(BUILD)/$(OUTNAME)-ram.bin | ||
@echo CREATE $@ | ||
$(PYTHON3) $(TOP)/lib/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID) -b $(APPLICATION_ADDR) -c -o $@ $< | ||
|
||
$(BUILD)/$(OUTNAME)-ram.bin: $(BUILD)/$(OUTNAME).elf | ||
@echo CREATE $@ | ||
@$(OBJCOPY) -O binary $^ $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
OUTNAME = erase_firmware-$(BOARD) | ||
|
||
# skip tinyusb | ||
BUILD_NO_TINYUSB = 1 | ||
|
||
SRC_C += \ | ||
apps/erase_firmware/erase_firmware.c \ | ||
$(TOP)/$(PORT_DIR)/boards.c \ | ||
$(TOP)/$(PORT_DIR)/board_flash.c \ | ||
$(TOP)/$(PORT_DIR)/board_irq.c \ | ||
$(TOP)/$(PORT_DIR)/components/w25qxx/w25qxx.c \ | ||
$(TOP)/$(PORT_DIR)/components/w25qxx/w25qxx_qspi.c \ | ||
|
||
INC += \ | ||
$(TOP)/src \ | ||
|
||
include ../app.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
OUTNAME = self_update-$(BOARD) | ||
|
||
# skip tinyusb | ||
BUILD_NO_TINYUSB = 1 | ||
|
||
CFLAGS += -DTINYUF2_SELF_UPDATE | ||
|
||
SRC_C += \ | ||
apps/self_update/self_update.c \ | ||
$(TOP)/$(PORT_DIR)/apps/self_update/_build/bootloader_bin.c \ | ||
$(TOP)/$(PORT_DIR)/boards.c \ | ||
$(TOP)/$(PORT_DIR)/board_hmi.c \ | ||
$(TOP)/$(PORT_DIR)/board_irq.c \ | ||
|
||
INC += \ | ||
$(TOP)/src \ | ||
|
||
include ../app.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,228 @@ | ||
#include "board_api.h" | ||
#include "stm32h7xx_hal.h" | ||
|
||
#ifdef W25Qx_SPI | ||
#include "components/w25qxx/w25qxx.h" | ||
#endif // W25Qx_SPI | ||
|
||
#ifdef W25Qx_QSPI | ||
#include "components/w25qxx/w25qxx_qspi.h" | ||
#endif // W25Qx_QSPI | ||
|
||
#if BOARD_QSPI_FLASH_EN | ||
QSPI_HandleTypeDef _qspi_flash; | ||
#endif // BOARD_QSPI_FLASH_EN | ||
|
||
#if BOARD_SPI_FLASH_EN | ||
SPI_HandleTypeDef _spi_flash; | ||
#endif // BOARD_SPI_FLASH_EN | ||
|
||
//--------------------------------------------------------------------+ | ||
// Board Memory Callouts | ||
//--------------------------------------------------------------------+ | ||
#ifdef W25Qx_SPI | ||
uint32_t W25Qx_SPI_Transmit(uint8_t * buffer, uint16_t len, uint32_t timeout) | ||
{ | ||
return (uint32_t) HAL_SPI_Transmit(&_spi_flash, buffer, len, timeout); | ||
} | ||
|
||
uint32_t W25Qx_SPI_Receive(uint8_t * buffer, uint16_t len, uint32_t timeout) | ||
{ | ||
return (uint32_t) HAL_SPI_Receive(&_spi_flash, buffer, len, timeout); | ||
} | ||
|
||
void W25Qx_Delay(uint32_t ms) | ||
{ | ||
HAL_Delay(ms); | ||
} | ||
|
||
uint32_t W25Qx_GetTick(void) | ||
{ | ||
return HAL_GetTick(); | ||
} | ||
#endif // W25Qx_SPI | ||
|
||
//--------------------------------------------------------------------+ | ||
// Flash LL for tinyuf2 | ||
//--------------------------------------------------------------------+ | ||
|
||
|
||
extern volatile uint32_t _board_tmp_boot_addr[]; | ||
extern volatile uint32_t _board_tmp_boot_magic[]; | ||
|
||
#define TMP_BOOT_ADDR _board_tmp_boot_addr[0] | ||
#define TMP_BOOT_MAGIC _board_tmp_boot_magic[0] | ||
|
||
uint32_t board_get_app_start_address(void) | ||
{ | ||
if (TMP_BOOT_MAGIC == 0xDEADBEEFU) | ||
{ | ||
return TMP_BOOT_ADDR; | ||
} | ||
else | ||
{ | ||
return BOARD_QSPI_APP_ADDR; | ||
} | ||
} | ||
|
||
void board_save_app_start_address(uint32_t addr) | ||
{ | ||
TMP_BOOT_MAGIC = 0xDEADBEEFU; | ||
TMP_BOOT_ADDR = addr; | ||
} | ||
|
||
void board_clear_temp_boot_addr(void) | ||
{ | ||
TMP_BOOT_MAGIC = 0x00U; | ||
TMP_BOOT_ADDR = 0x00U; | ||
} | ||
|
||
void board_flash_early_init(void) | ||
{ | ||
#if BOARD_QSPI_FLASH_EN | ||
// QSPI is initialized early to check for executable code | ||
qspi_flash_init(&_qspi_flash); | ||
// Initialize QSPI driver | ||
w25qxx_Init(); | ||
// SPI -> QPI | ||
w25qxx_EnterQPI(); | ||
#endif // BOARD_QSPI_FLASH_EN | ||
} | ||
|
||
void board_flash_init(void) | ||
{ | ||
#if BOARD_SPI_FLASH_EN | ||
// Initialize SPI peripheral | ||
spi_flash_init(&_spi_flash); | ||
// Initialize SPI drivers | ||
W25Qx_Init(); | ||
#endif // BOARD_SPI_FLASH_EN | ||
} | ||
|
||
void board_flash_deinit(void) | ||
{ | ||
#if BOARD_QSPI_FLASH_EN | ||
// Enable Memory Mapped Mode | ||
// QSPI flash will be available at 0x90000000U (readonly) | ||
w25qxx_Startup(w25qxx_DTRMode); | ||
#endif // BOARD_QSPI_FLASH_EN | ||
} | ||
|
||
uint32_t board_flash_size(void) | ||
{ | ||
// TODO: how do we handle more than 1 target here? | ||
return 8*1024*1024; | ||
} | ||
|
||
void board_flash_flush(void) | ||
{ | ||
// TODO: do we need to implement this if there no caching involved? | ||
// maybe flush cached RAM here? | ||
} | ||
|
||
void board_flash_read(uint32_t addr, void * data, uint32_t len) | ||
{ | ||
TUF2_LOG1("Reading %lu byte(s) from 0x%08lx\r\n", len, addr); | ||
#if BOARD_QSPI_FLASH_EN | ||
// addr += QSPI_BASE_ADDR; | ||
if (IS_QSPI_ADDR(addr)) | ||
{ | ||
(void) W25qxx_Read(data, addr - QSPI_BASE_ADDR, len); | ||
return; | ||
} | ||
#endif | ||
|
||
#if BOARD_AXISRAM_EN | ||
if (IS_AXISRAM_ADDR(addr) && IS_AXISRAM_ADDR(addr + len - 1)) | ||
{ | ||
memcpy(data, (void *) addr, len); | ||
return; | ||
} | ||
#endif // BOARD_AXISRAM_EN | ||
|
||
if (IS_PFLASH_ADDR(addr)) | ||
{ | ||
memcpy(data, (void *) addr, len); | ||
return; | ||
} | ||
|
||
{ | ||
// Invalid address read | ||
__asm("bkpt #3"); | ||
} | ||
} | ||
|
||
void board_flash_write(uint32_t addr, void const * data, uint32_t len) | ||
{ | ||
TUF2_LOG1("Programming %lu byte(s) at 0x%08lx\r\n", len, addr); | ||
// For external flash, W25Qx | ||
// TODO: these should be configurable parameters | ||
// Page size = 256 bytes | ||
// Sector size = 4K bytes | ||
#if (BOARD_SPI_FLASH_EN == 1U) | ||
if (IS_SPI_ADDR(addr) && IS_SPI_ADDR(addr + len - 1)) | ||
{ | ||
W25Qx_Write((uint8_t *) data, (addr - SPI_BASE_ADDR), len); | ||
return; | ||
} | ||
#endif | ||
|
||
#if (BOARD_QSPI_FLASH_EN == 1) | ||
if (IS_QSPI_ADDR(addr) && IS_QSPI_ADDR(addr + len - 1)) | ||
{ | ||
// SET_BOOT_ADDR(BOARD_AXISRAM_APP_ADDR); | ||
// handles erasing internally | ||
if (W25qxx_Write((uint8_t *)data, (addr - QSPI_BASE_ADDR), len) != w25qxx_OK) | ||
{ | ||
__asm("bkpt #9"); | ||
} | ||
return; | ||
} | ||
#endif | ||
|
||
#if BOARD_AXISRAM_EN | ||
if (IS_AXISRAM_ADDR(addr) && IS_AXISRAM_ADDR(addr + len - 1)) | ||
{ | ||
// This memory is cached, DCache is cleaned in dfu_complete | ||
SET_BOOT_ADDR(BOARD_AXISRAM_APP_ADDR); | ||
memcpy((void *) addr, data, len); | ||
return; | ||
} | ||
#endif // BOARD_AXISRAM_EN | ||
|
||
// This is not a good idea for the h750 port because | ||
// - There is only one flash bank available | ||
// - There is only one sector available | ||
// - It will also need a config section in flash to store the boot address | ||
if (IS_PFLASH_ADDR(addr) && IS_PFLASH_ADDR(addr + len - 1)) | ||
{ | ||
// TODO: Implement this | ||
// SET_BOOT_ADDR(BOARD_PFLASH_APP_ADDR); | ||
return; | ||
} | ||
|
||
{ | ||
// Invalid address write | ||
__asm("bkpt #4"); | ||
} | ||
} | ||
|
||
void board_flash_erase_app(void) | ||
{ | ||
board_flash_init(); | ||
|
||
#if BOARD_QSPI_FLASH_EN | ||
TUF2_LOG1("Erasing QSPI Flash\r\n"); | ||
// Erase QSPI Flash | ||
(void) W25qxx_EraseChip(); | ||
#endif | ||
|
||
#if BOARD_SPI_FLASH_EN | ||
TUF2_LOG1("Erasing SPI Flash\r\n"); | ||
// Erase QSPI Flash | ||
(void) W25Qx_Erase_Chip(); | ||
#endif | ||
|
||
// TODO: Implement PFLASH erase for non-tinyuf2 sectors | ||
board_reset(); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing SPI check here, only doing QSPI/RAM/InternalFlash
I found this while playing around with the code to try and get my .uf2 to run...
Will try and double-check for similar missing pieces as soon as i get this working...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
board_flash_read
is used to provide data for theCURRENT.uf2
, but it's not really possible to target multiple memories for a readout. (maybe if we readout internal/QSPI/SPI flash and then concatenate all data into CURRENT.uf2)Internally within the port it's used to read the vector table, and the SPI flash cannot contain executables, so I left it out of
board_flash_read
.