diff --git a/stm-firmware/CMakeLists.txt b/stm-firmware/CMakeLists.txt index 04f5a23..2eb28a8 100644 --- a/stm-firmware/CMakeLists.txt +++ b/stm-firmware/CMakeLists.txt @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_CROSSCOMPILING 1) -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.18) set(CMAKE_TOOLCHAIN_FILE "arm-none-eabi-gcc.cmake") @@ -43,26 +43,12 @@ else (GIT_FOUND) message("Version is set to: ${GIT_DESCRIBE}${ColorReset}") endif (GIT_FOUND) -find_program(VIRTUALENV virtualenv) -if (VIRTUALENV) - message("Python virtual environment found") - execute_process( - COMMAND ${VIRTUALENV} venv - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - OUTPUT_QUIET - COMMAND_ERROR_IS_FATAL ANY - ) - set(VENV_BIN "${CMAKE_CURRENT_BINARY_DIR}/venv/bin") - execute_process( - COMMAND ./pip install -r "${CMAKE_CURRENT_SOURCE_DIR}/crc-patcher/requirements.txt" - WORKING_DIRECTORY ${VENV_BIN} - OUTPUT_QUIET - COMMAND_ERROR_IS_FATAL ANY - ) - message("${BoldGreen}python virtual environment set up!${ColorReset}") -else(VIRTUALENV) - message(FATAL_ERROR "${BoldRed}Python virtual environment not set up: virtualenv: command not found!${ColorReset}") -endif (VIRTUALENV) +find_program(PATCHELFCRC patchelfcrc) +if (PATCHELFCRC) + message("patchelfcrc found: ${PATCHELFCRC}") +else(PATCHELFCRC) + message(FATAL_ERROR "${BoldRed}Patchelfcrc not found. Cannot patch CRC checksum into ELF file: patchelfcrc: command not found! See: https://git.shimatta.de/mhu/patchelfcrc${ColorReset}") +endif (PATCHELFCRC) set(ELFFILE ${PROJECT_NAME}.elf) @@ -131,8 +117,8 @@ target_include_directories(${ELFFILE} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/updat add_custom_command( TARGET ${ELFFILE} POST_BUILD - COMMAND ./python "${CMAKE_CURRENT_SOURCE_DIR}/crc-patcher/crc_patch_elf.py" "${CMAKE_CURRENT_BINARY_DIR}/${ELFFILE}" - WORKING_DIRECTORY ${VENV_BIN} + COMMAND ${PATCHELFCRC} --little-endian --verbose --granularity word --start-magic 0xa8be53f9 --end-magic 0xffa582ff -O .flashcrc -p crc-32-mpeg -S .text -S .data -S .ccmdata -S .vectors "${CMAKE_CURRENT_BINARY_DIR}/${ELFFILE}" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Running Flash CRC Patcher" )