Custom bootloader name

Author: 203Null

ports/espressif/CMakeLists.txt

@@ -26,26 +26,23 @@ set(EXTRA_COMPONENT_DIRS "${TOP}/src" boards)
 set(SDKCONFIG_DEFAULTS sdkconfig.defaults boards/${BOARD}/sdkconfig)
 set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 
-message(SDKCONFIG_DEFAULTS "${SDKCONFIG_DEFAULTS}")
-message(SDKCONFIG "${SDKCONFIG}")
-
-
-
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-execute_process(COMMAND git describe --dirty --always --tags
-                OUTPUT_VARIABLE GIT_VERSION
-                ERROR_QUIET)
+execute_process(COMMAND git describe --always --tags
+                OUTPUT_VARIABLE GIT_VERSION)
 string(STRIP ${GIT_VERSION} GIT_VERSION)
 
 execute_process(COMMAND bash "-c" "git submodule status ${TOP}/lib/esp-idf ${TOP}/lib/tinyusb | cut -d\" \" -f3,4 | paste -s -d\" \" -"
-                OUTPUT_VARIABLE GIT_SUBMODULE_VERSIONS
-                ERROR_QUIET)
-string(REPLACE ../../../../lib/ "" GIT_SUBMODULE_VERSIONS ${GIT_SUBMODULE_VERSIONS})
-string(STRIP ${GIT_SUBMODULE_VERSIONS} GIT_SUBMODULE_VERSIONS)
+                OUTPUT_VARIABLE GIT_SUBMODULE_VERSIONS)
+
+message(SDKCONFIG "${SDKCONFIG}")
+
+# string(REPLACE ../../../../lib/ "" GIT_SUBMODULE_VERSIONS ${GIT_SUBMODULE_VERSIONS})
+# string(STRIP ${GIT_SUBMODULE_VERSIONS} GIT_SUBMODULE_VERSIONS)
+
 
 add_compile_definitions(UF2_VERSION_BASE="${GIT_VERSION}")
-add_compile_definitions(UF2_VERSION="${GIT_VERSION} - ${GIT_SUBMODULE_VERSIONS}")
+# add_compile_definitions(UF2_VERSION="${GIT_VERSION} - ${GIT_SUBMODULE_VERSIONS}")
+add_compile_definitions(UF2_VERSION="${GIT_VERSION}")
 
-project(tinyuf2)
+project(tinyuf2)

ports/espressif/boards/matrix_block6_prototype1/board.h

@@ -25,7 +25,7 @@
 #ifndef MATRIX_BLOCK6_S2_H_
 #define MATRIX_BLOCK6_S2_H_
 
-#define MATRIX
+#define CUSTOM_BOOTLOADER_NAME "Matrix"
 #define FASTBOOT
 #define CUSTOM_LED
 

ports/espressif/boards/matrix_block6_prototype2/board.h

@@ -25,7 +25,7 @@
 #ifndef MATRIX_BLOCK6_PT2_H_
 #define MATRIX_BLOCK6_PT2_H_
 
-#define MATRIX
+#define CUSTOM_BOOTLOADER_NAME "Matrix"
 #define FASTBOOT
 #define CUSTOM_LED
 

ports/espressif/boards/matrix_pro/board.h

@@ -25,7 +25,7 @@
 #ifndef MATRIX_BLOCK6_PT2_H_
 #define MATRIX_BLOCK6_PT2_H_
 
-#define MATRIX
+#define CUSTOM_BOOTLOADER_NAME "Matrix"
 #define FASTBOOT
 #define CUSTOM_LED
 

ports/make.mk

@@ -59,6 +59,8 @@ GIT_VERSION := $(shell git describe --dirty --always --tags)
 GIT_SUBMODULE_VERSIONS := $(shell git submodule status $(addprefix ../../lib/,$(GIT_SUBMODULES)) | cut -d" " -f3,4 | paste -s -d" " -)
 GIT_SUBMODULE_VERSIONS := $(subst ../../lib/,,$(GIT_SUBMODULE_VERSIONS))
 
+
+
 CFLAGS += \
   -DBOARD_UF2_FAMILY_ID=$(UF2_FAMILY_ID) \
   -DUF2_VERSION_BASE='"$(GIT_VERSION)"'\

src/ghostfat.c

@@ -137,10 +137,10 @@ STATIC_ASSERT(FAT_ENTRIES_PER_SECTOR                       ==       256); // FAT
 
 
 const char infoUf2File[] =
-#ifndef MATRIX
-    "TinyUF2 Bootloader " UF2_VERSION "\r\n"
+#ifdef CUSTOM_BOOTLOADER_NAME
+    CUSTOM_BOOTLOADER_NAME " Bootloader " UF2_VERSION_BASE "\r\n"
 #else
-    "Matrix Bootloader " UF2_VERSION_BASE "\r\n"
+    "TinyUF2 Bootloader " UF2_VERSION_BASE "\r\n"
 #endif
     "Model: " UF2_PRODUCT_NAME "\r\n"
     "Board-ID: " UF2_BOARD_ID "\r\n"