diff options
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/common_user_options.cmake | 17 | ||||
| -rw-r--r-- | scripts/cmake/platforms/mps3/sse-310/mps3-sse-310.sct | 7 | ||||
| -rw-r--r-- | scripts/cmake/source_gen_utils.cmake | 22 |
3 files changed, 34 insertions, 12 deletions
diff --git a/scripts/cmake/common_user_options.cmake b/scripts/cmake/common_user_options.cmake index 97e9b40..64b9c74 100644 --- a/scripts/cmake/common_user_options.cmake +++ b/scripts/cmake/common_user_options.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates <open-source-office@arm.com> +# SPDX-FileCopyrightText: Copyright 2021-2022, 2024 Arm Limited and/or its affiliates <open-source-office@arm.com> # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -81,6 +81,21 @@ USER_OPTION(USE_SINGLE_INPUT "Select if a use case should execute using a defaul OFF BOOL) +if (TARGET_PLATFORM STREQUAL mps3) + USER_OPTION(VSI_ENABLED + "Select to use VSI for video streaming" + OFF + BOOL) + + if (VSI_ENABLED) + USER_OPTION(VSI_IMAGE_INPUT + "Use images as input to VSI instead of video" + OFF + BOOL + ) + endif () +endif () + if (NOT TARGET_PLATFORM STREQUAL native) USER_OPTION(CMSIS_SRC_PATH diff --git a/scripts/cmake/platforms/mps3/sse-310/mps3-sse-310.sct b/scripts/cmake/platforms/mps3/sse-310/mps3-sse-310.sct index c49f628..691e6ee 100644 --- a/scripts/cmake/platforms/mps3/sse-310/mps3-sse-310.sct +++ b/scripts/cmake/platforms/mps3/sse-310/mps3-sse-310.sct @@ -1,4 +1,4 @@ -; SPDX-FileCopyrightText: Copyright 2021, 2023 Arm Limited and/or its affiliates <open-source-office@arm.com> +; SPDX-FileCopyrightText: Copyright 2021, 2023-2024 Arm Limited and/or its affiliates <open-source-office@arm.com> ; SPDX-License-Identifier: Apache-2.0 ; ; Licensed under the Apache License, Version 2.0 (the "License"); @@ -42,7 +42,7 @@ LOAD_REGION_0 0x11000000 0x00200000 * (InRoot$$Sections) ; Essentially only RO (code + data) - .ANY (+RO) + .ANY (+RO +RO-DATA) } ;----------------------------------------------------- @@ -51,9 +51,6 @@ LOAD_REGION_0 0x11000000 0x00200000 ;----------------------------------------------------- data.bin 0x110A0000 ALIGN 8 0x00060000 { - ; Any RO-DATA - .ANY (+RO-DATA) - ; Any R/W and/or zero initialised data .ANY(+RW +ZI) } diff --git a/scripts/cmake/source_gen_utils.cmake b/scripts/cmake/source_gen_utils.cmake index 6287cb6..6d65049 100644 --- a/scripts/cmake/source_gen_utils.cmake +++ b/scripts/cmake/source_gen_utils.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021 Arm Limited and/or its affiliates <open-source-office@arm.com> +# SPDX-FileCopyrightText: Copyright 2021, 2024 Arm Limited and/or its affiliates <open-source-office@arm.com> # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,12 +20,21 @@ set(SCRIPTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scripts) # This function generates C++ files for images located in the directory it is # pointed at. NOTE: uses python ############################################################################## -function(generate_images_code input_dir src_out hdr_out img_size) +function(generate_images_code) + set(options GENERATE_FILE_PATHS) + set(oneValueArgs INPUT_DIR SRC_OUT HDR_OUT IMG_SIZE) + cmake_parse_arguments(PARSED "${options}" "${oneValueArgs}" "" ${ARGN}) # Absolute paths for passing into python script - get_filename_component(input_dir_abs ${input_dir} ABSOLUTE) - get_filename_component(src_out_abs ${src_out} ABSOLUTE) - get_filename_component(hdr_out_abs ${hdr_out} ABSOLUTE) + get_filename_component(input_dir_abs ${PARSED_INPUT_DIR} ABSOLUTE) + get_filename_component(src_out_abs ${PARSED_SRC_OUT} ABSOLUTE) + get_filename_component(hdr_out_abs ${PARSED_HDR_OUT} ABSOLUTE) + + if (${PARSED_GENERATE_FILE_PATHS}) + set(GENERATE_FILE_PATHS_ARG "--generate_file_paths") + else () + set(GENERATE_FILE_PATHS_ARG "") + endif () message(STATUS "Generating image files from ${input_dir_abs}") execute_process( @@ -33,7 +42,8 @@ function(generate_images_code input_dir src_out hdr_out img_size) --image_path ${input_dir_abs} --source_folder_path ${src_out_abs} --header_folder_path ${hdr_out_abs} - --image_size ${img_size} ${img_size} + --image_size ${PARSED_IMG_SIZE} ${PARSED_IMG_SIZE} + ${GENERATE_FILE_PATHS_ARG} RESULT_VARIABLE return_code ) if (NOT return_code EQUAL "0") |