Harden bootloader startup and build flags

Prevent the bootloader from jumping into an empty application image by checking the reset vector before branching, and surface that state in startup logging. Centralize RTL8201F/link-check and minimum remote-config build defines in `Validate.mk`, removing duplicated per-target defines. Also add an optional label to `debug::PrintBits`, apply small style cleanups, and remove the obsolete `pixeltype.json` content file.

Author: vanvught

common/include/common/utils/utils_string.h

@@ -81,7 +81,7 @@ inline float Atof(const char* buffer, uint32_t size) {
     }
 
     while (size > 0 && *p >= '0' && *p <= '9') {
-        result = result * 10.0F + static_cast<float>(*p - '0');
+        result = (result * 10.0F) + static_cast<float>(*p - '0');
         ++p;
         --size;
     }

common/include/firmware/debug/debug_printbits.h

@@ -35,7 +35,7 @@
 namespace debug {
 template <typename T>
     requires std::unsigned_integral<T>
-inline void PrintBits(T value) {
+inline void PrintBits(T value, const char* string = nullptr) {
     if constexpr (!config::kDumpEnabled) {
         return;
     }
@@ -46,7 +46,10 @@ inline void PrintBits(T value) {
 
     static_assert(sizeof(T) <= sizeof(unsigned));
 
-    printf("%.*x ", kHexDigits, static_cast<unsigned>(value));
+    if (string != nullptr) {
+        printf("%s :", string);
+    }
+    printf("0x%.*x ", kHexDigits, static_cast<unsigned>(value));
 
     for (int bit_number = kMaxBitIndex; bit_number >= 0; --bit_number) {
         const auto kMask = static_cast<T>(1) << bit_number;

common/make/gd32/Validate.mk

@@ -24,6 +24,8 @@ endif
 
 ifeq ($(findstring CONFIG_REMOTECONFIG_MINIMUM,$(FLAGS)),CONFIG_REMOTECONFIG_MINIMUM)
 	DEFINES+=-DCONFIG_NET_APPS_NO_MDNS
+	DEFINES+=-DCONFIG_UDP_NO_OPTIMIZE
+	DEFINES+=-DDISABLE_RTC
 else
   ifeq ($(findstring NO_EMAC,$(FLAGS)),NO_EMAC)
   else
@@ -56,8 +58,23 @@ ifdef FATFS_MKFS
 	DEFINES+=-DCONFIG_FATFS_MKFS
 endif
 
+# Hardware Scenario    Flag Condition              Resulting Compiler Definitions (DEFINES)
+# Using RTL8201F       ENET_LINK_CHECK is missing  -DRTL8201F_LED1_LINK_ALL  -DENET_LINK_CHECK_USE_INT (Uses Interrupts)
+# Using RTL8201F       ENET_LINK_CHECK is present  -DRTL8201F_LED1_LINK_ALL
+# Other Hardware       Any                         -DENET_LINK_CHECK_REG_POLL (Uses Polling)
+
+ifneq ($(findstring RTL8201F,$(FLAGS)),)
+	DEFINES+=-DRTL8201F_LED1_LINK_ALL
+	ifeq ($(findstring ENET_LINK_CHECK,$(FLAGS)),)
+		DEFINES+=-DENET_LINK_CHECK_USE_INT
+	endif
+else
+	DEFINES+=-DENET_LINK_CHECK_REG_POLL
+endif
+
 $(info $$DEFINES [${DEFINES}])
 
 DEFINES:= $(sort $(DEFINES))
 
 $(info $$DEFINES [${DEFINES}])
+

gd32_emac_artnet_dmx_multi/Common.mk

@@ -11,8 +11,6 @@ DEFINES+=RDM_CONTROLLER
 
 DEFINES+=CONFIG_STORE_USE_SPI
 
-DEFINES+=RTL8201F_LED1_LINK_ALL
-
 DEFINES+=DISPLAY_UDF 
 
 DEFINES+=ENABLE_HTTPD

gd32_emac_bootloader/Common.mk

@@ -10,8 +10,6 @@ DEFINES+=CONFIG_NETWORK_MEMORY_BLOCKS=1
 DEFINES+=UDP_MAX_PORTS_ALLOWED=3
 DEFINES+=ENET_RXBUF_NUM=2 ENET_TXBUF_NUM=2
 
-DEFINES+=RTL8201F_LED1_LINK_ALL
-
 SRCDIR=firmware lib
 
 LIBS=remoteconfig flashcodeinstall configstore display flashcode flash

gd32_emac_bootloader/firmware/main.cpp

@@ -66,8 +66,10 @@ int main() {
 
     const auto kIsNotRemote = (bkp_data_read(BKP_DATA_1) != 0xA5A5);
     const auto kIsNotKey = (gpio_input_bit_get(KEY_BOOTLOADER_TFTP_GPIOx, KEY_BOOTLOADER_TFTP_GPIO_PINx));
+    const uint32_t* reset_p = reinterpret_cast<uint32_t*>(FLASH_BASE + OFFSET_UIMAGE + 4);
+    const auto kIsEmpty = (*reset_p == UINT32_MAX);
 
-    if (kIsNotRemote && kIsNotKey) {
+    if (kIsNotRemote && kIsNotKey && !kIsEmpty) {
         // https://developer.arm.com/documentation/ka001423/1-0
         // 1. Disable interrupt response.
         __disable_irq();
@@ -97,7 +99,6 @@ int main() {
         // 7. Enable interrupts.
         __enable_irq();
         // 8. Call the reset handler
-        const uint32_t* reset_p = reinterpret_cast<uint32_t*>(FLASH_BASE + OFFSET_UIMAGE + 4);
         asm volatile("bx %0;" : : "r"(*reset_p));
     }
 
@@ -108,7 +109,7 @@ int main() {
     FirmwareVersion fw(kSoftwareVersion, __DATE__, __TIME__);
     FlashCodeInstall flashcode_install;
 
-    printf("Remote=%c, Key=%c\n", kIsNotRemote ? 'N' : 'Y', kIsNotKey ? 'N' : 'Y');
+    printf("Remote=%c, Key=%c, Empty=%c\n", kIsNotRemote ? 'N' : 'Y', kIsNotKey ? 'N' : 'Y', kIsEmpty ? 'Y' : 'N');
     fw.Print("Bootloader TFTP Server");
 
     RemoteConfig remote_config(remoteconfig::Output::CONFIG);

lib-clib/src/asctime.cpp

@@ -35,7 +35,9 @@ static const char kWdayName[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "S
 static char s_buffer[kMaxAscTime + 1];
 
 extern "C" char* asctime(const struct tm* p_tm) {
-    if (!p_tm) return nullptr;
+    if (p_tm == nullptr) {
+        return nullptr;
+    }
 
     const char* const kWday = (p_tm->tm_wday >= 0 && p_tm->tm_wday <= 6) ? kWdayName[p_tm->tm_wday] : "???";
     const char* const kMon = (p_tm->tm_mon >= 0 && p_tm->tm_mon <= 11) ? kMonName[p_tm->tm_mon] : "???";

lib-pixel/.settings/language.settings.xml

@@ -2,7 +2,7 @@
 <project>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.309283989.303033930.1702909156.1968016134.307371463" name="H3">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="true" env-hash="205609204473843936" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="true" env-hash="471349836864574239" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

lib-pixeldmx/.settings/language.settings.xml

@@ -2,7 +2,7 @@
 <project>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.309283989.303033930.1702909156.1968016134.1348187898.727602372" name="H3">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="true" env-hash="415158614607112017" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="true" env-hash="415161100161396711" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>