summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHierophect <hierophect@gmail.com>2020-01-06 15:37:37 -0500
committerHierophect <hierophect@gmail.com>2020-01-06 15:37:37 -0500
commit0bbeae1786ed4c1527733ed625c0ec0dd3bb2838 (patch)
treea644226f4734b4331fcc071164c34ed45149eacb
parentfff5f8eb65d02fcf028e769010439703d96adac4 (diff)
WIP edits
-rwxr-xr-xports/stm32f4/Makefile4
-rw-r--r--ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk5
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/stm32f4/Makefile b/ports/stm32f4/Makefile
index 6c5190668..93cde6737 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 0x57755a57 -b 0x08010000 -c -o "$(BUILD)/firmware.uf2" $^
+ $(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0x57755a57 -b 0x08000000 -c -o "$(BUILD)/firmware.uf2" $^
include $(TOP)/py/mkrules.mk
diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
index e40f9d80c..73f1d722a 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
@@ -2,7 +2,7 @@ USB_VID = 0x239A
USB_PID = 0x805A
USB_PRODUCT = "Meowbit"
USB_MANUFACTURER = "Kittenbot"
-USB_DEVICES = "CDC"
+USB_DEVICES = "CDC,MSC"
SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICE_COUNT = 1
@@ -17,6 +17,7 @@ MCU_VARIANT = stm32f4
MCU_SUB_VARIANT = stm32f401xe
MCU_PACKAGE = 64
CMSIS_MCU = STM32F401xE
-LD_FILE = boards/STM32F401_boot.ld #STM32F401_fs.ld
+# LD_FILE = boards/STM32F401_boot.ld
+LD_FILE = boards/STM32F401_fs.ld
TEXT0_ADDR = 0x08010000
TEXT1_ADDR = 0x08040000 \ No newline at end of file