WIP edits

This commit is contained in:
Hierophect 2020-01-06 15:37:37 -05:00
parent fff5f8eb65
commit 0bbeae1786
2 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -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