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

Changes to UF2 settings, reboot working, no usb

This commit is contained in:
Hierophect 2020-01-06 11:30:10 -05:00
parent f355642eab
commit 7198cc8ed6
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/stm32f4/Makefile
View File

@ -22,7 +22,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE. # THE SOFTWARE.
DEBUG = 1 #DEBUG = 1
# Select the board to build for. # Select the board to build for.
ifeq ($(BOARD),) ifeq ($(BOARD),)
@ -256,7 +256,7 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
$(BUILD)/firmware.uf2: $(BUILD)/firmware.hex $(BUILD)/firmware.uf2: $(BUILD)/firmware.hex
$(ECHO) "Create $@" $(ECHO) "Create $@"
$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/firmware.uf2" $^ $(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0x57755a57 -b 0x08010000 -c -o "$(BUILD)/firmware.uf2" $^
include $(TOP)/py/mkrules.mk include $(TOP)/py/mkrules.mk

2
ports/stm32f4/boards/STM32F401_boot.ld
View File

@ -8,7 +8,7 @@ MEMORY
FLASH (rx) : ORIGIN = 0x08010000, LENGTH = 512K - 64K /* entire flash */ FLASH (rx) : ORIGIN = 0x08010000, LENGTH = 512K - 64K /* entire flash */
FLASH_ISR (rx) : ORIGIN = 0x08010000, LENGTH = 64K FLASH_ISR (rx) : ORIGIN = 0x08010000, LENGTH = 64K
FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 384K /* sector 4 is 64K, sectors 5,6,7 are 128K */ FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 384K /* sector 4 is 64K, sectors 5,6,7 are 128K */
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 96K RAM (xrw) : ORIGIN = 0x20000194, LENGTH = 96K - 0x194
} }
/* produce a link error if there is not this amount of RAM for these sections */ /* produce a link error if there is not this amount of RAM for these sections */

8
ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
View File

@ -39,7 +39,7 @@
#define BOARD_NO_VBUS_SENSE #define BOARD_NO_VBUS_SENSE
// On-board flash // On-board flash
// #define SPI_FLASH_MOSI_PIN (&pin_PB15) #define SPI_FLASH_MOSI_PIN (&pin_PB15)
// #define SPI_FLASH_MISO_PIN (&pin_PB14) #define SPI_FLASH_MISO_PIN (&pin_PB14)
// #define SPI_FLASH_SCK_PIN (&pin_PB13) #define SPI_FLASH_SCK_PIN (&pin_PB13)
// #define SPI_FLASH_CS_PIN (&pin_PB01) #define SPI_FLASH_CS_PIN (&pin_PB01)

18
ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
View File

@ -2,21 +2,21 @@ USB_VID = 0x239A
USB_PID = 0x805A USB_PID = 0x805A
USB_PRODUCT = "Meowbit" USB_PRODUCT = "Meowbit"
USB_MANUFACTURER = "Kittenbot" USB_MANUFACTURER = "Kittenbot"
USB_DEVICES = "CDC,MSC" USB_DEVICES = "CDC"
# SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
# EXTERNAL_FLASH_DEVICE_COUNT = 1 EXTERNAL_FLASH_DEVICE_COUNT = 1
# EXTERNAL_FLASH_DEVICES = W25Q16JV_IQ EXTERNAL_FLASH_DEVICES = W25Q16JV_IQ
# LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
INTERNAL_FLASH_FILESYSTEM = 1 # INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = NONE # LONGINT_IMPL = NONE
MCU_SERIES = m4 MCU_SERIES = m4
MCU_VARIANT = stm32f4 MCU_VARIANT = stm32f4
MCU_SUB_VARIANT = stm32f401xe MCU_SUB_VARIANT = stm32f401xe
MCU_PACKAGE = 64 MCU_PACKAGE = 64
CMSIS_MCU = STM32F401xE CMSIS_MCU = STM32F401xE
LD_FILE = boards/STM32F401_fs.ld LD_FILE = boards/STM32F401_boot.ld #STM32F401_fs.ld
TEXT0_ADDR = 0x08010000 TEXT0_ADDR = 0x08010000
TEXT1_ADDR = 0x08020000 TEXT1_ADDR = 0x08040000