third_party/pico_sdk: Minor build file fixes

Fixes missing imports and invalid GN targets. Change-Id: I93ad0d6958b133bf3068ef9f1cd364de3f3e0b34 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/110635 Reviewed-by: Anthony DiGirolamo <tonymd@google.com> Pigweed-Auto-Submit: Armando Montanez <amontanez@google.com> Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
google · Sep 16, 2022 · 2e7d5a2 · 2e7d5a2
1 parent 02abd92
commit 2e7d5a2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/third_party/pico_sdk/src/common/BUILD.gn b/third_party/pico_sdk/src/common/BUILD.gn
@@ -12,6 +12,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+import("//build_overrides/pi_pico.gni")
+
 group("common") {
   public_deps = [
     "boot_picoboot",

diff --git a/third_party/pico_sdk/src/rp2_common/BUILD.gn b/third_party/pico_sdk/src/rp2_common/BUILD.gn
@@ -12,6 +12,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+import("//build_overrides/pi_pico.gni")
+
 group("rp2_common") {
   public_deps = [
     "hardware_adc",

diff --git a/third_party/pico_sdk/src/rp2_common/pico_bootsel_via_double_reset/BUILD.gn b/third_party/pico_sdk/src/rp2_common/pico_bootsel_via_double_reset/BUILD.gn
@@ -25,8 +25,8 @@ pw_source_set("pico_bootsel_via_double_reset") {
   deps = [
     "${PICO_ROOT}/src/common/pico_base",
     "${PICO_ROOT}/src/common/pico_binary_info",
+    "${PICO_ROOT}/src/common/pico_time",
     "${PICO_ROOT}/src/rp2_common/pico_bootrom",
-    "${PICO_ROOT}/src/rp2_common/pico_time",
   ]
   sources = [ "${_CWD}/pico_bootsel_via_double_reset.c" ]
 }
diff --git a/third_party/pico_sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/BUILD.gn b/third_party/pico_sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/BUILD.gn
@@ -30,9 +30,9 @@ pw_source_set("rp2040_usb_device_enumeration") {
   public_configs = [ ":public_include_dirs" ]
   deps = [
     "${PICO_ROOT}/src/common/pico_base",
+    "${PICO_ROOT}/src/common/pico_time",
     "${PICO_ROOT}/src/rp2040/hardware_structs",
     "${PICO_ROOT}/src/rp2_common/hardware_gpio",
-    "${PICO_ROOT}/src/rp2_common/pico_time",
   ]
   public = [ "${_CWD}/include/pico/fix/rp2040_usb_device_enumeration.h" ]
   sources = [ "${_CWD}/rp2040_usb_device_enumberation.c" ]