OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
sof/tools/rimage/CMakeLists.txt

68 lines
1.8 KiB
CMake
Raw Normal View History

Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.10)
project(SOF_RIMAGE C)
cmake: use CMAKE_BUILD_TYPE and default to Debug Unlike hardcoded target_compile_options(-g) can be overriden from the command line, from the parent ExternalProject_Add(CMAKE_ARGS) (tested) or from a CMake GUI (not tested). Default to Debug because the time spent running rimage is negligible compared to building the image to sign and because the time saved learning CMake when it crashes can be huge for some people. BTW -O2 -g is rarely ever useful. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2020-06-16 12:59:30 +08:00
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "No CMAKE_BUILD_TYPE, defaulting to Debug")
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
endif()
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
add_executable(rimage
src/file_simple.c
src/cse.c
src/css.c
src/plat_auth.c
src/hash.c
src/pkcs1_5.c
src/manifest.c
ext_man: Create extended manifest Extended manifest is a place to store metadata about firmware, known during compilation time - for example firmware version or used compiler. Given information are read on host side before firmware startup. This part of output binary is not signed. Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
2020-04-07 18:40:06 +08:00
src/ext_manifest.c
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
src/rimage.c
toml_utils: adsp_config: Moved generic parser functions to toml_utils A set of functions which make it easier to parse toml files has been separated into a new file. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
2023-02-24 00:27:25 +08:00
src/toml_utils.c
config: Add configuration file parsing interface This allow to add new platform with old version of rimage tool. Default values are easily to define for any fields, so fields duplication in config files should be reduced. Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
2020-09-07 23:20:08 +08:00
src/adsp_config.c
misc_utils: Move byte_swap function to new misc_utils.c file This function will be used in different places in the code, so I moved it to a separate file. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
2023-02-27 19:26:20 +08:00
src/misc_utils.c
file_utils: manifest: ext_manifest: Add new create_file_name function A new function create_file_name has been created that prepares the name of the output file with the given extensions. Unlike the previous solution, it checks whether the new name will fit in the output buffer. A new file_utils.c file has been prepared, into which generic functions to simplify the use of files will be moved. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
2023-02-23 01:01:27 +08:00
src/file_utils.c
elf_file: Set of new functions for reading elf files A structure was created to represent a file, a section and a strings section. Created a new functions to read a elf file, retrieve a section header based on index or name, read a section contents based on a header or name, retrieve section name and functions that print file, section and program headers. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
2023-03-31 19:10:10 +08:00
src/elf_file.c
Switch to new elf reader and module parse functions. Moved the module information to the new module structure. Used new functions to parse module. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
2023-03-31 19:15:35 +08:00
src/module.c
config: Add configuration file parsing interface This allow to add new platform with old version of rimage tool. Default values are easily to define for any fields, so fields duplication in config files should be reduced. Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
2020-09-07 23:20:08 +08:00
tomlc99/toml.c
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
)
Update to C99 standard to match SOF. Silenced warning generated by newest GCC compiler related to int cast of char typed values that may result in negative values. Syntax fix in linkage of crypto library to more generic approach.
2022-01-20 22:24:06 +08:00
set_property(TARGET rimage PROPERTY C_STANDARD 99)
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
target_compile_options(rimage PRIVATE
cmake: drop binutils-specific '-Wl,-EL' option Fixes clang failure: clang: error: -Wl,-EL: 'linker' input unused [-Werror,-Wunused-command-line-argument] -EL has an effect only when using OUTPUT_FORMAT or --oformat but rimage uses neither. The binaries produced by ld version 2.34 are strictly identical before and after this removal. It is not clear why -EL was ever added. It was added to src/Makefile.am by commit 0d33e8743386 and to src/CMakeLists.txt by commit 4e3ead009638 but these commits were initial additions of the entire files and they did not get into detail. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2021-10-24 16:08:08 +08:00
-Wall -Werror -Wmissing-prototypes -Wimplicit-fallthrough
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
)
Update to C99 standard to match SOF. Silenced warning generated by newest GCC compiler related to int cast of char typed values that may result in negative values. Syntax fix in linkage of crypto library to more generic approach.
2022-01-20 22:24:06 +08:00
if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 9.1)
target_compile_options(rimage PRIVATE -Wno-char-subscripts)
endif()
Added handling of OpenSSL on Windows with MSYS2 Added new MSYS_INSTALL_DIR variable that points to MSYS2 installation for Windows users. It is used to include POSIX native headers from /usr/include also required openssl headers. Signed-off-by: Andrey Borisovich <andrey.borisovich@intel.com>
2022-01-26 17:52:36 +08:00
# Windows builds use MSYS2 https://www.msys2.org/ to get linux tools and headers.
# MSYS_INSTALL_DIR variable points to MSYS2 installation directory.
# You may pass it as environmental or cmake configure variable.
if(${CMAKE_HOST_WIN32})
cmake_minimum_required(VERSION 3.20)
if(DEFINED ENV{MSYS_INSTALL_DIR} AND NOT MSYS_INSTALL_DIR)
set(MSYS_INSTALL_DIR $ENV{MSYS_INSTALL_DIR})
endif()
if(MSYS_INSTALL_DIR)
cmake_path(IS_ABSOLUTE MSYS_INSTALL_DIR IS_MSYS_INSTALL_DIR_ABSOLUTE)
if(NOT IS_MSYS_INSTALL_DIR_ABSOLUTE)
message(FATAL_ERROR "Please provide absolute path to MSYS2 installation
setting MSYS_INSTALL_DIR env variable")
endif()
# Include standard posix headers. Requires pacman openssl-devel package.
cmake_path(APPEND MSYS_INSTALL_DIR "usr" "include" OUTPUT_VARIABLE MSYS_SYSTEM_INCLUDE_PATH)
target_include_directories(rimage PRIVATE "${MSYS_SYSTEM_INCLUDE_PATH}")
endif()
endif()
Update to C99 standard to match SOF. Silenced warning generated by newest GCC compiler related to int cast of char typed values that may result in negative values. Syntax fix in linkage of crypto library to more generic approach.
2022-01-20 22:24:06 +08:00
target_link_libraries(rimage PRIVATE crypto)
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
target_include_directories(rimage PRIVATE
headers: Use full path to header Path added to include should end at 'include' as usual, then it is easy to see where specific headers comes from during reading source code. It is especially important for projects composed from a few parts, like firmware, driver, build and debug tools in this project. Moreover changed "" to <> in include directives because there is specified full path to file from project include root and to be aligned with code style from firmware repository, Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
2020-05-13 22:03:34 +08:00
src/include/
config: Add configuration file parsing interface This allow to add new platform with old version of rimage tool. Default values are easily to define for any fields, so fields duplication in config files should be reduced. Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
2020-09-07 23:20:08 +08:00
tomlc99/
Use CMake to build rimage This adds the necessary bits to allow building rimage with CMake with similar configure options as the just removed autotools files. Also update README.md for new build instructions. Signed-off-by: Daniel Leung <danielcp@gmail.com>
2020-03-26 01:16:03 +08:00
)