adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

modules: hal_rpi_pico: Update to fit for 2.0.0 directory structure

Browse source 
The directory structure has changed in 2.0.0,
so we update it accordingly.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
This commit is contained in:
TOKITA Hiroshi 2024-08-09 22:56:51 +09:00 committed by Anas Nashif
parent dccf4bfb0f
commit 6a2aafe286
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
modules/hal_rpi_pico/CMakeLists.txt
View file

@ -8,7 +8,7 @@ if(CONFIG_HAS_RPI_PICO)
set(rp2_common_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/rp2_common)
set(rp2040_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/rp2040)
set(common_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/common)
set(boot_stage_dir ${rp2_common_dir}/boot_stage2)
set(boot_stage_dir ${rp2040_dir}/boot_stage2)
# The Second Stage Bootloader is only linked to the app that resides
# at 0x100. Therefore, only if the app's offset is 0x100, the second
@ -46,6 +46,8 @@ if(CONFIG_HAS_RPI_PICO)
zephyr_library_sources(${rp2_bootloader_asm})
endif()
zephyr_compile_definitions(PICO_RP2040)
# Pico sources and headers necessary for every build.
# These contain definitions and implementation used mostly for
# initializing the SoC, and therefore are always required.
@ -55,11 +57,12 @@ if(CONFIG_HAS_RPI_PICO)
${rp2_common_dir}/hardware_pll/pll.c
${rp2_common_dir}/hardware_xosc/xosc.c
${rp2_common_dir}/hardware_watchdog/watchdog.c
${rp2_common_dir}/pico_platform/platform.c
${rp2_common_dir}/pico_bootrom/bootrom.c
${rp2040_dir}/pico_platform/platform.c
)
zephyr_include_directories(
${common_dir}/pico_base_headers/include
${rp2_common_dir}/hardware_base/include
${rp2_common_dir}/hardware_clocks/include
${rp2_common_dir}/hardware_watchdog/include
@ -69,11 +72,18 @@ if(CONFIG_HAS_RPI_PICO)
${rp2_common_dir}/hardware_sync/include
${rp2_common_dir}/hardware_timer/include
${rp2_common_dir}/hardware_resets/include
${rp2_common_dir}/hardware_boot_lock/include
${rp2_common_dir}/hardware_ticks/include
${rp2_common_dir}/hardware_sync_spin_lock/include
${rp2_common_dir}/pico_bootrom/include
${rp2_common_dir}/pico_platform_compiler/include
${rp2_common_dir}/pico_platform_sections/include
${rp2_common_dir}/pico_platform_panic/include
${common_dir}/boot_picoboot_headers/include
${common_dir}/boot_picobin_headers/include
${rp2040_dir}/hardware_regs/include
${rp2040_dir}/hardware_structs/include
${common_dir}/pico_base/include
${rp2_common_dir}/pico_platform/include
${rp2040_dir}/pico_platform/include
${CMAKE_CURRENT_LIST_DIR}
)
@ -108,16 +118,16 @@ if(CONFIG_HAS_RPI_PICO)
zephyr_include_directories_ifdef(CONFIG_PICOSDK_USE_TIMER
${rp2_common_dir}/hardware_timer/include)
zephyr_library_sources_ifdef(CONFIG_PICOSDK_USE_CLAIM
${rp2_common_dir}/hardware_claim/claim.c)
zephyr_include_directories_ifdef(CONFIG_PICOSDK_USE_CLAIM
${rp2_common_dir}/hardware_claim/include)
zephyr_library_sources_ifdef(CONFIG_PICOSDK_USE_RTC
${rp2_common_dir}/hardware_rtc/rtc.c)
zephyr_include_directories_ifdef(CONFIG_PICOSDK_USE_RTC
${rp2_common_dir}/hardware_rtc/include)
zephyr_library_sources_ifdef(CONFIG_PICOSDK_USE_PIO
${rp2_common_dir}/hardware_pio/pio.c)
zephyr_include_directories_ifdef(CONFIG_PICOSDK_USE_PIO
${rp2_common_dir}/hardware_pio/include)
# Some flash driver functions must be executed from the RAM.
# Originally pico-sdk places them in the RW data section, so this
# implementation does the same.
@ -130,14 +140,9 @@ if(CONFIG_HAS_RPI_PICO)
COMPILE_FLAGS $<TARGET_PROPERTY:compiler,warning_no_pointer_arithmetic>
)
zephyr_library_sources_ifdef(CONFIG_PICOSDK_USE_PIO
${rp2_common_dir}/hardware_pio/pio.c)
zephyr_include_directories_ifdef(CONFIG_PICOSDK_USE_PIO
${rp2_common_dir}/hardware_pio/include)
zephyr_library_sources_ifdef(CONFIG_PICOSDK_USE_CLAIM
${rp2_common_dir}/hardware_claim/claim.c)
${common_dir}/hardware_claim/claim.c)
zephyr_include_directories_ifdef(CONFIG_PICOSDK_USE_CLAIM
${rp2_common_dir}/hardware_claim/include)
${common_dir}/hardware_claim/include)
endif()

9
modules/hal_rpi_pico/bootloader/CMakeLists.txt
View file

@ -11,7 +11,7 @@ enable_language(ASM)
set(rp2_common_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/rp2_common)
set(rp2040_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/rp2040)
set(common_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/common)
set(boot_stage_dir ${rp2_common_dir}/boot_stage2)
set(boot_stage_dir ${rp2040_dir}/boot_stage2)
add_executable(boot_stage2)
@ -34,9 +34,12 @@ target_sources(boot_stage2 PRIVATE ${boot_stage_dir}/${flash_type_file})
target_include_directories(boot_stage2 PUBLIC
..
${boot_stage_dir}/asminclude
${rp2_common_dir}/pico_platform/include
${rp2040_dir}/pico_platform/include
${rp2040_dir}/hardware_regs/include
${common_dir}/pico_base/include
${common_dir}/pico_base_headers/include
${rp2_common_dir}/pico_platform_compiler/include
${rp2_common_dir}/pico_platform_sections/include
${rp2_common_dir}/pico_platform_panic/include
${ZEPHYR_BASE}/include
)