Revert "bootrom build includes pico_bootrom but not bootrom.h which is the only thing which requires pico_flash... slightly hacky fix to not include pico_flash if not available"

kilograham · kilograham · commit 2d60604b6e4d · 2024-08-28T18:51:10.000-05:00
This reverts commit 4bbf701.
diff --git a/src/rp2_common/pico_bootrom/CMakeLists.txt b/src/rp2_common/pico_bootrom/CMakeLists.txt
@@ -9,7 +9,4 @@ target_sources(pico_bootrom INTERFACE
         )
 
 target_link_libraries(pico_bootrom_headers INTERFACE boot_picoboot_headers)
-pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_base hardware_boot_lock)
-if (TARGET pico_flash)
-        pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_flash)
-endif()
+pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_base hardware_boot_lock pico_flash)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,4 @@ target_sources(pico_bootrom INTERFACE`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`target_link_libraries(pico_bootrom_headers INTERFACE boot_picoboot_headers)`
`12`		`-pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_base hardware_boot_lock)`
`13`		`-if (TARGET pico_flash)`
`14`		`- pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_flash)`
`15`		`-endif()`
	`12`	`+pico_mirrored_target_link_libraries(pico_bootrom INTERFACE pico_base hardware_boot_lock pico_flash)`