diff --git a/src/drivers/boards/bbblue/CMakeLists.txt b/src/drivers/boards/bbblue/CMakeLists.txt
index 88954c163f..d8ae2238c3 100644
--- a/src/drivers/boards/bbblue/CMakeLists.txt
+++ b/src/drivers/boards/bbblue/CMakeLists.txt
@@ -30,12 +30,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-if ("${BOARD}" STREQUAL "bbblue")  
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error")
 
-	px4_add_library(drivers_board
-		init.c
-	)
+px4_add_library(drivers_board
+	init.c
+	../common/board_identity.c
+)
 
-endif()
\ No newline at end of file
diff --git a/src/drivers/boards/bbblue/board_config.h b/src/drivers/boards/bbblue/board_config.h
index e164c9d34e..e34202172d 100644
--- a/src/drivers/boards/bbblue/board_config.h
+++ b/src/drivers/boards/bbblue/board_config.h
@@ -42,8 +42,8 @@
 #ifndef BOARD_CONFIG_H
 #define BOARD_CONFIG_H
 
-#define BOARD_OVERRIDE_UUID "BBBLUEID    " // must be of length 12 (PX4_CPU_UUID_BYTE_LENGTH)
-#define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
+#define BOARD_OVERRIDE_UUID "BBBLUEID00000000" // must be of length 16
+#define PX4_SOC_ARCH_ID     PX4_SOC_ARCH_ID_BBBLUE
 
 #define BOARD_NAME "BBBLUE"
 
diff --git a/src/drivers/boards/bebop/CMakeLists.txt b/src/drivers/boards/bebop/CMakeLists.txt
index e4479545f0..d95d0043bc 100644
--- a/src/drivers/boards/bebop/CMakeLists.txt
+++ b/src/drivers/boards/bebop/CMakeLists.txt
@@ -30,12 +30,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__bebop
-	COMPILE_FLAGS
-	SRCS
-		../common/board_identity.c
-	DEPENDS
-		platforms__common
-	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+px4_add_library(drivers_board
+	../common/board_identity.c
+)
diff --git a/src/drivers/boards/common/board_common.h b/src/drivers/boards/common/board_common.h
index 74ae898b27..bef96fa905 100644
--- a/src/drivers/boards/common/board_common.h
+++ b/src/drivers/boards/common/board_common.h
@@ -343,6 +343,7 @@ typedef enum PX4_SOC_ARCH_ID_t {
 	PX4_SOC_ARCH_ID_SIM            =  0x1005,
 	PX4_SOC_ARCH_ID_SITL           =  0x1006,
 	PX4_SOC_ARCH_ID_BEBOP          =  0x1007,
+	PX4_SOC_ARCH_ID_BBBLUE         =  0x1008,
 
 } PX4_SOC_ARCH_ID_t;
 
diff --git a/src/drivers/boards/ocpoc/CMakeLists.txt b/src/drivers/boards/ocpoc/CMakeLists.txt
index c2ecc6c038..d95d0043bc 100644
--- a/src/drivers/boards/ocpoc/CMakeLists.txt
+++ b/src/drivers/boards/ocpoc/CMakeLists.txt
@@ -30,12 +30,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__ocpoc
-	COMPILE_FLAGS
-	SRCS
-		../common/board_identity.c
-	DEPENDS
-		platforms__common
-	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+px4_add_library(drivers_board
+	../common/board_identity.c
+)
diff --git a/src/drivers/boards/rpi/CMakeLists.txt b/src/drivers/boards/rpi/CMakeLists.txt
index 9ed4dc1139..01c98806a1 100644
--- a/src/drivers/boards/rpi/CMakeLists.txt
+++ b/src/drivers/boards/rpi/CMakeLists.txt
@@ -30,12 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__rpi
-	COMPILE_FLAGS
-	SRCS
-		../common/board_identity.c
-	DEPENDS
-		platforms__common
-	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+px4_add_library(drivers_board
+	../common/board_identity.c
+)
+
diff --git a/src/drivers/boards/sim/CMakeLists.txt b/src/drivers/boards/sim/CMakeLists.txt
index ddb6c2ec4b..d95d0043bc 100644
--- a/src/drivers/boards/sim/CMakeLists.txt
+++ b/src/drivers/boards/sim/CMakeLists.txt
@@ -30,12 +30,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__sim
-	COMPILE_FLAGS
-	SRCS
-		../common/board_identity.c
-	DEPENDS
-		platforms__common
-	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+px4_add_library(drivers_board
+	../common/board_identity.c
+)
diff --git a/src/lib/version/CMakeLists.txt b/src/lib/version/CMakeLists.txt
index e9aa3be28f..6b30e9ce23 100644
--- a/src/lib/version/CMakeLists.txt
+++ b/src/lib/version/CMakeLists.txt
@@ -77,4 +77,5 @@ endif()
 add_library(version version.c)
 target_compile_definitions(version PRIVATE BUILD_URI=${BUILD_URI})
 target_link_libraries(version PRIVATE git_ver)
+target_link_libraries(version PRIVATE drivers_board)
 add_dependencies(version prebuild_targets)