x

zephyrproject-rtos · Sep 25, 2024 · e0cbdf6 · e0cbdf6
1 parent f70eb0d
commit e0cbdf6
Show file tree

Hide file tree

Showing 5 changed files with 197 additions and 85 deletions.
diff --git a/modules/hal_rpi_pico/CMakeLists.txt b/modules/hal_rpi_pico/CMakeLists.txt
@@ -8,7 +8,7 @@ if(CONFIG_HAS_RPI_PICO)
   set(rp2_common_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/rp2_common)
   set(rp2xxx_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/${CONFIG_SOC_SERIES})
   set(common_dir ${ZEPHYR_HAL_RPI_PICO_MODULE_DIR}/src/common)
-  set(boot_stage_dir ${rp2xxx_dir}/boot_stage2)
+  set(boot_stage2_dir ${rp2xxx_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
@@ -91,7 +91,7 @@ if(CONFIG_HAS_RPI_PICO)
     ${rp2xxx_dir}/hardware_regs/include
     ${rp2xxx_dir}/hardware_structs/include
     ${rp2xxx_dir}/pico_platform/include
-    ${boot_stage_dir}/include
+    ${boot_stage2_dir}/include
     ${CMAKE_CURRENT_LIST_DIR}
   )
 

diff --git a/soc/raspberrypi/rpi_pico/common/CMakeLists.txt b/soc/raspberrypi/rpi_pico/common/CMakeLists.txt
@@ -6,3 +6,16 @@ zephyr_include_directories(.)
 zephyr_sources(
 	soc.c
 )
+
+zephyr_library_sources_ifdef(CONFIG_RP2_BINARY_INFO
+	binary_info.c
+	binary_info_header.S
+)
+
+zephyr_linker_sources_ifdef(CONFIG_RP2_BINARY_INFO
+	ROM_START SORT_KEY 0x0binary_info_header binary_info_header.ld
+)
+
+zephyr_linker_sources_ifdef(CONFIG_RP2_BINARY_INFO
+	RODATA binary_info.ld
+)
diff --git a/soc/raspberrypi/rpi_pico/common/Kconfig b/soc/raspberrypi/rpi_pico/common/Kconfig
@@ -0,0 +1,3 @@
+config RP2_BINARY_INFO
+	bool ""
+	default y