diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b03c3d..ab87c75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,170 @@
-if (NOT DEFINED BOARD)
-	set(BOARD iss)
+cmake_minimum_required(VERSION 3.12)
+
+# Set default RISC-V toolchain if not specified
+if(NOT DEFINED RISCV_TOOLCHAIN_PATH)
+    set(RISCV_TOOLCHAIN_PATH "/opt/shared/cross-toolchains/gcc13/CentOS/riscv64-unknown-elf/bin" CACHE STRING "Path to RISC-V toolchain")
 endif()
-if (NOT DEFINED ISA)
-	set(ISA imc)
+
+# Allow override of compiler executables
+if(NOT DEFINED RISCV_GCC)
+    set(RISCV_GCC "/opt/shared/cross-toolchains/gcc13/CentOS/riscv64-unknown-elf/bin/riscv64-unknown-elf-gcc" CACHE STRING "RISC-V GCC compiler")
 endif()
-message(STATUS "Building firmware using ${BOARD} board configuration and isa ${ISA}")
-add_custom_target(fw-common ALL 
-	COMMAND make -C hello-world BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/coremark BOARD=${BOARD} ISA=${ISA}
-    USES_TERMINAL
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(NOT DEFINED RISCV_GXX)
+    set(RISCV_GXX "${RISCV_TOOLCHAIN_PATH}/riscv64-unknown-elf-g++" CACHE STRING "RISC-V G++ compiler")
+endif()
+
+if(NOT DEFINED RISCV_OBJCOPY)
+    set(RISCV_OBJCOPY "${RISCV_TOOLCHAIN_PATH}/riscv64-unknown-elf-objcopy" CACHE STRING "RISC-V objcopy")
+endif()
+
+if(NOT DEFINED RISCV_OBJDUMP)
+    set(RISCV_OBJDUMP "${RISCV_TOOLCHAIN_PATH}/riscv64-unknown-elf-objdump" CACHE STRING "RISC-V objdump")
+endif()
+
+# Set the compilers
+set(CMAKE_C_COMPILER ${RISCV_GCC})
+set(CMAKE_CXX_COMPILER ${RISCV_GXX})
+
+project(Firmware)
+
+# Define supported configurations
+set(SUPPORTED_BOARDS iss)
+set(SUPPORTED_ISAS "rv32i;rv32im;rv32imc;rv64i;rv64im;rv64imc;imc")
+set(SUPPORTED_ABIS "ilp32;ilp32f;lp64;lp64f")
+
+# Build target options
+option(BUILD_HELLO_WORLD "Build hello-world example" ON)
+option(BUILD_DHRYSTONE "Build dhrystone benchmark" OFF)
+option(BUILD_COREMARK "Build coremark benchmark" OFF)
+option(BUILD_ALL "Build all targets" OFF)
+
+# If BUILD_ALL is ON, enable all targets
+if(BUILD_ALL)
+    set(BUILD_HELLO_WORLD ON)
+    set(BUILD_DHRYSTONE ON)
+    set(BUILD_COREMARK ON)
+endif()
+
+# Set default values and validate configurations
+if(NOT DEFINED BOARD)
+    set(BOARD iss CACHE STRING "Target board")
+endif()
+
+if(NOT DEFINED ISA)
+    set(ISA imc CACHE STRING "Target ISA")
+endif()
+
+if(NOT DEFINED RISCV_ABI)
+    if(ISA MATCHES "^rv64")
+        set(RISCV_ABI "lp64" CACHE STRING "RISC-V ABI")
+    else()
+        set(RISCV_ABI "ilp32" CACHE STRING "RISC-V ABI")
+    endif()
+endif()
+
+# Validate configurations
+if(NOT BOARD IN_LIST SUPPORTED_BOARDS)
+    message(FATAL_ERROR "Invalid BOARD specified. Supported boards: ${SUPPORTED_BOARDS}")
+endif()
+
+if(NOT ISA IN_LIST SUPPORTED_ISAS)
+    message(FATAL_ERROR "Invalid ISA specified. Supported ISAs: ${SUPPORTED_ISAS}")
+endif()
+
+if(NOT RISCV_ABI IN_LIST SUPPORTED_ABIS)
+    message(FATAL_ERROR "Invalid ABI specified. Supported ABIs: ${SUPPORTED_ABIS}")
+endif()
+
+# Set RISC-V architecture based on ISA
+if(ISA MATCHES "^rv")
+    set(RISCV_ARCH ${ISA})
+else()
+    # Default to rv32 for backward compatibility
+    set(RISCV_ARCH "rv32${ISA}")
+endif()
+
+# Set BSP base directory
+set(BSP_BASE "${CMAKE_CURRENT_SOURCE_DIR}/bare-metal-bsp")
+
+# Global compile definitions
+add_compile_definitions(BOARD_${BOARD})
+
+# RISC-V specific compiler flags
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${RISCV_ARCH}_zicsr_zifencei -mabi=${RISCV_ABI}")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${RISCV_ARCH}_zicsr_zifencei -mabi=${RISCV_ABI}")
+
+# Optional: Enable semihosting support
+option(SEMIHOSTING "Enable semihosting support" OFF)
+if(SEMIHOSTING)
+    add_compile_definitions(SEMIHOSTING)
+endif()
+
+#create interface library for propagating compile options
+add_library(global_compile_options INTERFACE)
+
+# Compile options
+target_compile_options(global_compile_options INTERFACE
+    -march=${RISCV_ARCH}_zicsr_zifencei
+    -mabi=${RISCV_ABI}
+    -mcmodel=medany
+    -O2
+    -g
+  #  -ffunction-sections
+  #  -fdata-sections
+)
+
+
+
+message(STATUS "Building firmware with configuration:")
+message(STATUS "  Board: ${BOARD}")
+message(STATUS "  ISA: ${ISA} (Architecture: ${RISCV_ARCH})")
+message(STATUS "  ABI: ${RISCV_ABI}")
+message(STATUS "  Semihosting: ${SEMIHOSTING}")
+message(STATUS "  Toolchain:")
+message(STATUS "    Path: ${RISCV_TOOLCHAIN_PATH}")
+message(STATUS "    C Compiler: ${CMAKE_C_COMPILER}")
+message(STATUS "    C++ Compiler: ${CMAKE_CXX_COMPILER}")
+message(STATUS "Targets to build:")
+message(STATUS "  hello-world: ${BUILD_HELLO_WORLD}")
+message(STATUS "  dhrystone: ${BUILD_DHRYSTONE}")
+message(STATUS "  coremark: ${BUILD_COREMARK}")
+
+
+add_subdirectory(bare-metal-bsp)
+
+# Add subdirectories based on build options
+if(BUILD_HELLO_WORLD)
+    add_subdirectory(hello-world)
+endif()
+
+
+if(BUILD_DHRYSTONE)
+    add_subdirectory(benchmarks/dhrystone)
+endif()
+
+if(BUILD_COREMARK)
+    add_subdirectory(benchmarks/coremark)
+endif()
+
+# Create an all-inclusive target only if BUILD_ALL is ON
+if(BUILD_ALL)
+    add_custom_target(fw-common ALL
+        DEPENDS 
+            hello-world
+            dhrystone
+            coremark
+    )
+endif()
+
+# Print build instructions
+message(STATUS "")
+message(STATUS "Build instructions:")
+message(STATUS "  Build all targets:           cmake -DBUILD_ALL=ON ..")
+message(STATUS "  Build specific target:       cmake -DBUILD_HELLO_WORLD=ON -DBUILD_DHRYSTONE=OFF -DBUILD_COREMARK=OFF ..")
+message(STATUS "  Configure board:             cmake -DBOARD=iss ..")
+message(STATUS "  Configure ISA:               cmake -DISA=rv32imc ..")
+message(STATUS "  Configure ABI:               cmake -DRISCV_ABI=ilp32 ..")
+message(STATUS "  Enable semihosting:          cmake -DSEMIHOSTING=ON ..")
+message(STATUS "  Set toolchain path:          cmake -DRISCV_TOOLCHAIN_PATH=/path/to/toolchain ..")
+message(STATUS "  Set specific compiler:       cmake -DRISCV_GCC=/path/to/riscv-gcc -DRISCV_GXX=/path/to/riscv-g++ ..")
diff --git a/benchmarks/coremark/CMakeLists.txt b/benchmarks/coremark/CMakeLists.txt
new file mode 100644
index 0000000..e3230cb
--- /dev/null
+++ b/benchmarks/coremark/CMakeLists.txt
@@ -0,0 +1,66 @@
+cmake_minimum_required(VERSION 3.12)
+project(coremark C)
+
+# Include BSP libwrap
+include(${BSP_BASE}/libwrap/CMakeLists.txt)
+
+# Source files
+set(SOURCES
+    core_portme.c
+    cvt.c
+    ee_printf.c
+    cm/core_list_join.c
+    cm/core_main.c
+    cm/core_matrix.c
+    cm/core_state.c
+    cm/core_util.c
+)
+
+# Create executable
+add_executable(coremark ${SOURCES})
+
+# Include directories
+target_include_directories(coremark PRIVATE
+    ${BSP_BASE}/include
+    ${BSP_BASE}/drivers
+    ${BSP_BASE}/env
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/cm
+)
+
+# Link with libwrap
+target_link_libraries(coremark PRIVATE
+    LIBWRAP_TGC
+)
+
+# Add compile definitions
+target_compile_definitions(coremark PRIVATE
+    BOARD_${BOARD}
+    PERFORMANCE_RUN=1
+    ITERATIONS=1000
+    COMPILER_FLAGS="${CMAKE_C_FLAGS}"
+    COMPILER_VERSION="${CMAKE_C_COMPILER_VERSION}"
+)
+
+# Set compile options
+target_compile_options(coremark PRIVATE
+    -march=${RISCV_ARCH}_zicsr_zifencei
+    -mabi=${RISCV_ABI}
+    -mcmodel=medany
+    -ffunction-sections
+    -fdata-sections
+    -O2  # Optimization level for benchmarking
+)
+
+# Set linker options
+target_link_options(coremark PRIVATE
+    -T${BSP_BASE}/env/${BOARD}/link.ld
+    -nostartfiles
+    -Wl,--gc-sections
+    ${LIBWRAP_TGC_LDFLAGS}
+)
+
+# Install target
+install(TARGETS coremark
+    RUNTIME DESTINATION bin
+)
diff --git a/benchmarks/dhrystone/CMakeLists.txt b/benchmarks/dhrystone/CMakeLists.txt
new file mode 100644
index 0000000..8bb862a
--- /dev/null
+++ b/benchmarks/dhrystone/CMakeLists.txt
@@ -0,0 +1,58 @@
+cmake_minimum_required(VERSION 3.12)
+project(dhrystone C)
+
+# Include BSP libwrap
+include(${BSP_BASE}/libwrap/CMakeLists.txt)
+
+# Source files
+set(SOURCES
+    dhry_1.c
+    dhry_2.c
+    dhry_stubs.c
+)
+
+# Create executable
+add_executable(dhrystone ${SOURCES})
+
+# Include directories
+target_include_directories(dhrystone PRIVATE
+    ${BSP_BASE}/include
+    ${BSP_BASE}/drivers
+    ${BSP_BASE}/env
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# Link with libwrap
+target_link_libraries(dhrystone PRIVATE
+    LIBWRAP_TGC
+)
+
+# Add compile definitions
+target_compile_definitions(dhrystone PRIVATE
+    BOARD_${BOARD}
+)
+
+# Set compile options
+target_compile_options(dhrystone PRIVATE
+    -march=${RISCV_ARCH}_zicsr_zifencei
+    -mabi=${RISCV_ABI}
+    -mcmodel=medany
+    -ffunction-sections
+    -fdata-sections
+    -O2  # Optimization level for benchmarking
+    -DTIME  # Enable time measurement
+    -DNOENUM  # Disable enum usage as per dhrystone requirements
+)
+
+# Set linker options
+target_link_options(dhrystone PRIVATE
+    -T${BSP_BASE}/env/${BOARD}/link.ld
+    -nostartfiles
+    -Wl,--gc-sections
+    ${LIBWRAP_TGC_LDFLAGS}
+)
+
+# Install target
+install(TARGETS dhrystone
+    RUNTIME DESTINATION bin
+)
diff --git a/hello-world/CMakeLists.txt b/hello-world/CMakeLists.txt
new file mode 100644
index 0000000..af71120
--- /dev/null
+++ b/hello-world/CMakeLists.txt
@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 3.12)
+project(hello-world C)
+
+# Set default board to iss if not specified
+if(NOT DEFINED BOARD)
+    set(BOARD "iss" CACHE STRING "Target board")
+endif()
+
+#set(BSP_BASE "${CMAKE_CURRENT_SOURCE_DIR}/../bare-metal-bsp")
+
+
+
+# Source files
+set(SOURCES
+    hello.c
+)
+
+message(STATUS "Building for board: ${BOARD}")
+message(STATUS "liu:${PROJECT_NAME} ")
+message(STATUS "Using board-specific files from: ${BSP_BASE}/env/${BOARD}")
+
+# Create executable with all objects
+add_executable(${PROJECT_NAME} 
+    ${SOURCES}
+    ${BSP_OBJECTS}
+   
+    
+)
+
+# Link with board library
+target_link_libraries(${PROJECT_NAME}  PRIVATE 
+ ${LIBWRAP_OBJECTS}
+ ${ENV_OBJECTS}
+ #$<TARGET_OBJECTS:env_entry>
+ #$<TARGET_OBJECTS:env_start>
+ )
+
+# Include directories
+target_include_directories(${PROJECT_NAME}  PRIVATE
+    ${BSP_BASE}/include
+    ${BSP_BASE}/drivers
+    ${BSP_BASE}/env
+    ${BSP_BASE}/env/${BOARD}
+    ${BSP_BASE}/libwrap
+)
+
+# Add compile definitions
+target_compile_definitions(${PROJECT_NAME}  PRIVATE
+    BOARD_${BOARD}
+)
+
+# link global_compile_options to this target
+target_link_libraries(${PROJECT_NAME} PRIVATE global_compile_options)
+
+# Set linker options
+target_link_options(${PROJECT_NAME}  PRIVATE
+    -T${BSP_BASE}/env/${BOARD}/link.ld
+    -nostartfiles
+    -Wl,--gc-sections
+)
+
+# Install target
+install(TARGETS ${PROJECT_NAME} 
+    RUNTIME DESTINATION bin
+)