diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca4acf8..f366b744 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake)
 pre_source_hw_os_config()
 
 if(TGT_BSP)
+    message(STATUS ${TGT_BSP})
     if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi"
         OR TGT_BSP MATCHES "arm/beagleboneblack"
     )
@@ -97,18 +98,18 @@ if(TGT_BSP)
         endif()
     endif()
    
-    if(${TGT_BSP} MATCHES "arm/raspberrypi")
+    if(TGT_BSP MATCHES "arm/raspberrypi")
         # Used by configure file
         set(RASPBERRY_PI ON)
         set(FSFW_HAL_ADD_RASPBERRY_PI ON)
     endif()
     
-    if(${TGT_BSP} MATCHES "arm/beagleboneblack")
+    if(TGT_BSP MATCHES "arm/beagleboneblack")
         # Used by configure file
         set(BEAGLEBONEBLACK ON)
     endif()
     
-    if(${TGT_BSP} MATCHES "arm/q7s")
+    if(TGT_BSP MATCHES "arm/q7s")
         # Used by configure file
         set(XIPHOS_Q7S ON)
     endif()
@@ -122,9 +123,9 @@ if(NOT EIVE_BUILD_WATCHDOG)
     configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
     configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
     configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
-    if(${TGT_BSP} MATCHES "arm/q7s")
+    if(TGT_BSP MATCHES "arm/q7s")
         configure_file(${BSP_PATH}/boardconfig/q7sConfig.h.in q7sConfig.h)
-    elseif(${TGT_BSP} MATCHES "arm/raspberrypi")
+    elseif(TGT_BSP MATCHES "arm/raspberrypi")
         configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
     endif()
 endif()
diff --git a/cmake/HardwareOsPreConfig.cmake b/cmake/HardwareOsPreConfig.cmake
index 535f9b9e..3ff67565 100644
--- a/cmake/HardwareOsPreConfig.cmake
+++ b/cmake/HardwareOsPreConfig.cmake
@@ -53,9 +53,9 @@ endif()
 	
 
 if(TGT_BSP)
-	if (${TGT_BSP} MATCHES "arm/raspberrypi" OR ${TGT_BSP} MATCHES "arm/beagleboneblack")
+	if (TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
 		set(BSP_PATH "bsp_linux_board")
-	elseif(${TGT_BSP} MATCHES "arm/q7s")
+	elseif(TGT_BSP MATCHES "arm/q7s")
 		set(BSP_PATH "bsp_q7s")
 	else() 
 		message(WARNING "CMake not configured for this target!")
diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index 79340e26..04bdeff0 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -6,9 +6,9 @@
 #ifndef FSFWCONFIG_OBSWCONFIG_H_
 #define FSFWCONFIG_OBSWCONFIG_H_
 
-/* #undef RASPBERRY_PI */
-#define XIPHOS_Q7S
-/* #undef BEAGLEBONEBLACK */
+#cmakedefine RASPBERRY_PI
+#cmakedefine XIPHOS_Q7S
+#cmakedefine BEAGLEBONEBLACK
 
 #ifdef RASPBERRY_PI
 #include "rpiConfig.h"