blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-06 22:59:09 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_15401' into 'master'

Browse Source 
Fix idf_as_lib example (GitHub PR)

Closes IDFGH-14655

See merge request espressif/esp-idf!37127
This commit is contained in:
Frantisek Hrbata 2025-02-27 15:00:12 +08:00
commit 4f968c3fc5
10 changed files with 51 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/build_system/cmake/idf_as_lib/build-esp32p4.sh
View File

@ -1,17 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
PARAM=""
# Retrive the target from the current filename, if no target specified,
# the variable will be empty
TARGET=$(echo $0 | cut -s -f2 -d- | cut -s -f1 -d.)
if [[ -n $TARGET ]]
then
# Target is not null, specify the build parameters
PARAM="-DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-${TARGET}.cmake -DTARGET=${TARGET} -GNinja"
fi
rm -rf build && mkdir build && cd build
cmake .. $PARAM
cmake --build .

1
examples/build_system/cmake/idf_as_lib/build-esp32p4.sh Symbolic link
View File

@ -0,0 +1 @@
build.sh

4
examples/build_system/cmake/idf_as_lib/run-esp32p4.sh
View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
cd build
python $IDF_PATH/components/esptool_py/esptool/esptool.py -p $1 write_flash @flash_project_args
python -m esp_idf_monitor -p $1 idf_as_lib.elf

1
examples/build_system/cmake/idf_as_lib/run-esp32p4.sh Symbolic link
View File

@ -0,0 +1 @@
run-esp32.sh

4
examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
View File

@ -1,5 +1,3 @@
add_library(stub_esp32 STATIC system_api.c flash_ops.c cpu_start.c)
add_library(stub_esp32 STATIC system_api.c cpu_start.c)
target_include_directories(stub_esp32 PUBLIC .)
add_library(stub::esp32 ALIAS stub_esp32)
target_link_libraries(stub_esp32 stub::spi_flash)

4
examples/build_system/cmake/idf_as_lib/stubs/esp32/esp_system.h
View File

@ -9,6 +9,10 @@
extern "C" {
#endif
#define ESP_OK 0 /*!< esp_err_t value indicating success (no error) */
typedef int esp_err_t;
void esp_restart(void);
#ifdef __cplusplus

10
examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c
View File

@ -1,10 +0,0 @@
/*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
int spi_flash_get_chip_size(void)
{
return (1024 * 1024 * 1024);
}

5
examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
View File

@ -1,3 +1,4 @@
add_library(stub_spi_flash INTERFACE)
target_include_directories(stub_spi_flash INTERFACE .)
add_library(stub_spi_flash STATIC flash_ops.c)
target_include_directories(stub_spi_flash PUBLIC .)
add_library(stub::spi_flash ALIAS stub_spi_flash)
target_link_libraries(stub_spi_flash PUBLIC stub_esp32)

22
examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_flash.h Normal file
View File

@ -0,0 +1,22 @@
/*
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
#pragma once
#include <stdint.h>
#include "esp_system.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void * esp_flash_t;
esp_err_t esp_flash_get_size(esp_flash_t *chip, uint32_t *out_size);
#ifdef __cplusplus
}
#endif

19
examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h
View File

@ -1,19 +0,0 @@
/*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
#pragma once
#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
int spi_flash_get_chip_size(void);
#ifdef __cplusplus
}
#endif

13
examples/build_system/cmake/idf_as_lib/stubs/spi_flash/flash_ops.c Normal file
View File

@ -0,0 +1,13 @@
/*
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
#include "esp_flash.h"
esp_err_t esp_flash_get_size(esp_flash_t *chip, uint32_t *out_size)
{
*out_size = 1024 * 1024 * 1024;
return ESP_OK;
}

9
tools/test_build_system/test_cmake.py
View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import logging
import os
@ -16,14 +16,17 @@ from test_build_system_helpers import run_cmake_and_build
def test_build_custom_cmake_project(test_app_copy: Path) -> None:
# Test is compatible with any target. Random targets in the list are selected for performance reasons
for target in ['esp32', 'esp32s3', 'esp32c6', 'esp32h2']:
idf_path = Path(os.environ['IDF_PATH'])
for target in ['esp32','esp32c2','esp32c3','esp32c6','esp32h2','esp32p4','esp32s2','esp32s3']:
logging.info(f'Test build ESP-IDF as a library to a custom CMake projects for {target}')
idf_path = Path(os.environ['IDF_PATH'])
run_cmake_and_build(str(idf_path / 'examples' / 'build_system' / 'cmake' / 'idf_as_lib'), '-G', 'Ninja',
'-DCMAKE_TOOLCHAIN_FILE={}'.format(idf_path / 'tools' / 'cmake' / f'toolchain-{target}.cmake'), f'-DTARGET={target}')
assert file_contains((test_app_copy / 'build' / 'compile_commands.json'), '"command"')
shutil.rmtree(test_app_copy / 'build')
logging.info(f'Test build ESP-IDF as a library to a custom CMake projects for host')
run_cmake_and_build(str(idf_path / 'examples' / 'build_system' / 'cmake' / 'idf_as_lib'), '-G', 'Ninja')
def test_build_cmake_library_psram_workaround(test_app_copy: Path) -> None:
logging.info('Building a project with CMake library imported and PSRAM workaround, all files compile with workaround')