Skip to content

Commit 23438d3

Browse files
committed
Moved pico_mbedtls from rp2_common to common
1 parent 66a41a8 commit 23438d3

File tree

13 files changed

+9
-8
lines changed

13 files changed

+9
-8
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ new_git_repository(
120120

121121
new_git_repository(
122122
name = "mbedtls",
123-
build_file = "//src/rp2_common/pico_mbedtls:mbedtls.BUILD",
123+
build_file = "//src/common/pico_mbedtls:mbedtls.BUILD",
124124
commit = "107ea89daaefb9867ea9121002fbbdf926780e98", # keep-in-sync-with-submodule: lib/mbedtls
125125
remote = "https://github.com/Mbed-TLS/mbedtls.git",
126126
)

src/cmake/rp2_common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ if (NOT PICO_BARE_METAL)
2121
pico_add_subdirectory(common/pico_binary_info)
2222
pico_add_subdirectory(common/pico_divider_headers)
2323
pico_add_subdirectory(common/pico_lwip)
24+
pico_add_subdirectory(common/pico_mbedtls)
2425
pico_add_subdirectory(common/pico_sync)
2526
pico_add_subdirectory(common/pico_time)
2627
pico_add_subdirectory(common/pico_util)
@@ -128,7 +129,6 @@ if (NOT PICO_BARE_METAL)
128129
# networking libraries - note dependency order is important
129130
pico_add_subdirectory(rp2_common/pico_btstack)
130131
pico_add_subdirectory(rp2_common/pico_cyw43_driver)
131-
pico_add_subdirectory(rp2_common/pico_mbedtls)
132132
pico_add_subdirectory(rp2_common/pico_cyw43_arch)
133133

134134
pico_add_subdirectory(rp2_common/pico_time_adapter)

src/common/pico_lwip/lwip.BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ cc_library(
3030
+ select({
3131
"@pico-sdk//bazel/constraint:pico_mbedtls_config_unset": [],
3232
"//conditions:default": [
33-
"@pico-sdk//src/rp2_common/pico_mbedtls:pico_mbedtls_library",
33+
"@pico-sdk//src/common/pico_mbedtls:pico_mbedtls_library",
3434
]
3535
})
3636
,
@@ -155,7 +155,7 @@ cc_library(
155155
includes = ["src/apps/altcp_tls"],
156156
deps = [
157157
":pico_lwip_core",
158-
"@pico-sdk//src/rp2_common/pico_mbedtls:pico_mbedtls_config"
158+
"@pico-sdk//src/common/pico_mbedtls:pico_mbedtls_config"
159159
],
160160
)
161161

File renamed without changes.
File renamed without changes.

src/rp2_common/pico_mbedtls/mbedtls.BUILD renamed to src/common/pico_mbedtls/mbedtls.BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cc_library(
1717
includes = ["include"],
1818
target_compatible_with = incompatible_with_config("@pico-sdk//bazel/constraint:pico_mbedtls_config_unset"),
1919
deps = [
20-
"@pico-sdk//src/rp2_common/pico_mbedtls:pico_mbedtls_config",
20+
"@pico-sdk//src/common/pico_mbedtls:pico_mbedtls_config",
2121
"@pico-sdk//bazel/config:PICO_MBEDTLS_CONFIG",
2222
],
2323
)

0 commit comments

Comments
 (0)