Update submodules
- Switch to importing pigweed-experimental modules.gni
- Remove picotool from bootstrap. It requires libusb on the host
machine which can fail on MacOS and Windows.
Change-Id: Icb8de18e4150c26be76801b39255c79865ada44b
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/kudzu/+/171772
Reviewed-by: Erik Gilling <konkers@google.com>
diff --git a/build_overrides/pigweed.gni b/build_overrides/pigweed.gni
index cac1739..07aa675 100644
--- a/build_overrides/pigweed.gni
+++ b/build_overrides/pigweed.gni
@@ -20,134 +20,6 @@
# Upstream Pigweed modules.
import("$dir_pigweed/modules.gni")
-
# Experimental modules.
-declare_args() {
- dir_app_common =
- get_path_info("$dir_pigweed_experimental/applications/app_common",
- "abspath")
- dir_pw_async_bench =
- get_path_info("$dir_pigweed_experimental/pw_async_bench", "abspath")
- dir_pw_board_led =
- get_path_info("$dir_pigweed_experimental/pw_board_led", "abspath")
- dir_pw_board_led_arduino =
- get_path_info("$dir_pigweed_experimental/pw_board_led_arduino", "abspath")
- dir_pw_board_led_host =
- get_path_info("$dir_pigweed_experimental/pw_board_led_host", "abspath")
- dir_pw_board_led_mimxrt595_evk =
- get_path_info("$dir_pigweed_experimental/pw_board_led_mimxrt595_evk",
- "abspath")
- dir_pw_board_led_pico =
- get_path_info("$dir_pigweed_experimental/pw_board_led_pico", "abspath")
- dir_pw_board_led_stm32f429i_disc1 =
- get_path_info("$dir_pigweed_experimental/pw_board_led_stm32f429i_disc1",
- "abspath")
- dir_pw_board_led_stm32f769i_disc0 =
- get_path_info("$dir_pigweed_experimental/pw_board_led_stm32f769i_disc0",
- "abspath")
- dir_pw_board_led_stm32cube =
- get_path_info("$dir_pigweed_experimental/pw_board_led_stm32cube",
- "abspath")
- dir_pw_color =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_color", "abspath")
- dir_pw_math =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_math", "abspath")
- dir_pw_digital_io_arduino =
- get_path_info("$dir_pigweed_experimental/pw_digital_io_arduino",
- "abspath")
- dir_pw_digital_io_pico =
- get_path_info("$dir_pigweed_experimental/pw_digital_io_pico", "abspath")
- dir_pw_digital_io_stm32cube =
- get_path_info("$dir_pigweed_experimental/pw_digital_io_stm32cube",
- "abspath")
- dir_pw_display =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_display",
- "abspath")
- dir_pw_display_driver =
- get_path_info("$dir_pigweed_experimental/pw_display_driver", "abspath")
- dir_pw_display_driver_ili9341 =
- get_path_info("$dir_pigweed_experimental/pw_display_driver_ili9341",
- "abspath")
- dir_pw_display_driver_imgui =
- get_path_info("$dir_pigweed_experimental/pw_display_driver_imgui",
- "abspath")
- dir_pw_display_driver_mipi_dsi =
- get_path_info("$dir_pigweed_experimental/pw_display_driver_mipi",
- "abspath")
- dir_pw_display_driver_null =
- get_path_info("$dir_pigweed_experimental/pw_display_driver_null",
- "abspath")
- dir_pw_display_driver_st7735 =
- get_path_info("$dir_pigweed_experimental/pw_display_driver_st7735",
- "abspath")
- dir_pw_display_driver_st7789 =
- get_path_info("$dir_pigweed_experimental/pw_display_driver_st7789",
- "abspath")
- dir_pw_display_imgui =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_display_imgui",
- "abspath")
- dir_pw_draw =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_draw", "abspath")
- dir_pw_framebuffer =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_framebuffer",
- "abspath")
- dir_pw_framebuffer_pool =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_framebuffer_pool",
- "abspath")
- dir_pw_framebuffer_pool_mcuxpresso = get_path_info(
- "$dir_pigweed_experimental/pw_graphics/pw_framebuffer_pool_mcuxpresso",
- "abspath")
- dir_pw_mipi_dsi =
- get_path_info("$dir_pigweed_experimental/pw_mipi_dsi", "abspath")
- dir_pw_mipi_dsi_mcuxpresso =
- get_path_info("$dir_pigweed_experimental/pw_mipi_dsi_mcuxpresso",
- "abspath")
- dir_pw_spi_arduino =
- get_path_info("$dir_pigweed_experimental/pw_spi_arduino", "abspath")
- dir_pw_spi_pico =
- get_path_info("$dir_pigweed_experimental/pw_spi_pico", "abspath")
- dir_pw_spi_stm32cube =
- get_path_info("$dir_pigweed_experimental/pw_spi_stm32cube", "abspath")
- dir_pw_spin_delay =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay", "abspath")
- dir_pw_spin_delay_arduino =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_arduino",
- "abspath")
- dir_pw_spin_delay_host =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_host", "abspath")
- dir_pw_spin_delay_mcuxpresso =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_mcuxpresso",
- "abspath")
- dir_pw_spin_delay_pico =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_pico", "abspath")
- dir_pw_spin_delay_stm32f429i_disc1 =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_stm32f429i_disc1",
- "abspath")
- dir_pw_spin_delay_stm32cube =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_stm32cube",
- "abspath")
- dir_pw_spin_delay_stm32f769i_disc0 =
- get_path_info("$dir_pigweed_experimental/pw_spin_delay_stm32f769i_disc0",
- "abspath")
- dir_pw_sys_io_baremetal_stm32f769 =
- get_path_info("$dir_pigweed_experimental/pw_sys_io_baremetal_stm32f769",
- "abspath")
- dir_pw_touchscreen =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_touchscreen",
- "abspath")
- dir_pw_touchscreen_null =
- get_path_info("$dir_pigweed_experimental/pw_graphics/pw_touchscreen_null",
- "abspath")
- dir_pw_touchscreen_teensy_stmpe610 = get_path_info(
- "$dir_pigweed_experimental/pw_graphics/pw_touchscreen_teensy_stmpe610",
- "abspath")
- dir_pw_touchscreen_teensy_xpt2046 =
- get_path_info(
- "$dir_pigweed_experimental/pw_graphics/pw_touchscreen_teensy_xpt2046",
- "abspath")
- dir_pw_pixel_pusher =
- get_path_info("$dir_pigweed_experimental/pw_pixel_pusher", "abspath")
- dir_pw_pixel_pusher_rp2040_pio =
- get_path_info("$dir_pigweed_experimental/pw_pixel_pusher_rp2040_pio",
- "abspath")
-}
+import("$dir_pigweed_experimental/build_overrides/modules.gni")
+
diff --git a/pigweed.json b/pigweed.json
index 40aa637..bb4fe76 100644
--- a/pigweed.json
+++ b/pigweed.json
@@ -57,8 +57,7 @@
"pw_packages": [
"glfw",
"imgui",
- "pico_sdk",
- "picotool"
+ "pico_sdk"
]
}
}
diff --git a/third_party/pigweed b/third_party/pigweed
index de3b1ca..609e4e5 160000
--- a/third_party/pigweed
+++ b/third_party/pigweed
@@ -1 +1 @@
-Subproject commit de3b1ca6a8cae370fe6c5fb925a1a712633198a2
+Subproject commit 609e4e5df3ed64cb0a2b8606d237ac2414569571
diff --git a/third_party/pigweed-experimental b/third_party/pigweed-experimental
index 77250a2..d720456 160000
--- a/third_party/pigweed-experimental
+++ b/third_party/pigweed-experimental
@@ -1 +1 @@
-Subproject commit 77250a232c0509293c3db878a652a7602c841c0f
+Subproject commit d72045614b80bce0d2c1abbb6cfbc4017af4b195
