diff --git a/buildsystem/cmake/HardwareOsPreConfig.cmake b/buildsystem/cmake/HardwareOsPreConfig.cmake
index 32080176..b8a11f97 100644
--- a/buildsystem/cmake/HardwareOsPreConfig.cmake
+++ b/buildsystem/cmake/HardwareOsPreConfig.cmake
@@ -52,17 +52,14 @@ if(CMAKE_CROSSCOMPILING)
 	)
 endif()
 	
-if(${TGT_BSP} MATCHES "arm/raspberrypi" OR ${TGT_BSP} MATCHES "arm/q7s")
-	
-	set(BSP_PATH "bsp_linux")
-	
-else() 
 
-	if(TGT_BSP)
+if(TGT_BSP)
+	if (${TGT_BSP} MATCHES "arm/raspberrypi" OR ${TGT_BSP} MATCHES "arm/q7s")
+		# set(BSP_PATH "bsp_linux")
+	else() 
 		message(WARNING "CMake not configured for this target!")
 		message(FATAL_ERROR "Target: ${TGT_BSP}!")
 	endif()
-	
 endif()
 		
 set(BSP_PATH ${BSP_PATH} PARENT_SCOPE)
diff --git a/fsfw b/fsfw
index 426514b9..5b9c0e01 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 426514b9a29274f46ea3723c8ef17c989c70bdac
+Subproject commit 5b9c0e013e35ab1353d402c6fa2cd75866e3afa5