Skip to content

Commit 3fadd74

Browse files
committed
Move root-level tooling and signing into target/earlgrey
Move the tooling and signing subdirectories into `//target/earlgrey` as they are specific to the earlgrey target. Signed-off-by: Chris Frantz <[email protected]>
1 parent edafff0 commit 3fadd74

24 files changed

+25
-36
lines changed

.gitignore

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@ user.bazelrc
3434
pw_console-*logs.txt
3535
.pw_console.user.yaml
3636

37-
# Rust build artifacts
38-
/target/
39-
**/target/
4037

41-
# Generated by Cargo
42-
# will have compiled files and executables
43-
debug/
44-
target/
4538

4639
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
4740
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
@@ -105,7 +98,6 @@ doc/
10598

10699
# Generated by mdbook
107100
book/
108-
target/book/
109101

110102
# Backup files
111103
*.bak
@@ -115,9 +107,6 @@ target/book/
115107
*.tmp
116108
*.temp
117109

118-
# Distribution
119-
dist/
120-
target/dist/
121110

122111
# Local configuration
123112
.cargo/config

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ archive_override(
8585
url = "https://storage.googleapis.com/artifacts.opentitan.org/dev_bundle/devbundle-test-20251105.tar.xz",
8686
)
8787

88-
nonhermetic_repo = use_repo_rule("//tooling/signing:nonhermetic.bzl", "nonhermetic_repo")
88+
nonhermetic_repo = use_repo_rule("//target/earlgrey/tooling/signing:nonhermetic.bzl", "nonhermetic_repo")
8989

9090
nonhermetic_repo(name = "nonhermetic")
9191

target/earlgrey/ipc/user/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ load("@pigweed//pw_kernel/tooling:target_codegen.bzl", "target_codegen")
1717
load("@pigweed//pw_kernel/tooling:target_linker_script.bzl", "target_linker_script")
1818
load("@pigweed//pw_kernel/tooling/panic_detector:rust_binary_no_panics_test.bzl", "rust_binary_no_panics_test")
1919
load("@rules_rust//rust:defs.bzl", "rust_binary")
20-
load("//signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY")
20+
load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY")
2121
load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH")
22-
load("//tooling:opentitan_runner.bzl", "opentitan_runner", "opentitan_test")
22+
load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_runner", "opentitan_test")
2323

2424
system_image(
2525
name = "ipc",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# License for the specific language governing permissions and limitations under
1313
# the License.
1414

15-
load("//tooling/signing:defs.bzl", "keyset")
15+
load("//target/earlgrey/tooling/signing:defs.bzl", "keyset")
1616

1717
package(default_visibility = ["//visibility:public"])
1818

@@ -26,7 +26,7 @@ keyset(
2626
"@opentitan_devbundle//:fake_keys/app_test_ecdsa_p256.der": "app_test_0",
2727
},
2828
profile = "local",
29-
tool = "//signing/tokens:local",
29+
tool = "//target/earlgrey/signing/tokens:local",
3030
)
3131

3232
# Keys held in CloudKMS to sign for the Google Bringup SKU of the Earlgrey ASIC.
@@ -46,5 +46,5 @@ keyset(
4646
# "user": "user"
4747
# }
4848
profile = "earlgrey_a1_gb_owner",
49-
tool = "//signing/tokens:cloud_kms_gb",
49+
tool = "//target/earlgrey/signing/tokens:cloud_kms_gb",
5050
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# License for the specific language governing permissions and limitations under
1313
# the License.
1414

15-
FPGA_ECDSA_KEY = {"//signing/keys:fpga_keyset": "app_prod_0"}
16-
SILICON_ECDSA_KEY = {"//signing/keys:gb00_keyset": "gb00-app-key-prod-0"}
15+
FPGA_ECDSA_KEY = {"//target/earlgrey/signing/keys:fpga_keyset": "app_prod_0"}
16+
SILICON_ECDSA_KEY = {"//target/earlgrey/signing/keys:gb00_keyset": "gb00-app-key-prod-0"}
File renamed without changes.
File renamed without changes.
File renamed without changes.

signing/tokens/BUILD.bazel renamed to target/earlgrey/signing/tokens/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# the License.
1414

1515
load("@nonhermetic//:env.bzl", "ENV")
16-
load("//tooling/signing:defs.bzl", "signing_tool")
16+
load("//target/earlgrey/tooling/signing:defs.bzl", "signing_tool")
1717

1818
package(default_visibility = ["//visibility:public"])
1919

File renamed without changes.

0 commit comments

Comments
 (0)