From 873922d98fea19f872ed8c5c79a20ed575ccff44 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 25 May 2023 23:07:47 +0100 Subject: [PATCH] Implement UF2 device type id extension tag (#21029) --- builddefs/common_rules.mk | 3 ++- util/uf2conv.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk index e993cc350e..816eac49ae 100644 --- a/builddefs/common_rules.mk +++ b/builddefs/common_rules.mk @@ -152,6 +152,7 @@ endif # To produce a UF2 file in your build, add to your keyboard's rules.mk: # FIRMWARE_FORMAT = uf2 UF2CONV = $(TOP_DIR)/util/uf2conv.py +UF2CONV_ARGS ?= UF2_FAMILY ?= 0x0 # Compiler flags to generate dependency files. @@ -219,7 +220,7 @@ gccversion : @$(BUILD_CMD) %.uf2: %.elf - $(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1) + $(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(UF2CONV_ARGS) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1) #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n" @$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD) @$(BUILD_CMD) diff --git a/util/uf2conv.py b/util/uf2conv.py index 52d3861cba..578b2b4977 100755 --- a/util/uf2conv.py +++ b/util/uf2conv.py @@ -151,10 +151,15 @@ class Block: flags = 0x0 if familyid: flags |= 0x2000 + if devicetype: + flags |= 0x8000 hd = struct.pack("