From 281bfb4bf68a82d7c90c8b5d03fd9623d7e58fdb Mon Sep 17 00:00:00 2001
From: J Blackman <blckmn@users.noreply.github.com>
Date: Tue, 27 Dec 2022 16:18:57 +1100
Subject: [PATCH] Bake in the board information at build time (#12089)

- if provided.
---
 src/main/build/version.h | 10 ----------
 src/main/fc/board_info.c | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/main/build/version.h b/src/main/build/version.h
index 1c8039bfa..65f93eae1 100644
--- a/src/main/build/version.h
+++ b/src/main/build/version.h
@@ -30,16 +30,6 @@
 
 #define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)
 
-#ifndef __BOARD__
-#define BOARD_NAME       FC_FIRMWARE_NAME
-#else
-#define BOARD_NAME       __BOARD__
-#endif
-
-#ifndef MANUFACTURER_ID
-#define MANUFACTURER_ID  FC_FIRMWARE_IDENTIFIER 
-#endif
-
 extern const char* const targetName;
 
 #define GIT_SHORT_REVISION_LENGTH   7 // lower case hexadecimal digits.
diff --git a/src/main/fc/board_info.c b/src/main/fc/board_info.c
index 418f67b0e..729b93d84 100644
--- a/src/main/fc/board_info.c
+++ b/src/main/fc/board_info.c
@@ -26,21 +26,25 @@
 #if defined(USE_BOARD_INFO)
 #include "pg/board.h"
 
+#if !defined(BOARD_NAME)
 static bool boardInformationSet = false;
 static char manufacturerId[MAX_MANUFACTURER_ID_LENGTH + 1];
 static char boardName[MAX_BOARD_NAME_LENGTH + 1];
 static bool boardInformationWasUpdated = false;
+#endif
 
 static bool signatureSet = false;
 static uint8_t signature[SIGNATURE_LENGTH];
 
 void initBoardInformation(void)
 {
+#if !defined(BOARD_NAME)
     boardInformationSet = boardConfig()->boardInformationSet;
     if (boardInformationSet) {
         strncpy(manufacturerId, boardConfig()->manufacturerId, MAX_MANUFACTURER_ID_LENGTH + 1);
         strncpy(boardName, boardConfig()->boardName, MAX_BOARD_NAME_LENGTH + 1);
     }
+#endif
 
     signatureSet = boardConfig()->signatureSet;
     if (signatureSet) {
@@ -50,21 +54,36 @@ void initBoardInformation(void)
 
 const char *getManufacturerId(void)
 {
+#if defined(MANUFACTURER_ID) && defined(BOARD_NAME)
+    return STR(MANUFACTURER_ID);
+#elif defined(BOARD_NAME)
+    return "----";
+#else
     return manufacturerId;
+#endif
 }
 
 const char *getBoardName(void)
 {
+#if defined(BOARD_NAME)
+    return STR(BOARD_NAME);
+#else
     return boardName;
+#endif
 }
 
 bool boardInformationIsSet(void)
 {
+#if defined(BOARD_NAME)
+    return true;
+#else
     return boardInformationSet;
+#endif
 }
 
 bool setManufacturerId(const char *newManufacturerId)
 {
+#if !defined(BOARD_NAME)
     if (!boardInformationSet || strlen(manufacturerId) == 0) {
         strncpy(manufacturerId, newManufacturerId, MAX_MANUFACTURER_ID_LENGTH + 1);
 
@@ -74,10 +93,15 @@ bool setManufacturerId(const char *newManufacturerId)
     } else {
         return false;
     }
+#else
+    UNUSED(newManufacturerId);
+    return false;
+#endif
 }
 
 bool setBoardName(const char *newBoardName)
 {
+#if !defined(BOARD_NAME)
     if (!boardInformationSet || strlen(boardName) == 0) {
         strncpy(boardName, newBoardName, MAX_BOARD_NAME_LENGTH + 1);
 
@@ -87,10 +111,15 @@ bool setBoardName(const char *newBoardName)
     } else {
         return false;
     }
+#else
+    UNUSED(newBoardName);
+    return false;
+#endif
 }
 
 bool persistBoardInformation(void)
 {
+#if !defined(BOARD_NAME)
     if (boardInformationWasUpdated) {
         strncpy(boardConfigMutable()->manufacturerId, manufacturerId, MAX_MANUFACTURER_ID_LENGTH + 1);
         strncpy(boardConfigMutable()->boardName, boardName, MAX_BOARD_NAME_LENGTH + 1);
@@ -102,6 +131,9 @@ bool persistBoardInformation(void)
     } else {
         return false;
     }
+#else
+    return false;
+#endif
 }
 
 #if defined(USE_SIGNATURE)
-- 
2.11.4.GIT