diff --git a/BUILD.bazel b/BUILD.bazel index b0c729ed..f8e32585 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("@rules_cc//cc:cc_library.bzl", "cc_library") load("//bazel:defs.bzl", "otp_header_parse", "picotool_binary_data_header") package(default_visibility = ["//visibility:public"]) @@ -67,9 +69,9 @@ cc_library( name = "enc_bootloader", srcs = ["get_enc_bootloader.cpp"], hdrs = [ - "get_enc_bootloader.h", "enc_bootloader_elf.h", "enc_bootloader_mbedtls_elf.h", + "get_enc_bootloader.h", ], deps = [ "//bazel:data_locs", @@ -97,11 +99,11 @@ cc_binary( srcs = [ "cli.h", "clipp/clipp.h", + "get_enc_bootloader.cpp", + "get_xip_ram_perms.cpp", "main.cpp", "otp.cpp", "otp.h", - "get_xip_ram_perms.cpp", - "get_enc_bootloader.cpp", ] + select({ # MSVC can't handle long strings, so use this manually generated # header instead. @@ -136,8 +138,8 @@ cc_binary( "//conditions:default": [], }), deps = [ - ":xip_ram_perms", ":enc_bootloader", + ":xip_ram_perms", "//bazel:data_locs", "//bintool", "//elf", diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel index 9504a733..2d7e27d2 100644 --- a/bazel/BUILD.bazel +++ b/bazel/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") load("@rules_python//python:defs.bzl", "py_binary") package(default_visibility = ["//:__subpackages__"]) diff --git a/bazel/mbedtls.BUILD b/bazel/mbedtls.BUILD index 1c9fa43c..080e51e2 100644 --- a/bazel/mbedtls.BUILD +++ b/bazel/mbedtls.BUILD @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/bintool/BUILD.bazel b/bintool/BUILD.bazel index a9f49619..8ec1cb6c 100644 --- a/bintool/BUILD.bazel +++ b/bintool/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/elf/BUILD.bazel b/elf/BUILD.bazel index 0fd1aef0..1e4e6521 100644 --- a/elf/BUILD.bazel +++ b/elf/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( @@ -15,5 +17,8 @@ cc_library( ], }), includes = ["."], - deps = ["//model", "//errors"], + deps = [ + "//errors", + "//model", + ], ) diff --git a/elf2uf2/BUILD.bazel b/elf2uf2/BUILD.bazel index ef3288cf..ba9b3dbe 100644 --- a/elf2uf2/BUILD.bazel +++ b/elf2uf2/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/enc_bootloader/BUILD.bazel b/enc_bootloader/BUILD.bazel index ba986770..1ebc40c0 100644 --- a/enc_bootloader/BUILD.bazel +++ b/enc_bootloader/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) filegroup( @@ -17,7 +19,7 @@ cc_library( tags = ["manual"], deps = [ "//:enc_bootloader", - "@pico-sdk//src/rp2_common/pico_stdlib", "@pico-sdk//src/rp2_common/pico_rand", + "@pico-sdk//src/rp2_common/pico_stdlib", ], ) diff --git a/errors/BUILD.bazel b/errors/BUILD.bazel index c27e4477..c6405648 100644 --- a/errors/BUILD.bazel +++ b/errors/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 0d9fcde1..10c33740 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -1,6 +1,11 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + cc_library( name = "mbedtls_config", - hdrs = ["include/mbedtls_config.h", "include/picotool_mbedtls_config.h"], + hdrs = [ + "include/mbedtls_config.h", + "include/picotool_mbedtls_config.h", + ], includes = ["include"], visibility = ["@mbedtls//:__subpackages__"], ) diff --git a/lib/nlohmann_json/BUILD.bazel b/lib/nlohmann_json/BUILD.bazel index 1060277d..1a693015 100644 --- a/lib/nlohmann_json/BUILD.bazel +++ b/lib/nlohmann_json/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/lib/whereami/BUILD.bazel b/lib/whereami/BUILD.bazel index 64ed232f..0c3b9ff9 100644 --- a/lib/whereami/BUILD.bazel +++ b/lib/whereami/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/model/BUILD.bazel b/model/BUILD.bazel index 7b86451b..43ced782 100644 --- a/model/BUILD.bazel +++ b/model/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( @@ -15,8 +17,8 @@ cc_library( includes = ["."], deps = [ "//errors", - "@pico-sdk//src/common/boot_uf2_headers", "@pico-sdk//src/common/boot_picoboot_headers", + "@pico-sdk//src/common/boot_uf2_headers", ], ) diff --git a/otp_header_parser/BUILD.bazel b/otp_header_parser/BUILD.bazel index fdf04f10..a8699e1c 100644 --- a/otp_header_parser/BUILD.bazel +++ b/otp_header_parser/BUILD.bazel @@ -1,9 +1,12 @@ +load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( name = "pre_generated_otp_header", - includes = ["."], hdrs = ["rp2350.json.h"], + includes = ["."], ) cc_binary( diff --git a/picoboot_connection/BUILD.bazel b/picoboot_connection/BUILD.bazel index f86b39d9..1f5b557a 100644 --- a/picoboot_connection/BUILD.bazel +++ b/picoboot_connection/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) cc_library( diff --git a/xip_ram_perms/BUILD.bazel b/xip_ram_perms/BUILD.bazel index 8daeca07..4e1b1b76 100644 --- a/xip_ram_perms/BUILD.bazel +++ b/xip_ram_perms/BUILD.bazel @@ -1,3 +1,5 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) filegroup(