diff --git a/.cproject b/.cproject
index f48e41a..34846f4 100644
--- a/.cproject
+++ b/.cproject
@@ -48,14 +48,14 @@
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
 				</defs>
 			</storageModule>
-			<storageModule buildDir="build/${ConfigName}" dirtyTs="1685097774834" moduleId="de.marw.cmake4eclipse.mbs.settings">
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1692539890623" moduleId="de.marw.cmake4eclipse.mbs.settings">
 				<options/>
 				<defs>
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
 					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
-					<def name="CODEGEN" type="BOOL" val="OFF"/>
 					<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
 					<def name="WITH_LLVM" type="BOOL" val="ON"/>
+					<def name="FW_BUILD" type="BOOL" val="ON"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
@@ -112,8 +112,8 @@
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
 					<def name="USE_CWR_SYSTEMC" type="BOOL" val="ON"/>
 					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
-					<def name="CODEGEN" type="BOOL" val="OFF"/>
 					<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
+					<def name="FW_BUILD" type="BOOL" val="ON"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
@@ -169,9 +169,9 @@
 				<defs>
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="RelWithDebInfo"/>
 					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
-					<def name="CODEGEN" type="BOOL" val="OFF"/>
 					<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
 					<def name="WITH_TCC" type="BOOL" val="ON"/>
+					<def name="FW_BUILD" type="BOOL" val="ON"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a8c7f2..7c23e5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
 	# stand alone build settings
 	###########################################################################
 	set(CORE_NAME TGC_C CACHE STRING "The core to build the ISS for" )
+	option(FW_BUILD "Enable the automatic download and build of some firmware to run on the ISS" OFF)
 	
 	set(CMAKE_CXX_STANDARD 14)
 	set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -82,8 +83,8 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
 	set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
 
 	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	     list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27)
-	     set(WITH_TCC ON)
+	    list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27)
+		option(WITH_TCC "Build TCC backend" ON)
 	endif()
 
 	if(WITH_LLVM)
@@ -142,6 +143,20 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
 	if(USE_CWR_SYSTEMC)
 		include(SystemCPackage)
 	endif()
+	if(FW_BUILD)
+		include(FetchContent)
+		set(FETCHCONTENT_BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}/..)
+		FetchContent_Declare(
+		  	riscvfw
+		  	GIT_REPOSITORY https://git.minres.com/VP/Firmwares.git
+		  	GIT_TAG        main
+		)
+		FetchContent_GetProperties(riscvfw)
+		if(NOT riscvfw_POPULATED)
+		  	FetchContent_Populate(riscvfw)
+		  	add_subdirectory(${riscvfw_SOURCE_DIR})
+		endif()
+	endif()
 endif()
 
 add_subdirectory(dbt-rise-core)
@@ -151,4 +166,5 @@ if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
 	add_subdirectory(dbt-rise-plugins)
 endif()
 
+
 include(CTest)