Changes to UF2 settings, reboot working, no usb

4 files changed, 16 insertions, 16 deletions

diff --git a/ports/stm32f4/Makefile b/ports/stm32f4/Makefile
index 2727ea954..6c5190668 100755
--- a/ports/stm32f4/Makefile
+++ b/ports/stm32f4/Makefile
@@ -22,7 +22,7 @@
 # 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
 # THE SOFTWARE.
-DEBUG = 1
+#DEBUG = 1
 
 # Select the board to build for.
 ifeq ($(BOARD),)
@@ -256,7 +256,7 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.hex
 	$(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
 
diff --git a/ports/stm32f4/boards/STM32F401_boot.ld b/ports/stm32f4/boards/STM32F401_boot.ld
index 64f78451a..ffdd7097c 100644
--- a/ports/stm32f4/boards/STM32F401_boot.ld
+++ b/ports/stm32f4/boards/STM32F401_boot.ld
@@ -8,7 +8,7 @@ MEMORY
     FLASH (rx)      : ORIGIN = 0x08010000, LENGTH = 512K - 64K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08010000, LENGTH = 64K 
     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 */
diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
index e97d793be..0371685d8 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
@@ -39,7 +39,7 @@
 #define BOARD_NO_VBUS_SENSE
 
 // On-board flash
-// #define SPI_FLASH_MOSI_PIN          (&pin_PB15)
-// #define SPI_FLASH_MISO_PIN          (&pin_PB14)
-// #define SPI_FLASH_SCK_PIN           (&pin_PB13)
-// #define SPI_FLASH_CS_PIN            (&pin_PB01)
+#define SPI_FLASH_MOSI_PIN          (&pin_PB15)
+#define SPI_FLASH_MISO_PIN          (&pin_PB14)
+#define SPI_FLASH_SCK_PIN           (&pin_PB13)
+#define SPI_FLASH_CS_PIN            (&pin_PB01)
diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
index 1642120e8..e40f9d80c 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
@@ -2,21 +2,21 @@ USB_VID = 0x239A
 USB_PID = 0x805A
 USB_PRODUCT = "Meowbit"
 USB_MANUFACTURER = "Kittenbot"
-USB_DEVICES = "CDC,MSC"
+USB_DEVICES = "CDC"
 
-# SPI_FLASH_FILESYSTEM = 1
-# EXTERNAL_FLASH_DEVICE_COUNT = 1
-# EXTERNAL_FLASH_DEVICES = W25Q16JV_IQ
-# LONGINT_IMPL = MPZ
+SPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICE_COUNT = 1
+EXTERNAL_FLASH_DEVICES = W25Q16JV_IQ
+LONGINT_IMPL = MPZ
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = NONE
+# INTERNAL_FLASH_FILESYSTEM = 1
+# LONGINT_IMPL = NONE
 
 MCU_SERIES = m4
 MCU_VARIANT = stm32f4
 MCU_SUB_VARIANT = stm32f401xe
 MCU_PACKAGE = 64
 CMSIS_MCU = STM32F401xE
-LD_FILE = boards/STM32F401_fs.ld
+LD_FILE = boards/STM32F401_boot.ld #STM32F401_fs.ld
 TEXT0_ADDR = 0x08010000
-TEXT1_ADDR = 0x08020000
\ No newline at end of file
+TEXT1_ADDR = 0x08040000
\ No newline at end of file