Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history
matgla committed Jun 2, 2024
1 parent 61f370e commit 430fe6a
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -162,8 +162,10 @@ if(${configuration_is_ready})
message(FATAL_ERROR "Can't find renode executable")
endif ()

add_subdirectory(tests)

if (NOT YASBOOT_DISABLE_TESTS)
add_subdirectory(tests)
endif ()

if (DEFINED BOARD)
add_subdirectory(simulation/${BOARD})
endif ()
4 changes: 2 additions & 2 deletions cmake/yasboot_create_disk.cmake
Original file line number Diff line number Diff line change
@@ -53,8 +53,8 @@ macro (yasboot_create_disk)
COMMAND
${scripts_python_executable} ${ROOT_DIR}/scripts/write_yasboot.py
--drive ${YASBOOT_OUTPUT}
--yasboot ${FILE_BINARY_DIR}/../yasboot.bin
--bootcode ${FILE_BINARY_DIR}/../boot.bin
--yasboot ${FILE_BINARY_DIR}/yasboot/yasboot.bin
--bootcode ${FILE_BINARY_DIR}/yasboot/boot.bin
DEPENDS
yasboot
${ROOT_DIR}/scripts/create_disk.py
2 changes: 2 additions & 0 deletions cmake/yasboot_import_project.cmake
Original file line number Diff line number Diff line change
@@ -43,7 +43,9 @@ macro (yasboot_import_project)
CMAKE_ARGS
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DUSE_CONFIG=${YASBOOT_CONFIG}
-DYASBOOT_DISABLE_TESTS=ON
#-DCMAKE_TOOLCHAIN_FILE=${I_TOOLCHAINS_PATH}/arm-none-eabi-with-pic.cmake

SOURCE_DIR ${ROOT_DIR}
BINARY_DIR ${ROOT_BINARY_DIR}/yasboot
INSTALL_COMMAND ""

0 comments on commit 430fe6a

Please sign in to comment.