[bazel] Fix constant exports

`BUILD` files should now be using `defs.bzl` for these, so we don't need to export them from other files too. Signed-off-by: James Wainwright <[email protected]>
lowRISC · Oct 18, 2024 · a9e80a8 · a9e80a8
1 parent 0dd6a4f
commit a9e80a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/rules/opentitan/cc.bzl b/rules/opentitan/cc.bzl
@@ -3,13 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
-load(
-    "@lowrisc_opentitan//rules:rv.bzl",
-    "rv_rule",
-    _OPENTITAN_CPU = "OPENTITAN_CPU",
-    _OPENTITAN_PLATFORM = "OPENTITAN_PLATFORM",
-    _opentitan_transition = "opentitan_transition",
-)
+load("@lowrisc_opentitan//rules:rv.bzl", "rv_rule")
 load("@lowrisc_opentitan//rules:signing.bzl", "sign_binary")
 load("@lowrisc_opentitan//rules/opentitan:exec_env.bzl", "ExecEnvInfo")
 load("@lowrisc_opentitan//rules/opentitan:util.bzl", "get_fallback", "get_override")
@@ -19,12 +13,6 @@ load(
     "obj_transform",
 )
 
-# Re-exports of names from transition.bzl; many files in the repo use opentitan.bzl
-# to get to them.
-OPENTITAN_CPU = _OPENTITAN_CPU
-OPENTITAN_PLATFORM = _OPENTITAN_PLATFORM
-opentitan_transition = _opentitan_transition
-
 def _expand(ctx, name, items):
     """Perform location and make_variable expansion on a list of items.
 

diff --git a/rules/opentitan/defs.bzl b/rules/opentitan/defs.bzl
@@ -57,8 +57,7 @@ load("@bazel_skylib//lib:sets.bzl", "sets")
 # and opentitan_binary rules.
 CLEAR_KEY_SET = {"//signing:none_key": "none_key"}
 
-# Re-exports of names from transition.bzl; many files in the repo use opentitan.bzl
-# to get to them.
+# Re-exports of names from transition.bzl
 OPENTITAN_CPU = _OPENTITAN_CPU
 OPENTITAN_PLATFORM = _OPENTITAN_PLATFORM
 opentitan_transition = _opentitan_transition