From c3fc4d28d98b0009fc5e9d73a761803e6f793a17 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 15 Jul 2021 19:32:32 +0200
Subject: [PATCH] removed fsfw_hal

---
 .gitmodules    |  3 ---
 CMakeLists.txt | 17 +++++------------
 fsfw           |  2 +-
 fsfw_hal       |  1 -
 4 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 160000 fsfw_hal

diff --git a/.gitmodules b/.gitmodules
index 5075b57..de4cfc6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "fsfw"]
 	path = fsfw
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
-[submodule "fsfw-hal"]
-	path = fsfw_hal
-	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-hal.git
 [submodule "tmtc/tmtccmd"]
 	path = tmtc/tmtccmd
 	url = https://github.com/spacefisch/tmtccmd.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71b2aba..5d04495 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ if(NOT FSFW_OSAL)
 endif()
 
 if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
-    option(LINUX_CROSS_COMPILE OFF)
-    set(FSFW_HAL_ADD_LINUX ON)
+    option(LINUX_CROSS_COMPILE "Cross compile for a Linux board" OFF)
+    set(FSFW_HAL_ADD_LINUX "Add the FSFW HAL for Linux systems" ON)
 endif()
 
 # Perform steps like loading toolchain files where applicable.
@@ -41,12 +41,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 # Set names and variables
 set(TARGET_NAME ${CMAKE_PROJECT_NAME}) 
 set(LIB_FSFW_NAME fsfw)
-set(LIB_FSFW_HAL_NAME fsfw_hal)
 
 # Set path names
 set(FSFW_PATH fsfw)
 set(COMMON_PATH example_common)
-set(LIB_FSFW_HAL_PATH fsfw_hal)
 
 # Analyse different OS and architecture/target options, determine BSP_PATH,
 # display information about compiler etc.
@@ -105,7 +103,6 @@ add_executable(${TARGET_NAME})
 add_subdirectory(${BSP_PATH})
 add_subdirectory(${FSFW_PATH})
 add_subdirectory(${COMMON_PATH})
-add_subdirectory(${LIB_FSFW_HAL_PATH})
 
 ################################################################################
 # Post-Sources preparation
@@ -115,7 +112,6 @@ add_subdirectory(${LIB_FSFW_HAL_PATH})
 target_link_libraries(${TARGET_NAME} PRIVATE
     ${LIB_FSFW_NAME} 
     ${LIB_OS_NAME} 
-    ${LIB_FSFW_HAL_NAME}
 )
 
 # Add include paths for all sources.
@@ -137,12 +133,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         "-fdata-sections"
     )
 
-    # Removed unused sections.
-    if(NOT ${OS_FSFW} MATCHES rtems)
-        target_link_options(${TARGET_NAME} PRIVATE
-            "-Wl,--gc-sections"
-        )
-    endif()
+    target_link_options(${TARGET_NAME} PRIVATE
+        "-Wl,--gc-sections"
+    )
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 endif()
 
diff --git a/fsfw b/fsfw
index a3e6b10..aafccd1 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit a3e6b1018b88f6e1e848f49e8f566026e88b98e8
+Subproject commit aafccd191e3a592e19c09b01b95dea89c8936e54
diff --git a/fsfw_hal b/fsfw_hal
deleted file mode 160000
index cd0dfc4..0000000
--- a/fsfw_hal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cd0dfc49d5527755462118445832888572a92169