[bazel] Move scramble_flash_vmem to cc.bzl

Signed-off-by: James Wainwright <[email protected]>
(cherry picked from commit 5ea5f04)

Author: jwnrt

rules/opentitan/legacy.bzl

@@ -5,6 +5,7 @@
 load(
     "@lowrisc_opentitan//rules/opentitan:transform.bzl",
     "convert_to_vmem",
+    "scramble_flash",
     _obj_transform = "obj_transform",
 )
 load("@lowrisc_opentitan//rules:rv.bzl", "rv_rule")
@@ -79,3 +80,38 @@ vmem_file = rv_rule(
         ),
     },
 )
+
+def _scramble_flash_vmem_impl(ctx):
+    outputs = [scramble_flash(ctx, suffix = "src.vmem")]
+    return [
+        DefaultInfo(
+            files = depset(outputs),
+            data_runfiles = ctx.runfiles(files = outputs),
+        ),
+    ]
+
+scramble_flash_vmem = rv_rule(
+    implementation = _scramble_flash_vmem_impl,
+    attrs = {
+        "src": attr.label(allow_single_file = True),
+        "otp": attr.label(allow_single_file = True),
+        "otp_mmap": attr.label(
+            allow_single_file = True,
+            default = "//hw/ip/otp_ctrl/data:otp_ctrl_mmap.hjson",
+            doc = "OTP memory map configuration HJSON file.",
+        ),
+        "otp_seed": attr.label(
+            default = "//hw/ip/otp_ctrl/data:otp_seed",
+            doc = "Configuration override seed used to randomize OTP netlist constants.",
+        ),
+        "otp_data_perm": attr.label(
+            default = "//hw/ip/otp_ctrl/data:data_perm",
+            doc = "Option to indicate OTP VMEM file bit layout.",
+        ),
+        "_tool": attr.label(
+            default = "@//util/design:gen-flash-img",
+            executable = True,
+            cfg = "exec",
+        ),
+    },
+)

rules/opentitan/transform.bzl

@@ -160,7 +160,7 @@ def scramble_flash(ctx, **kwargs):
         output = "{}.{}".format(name, suffix)
 
     output = ctx.actions.declare_file(output)
-    src = get_override(ctx, "attr.src", kwargs)
+    src = get_override(ctx, "file.src", kwargs)
     otp = get_override(ctx, "file.otp", kwargs)
 
     inputs = [src]

sw/device/silicon_creator/manuf/base/binaries/BUILD

@@ -2,9 +2,8 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 
-load("//rules:opentitan.bzl", "scramble_flash_vmem")
 load("//rules/opentitan:cc.bzl", "exec_env_filegroup")
-load("//rules/opentitan:legacy.bzl", "vmem_file")
+load("//rules/opentitan:legacy.bzl", "scramble_flash_vmem", "vmem_file")
 load("//rules:files.bzl", "copy_files")
 
 package(default_visibility = ["//visibility:public"])
@@ -49,7 +48,7 @@ vmem_file(
 scramble_flash_vmem(
     name = "ft_personalize_sival_silicon_creator_scr_vmem64_signed",
     testonly = True,
-    vmem = ":ft_personalize_sival_silicon_creator_vmem64_signed",
+    src = ":ft_personalize_sival_silicon_creator_vmem64_signed",
 )
 
 filegroup(

sw/device/silicon_creator/rom/e2e/BUILD

@@ -4,8 +4,7 @@
 
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("//rules:const.bzl", "CONST", "hex_digits")
-load("//rules:opentitan.bzl", "scramble_flash_vmem")
-load("//rules/opentitan:legacy.bzl", "vmem_file")
+load("//rules/opentitan:legacy.bzl", "scramble_flash_vmem", "vmem_file")
 load("//rules/opentitan:keyutils.bzl", "ECDSA_ONLY_KEY_STRUCTS")
 load(
     "//rules:otp.bzl",
@@ -249,7 +248,7 @@ opentitan_test(
     scramble_flash_vmem(
         name = "empty_test_slot_{}_{}_corrupted_sim_dv_scr_vmem64_signed".format(slot, key),
         testonly = True,
-        vmem = ":empty_test_slot_{}_{}_corrupted_sim_dv_vmem64_signed".format(slot, key),
+        src = ":empty_test_slot_{}_{}_corrupted_sim_dv_vmem64_signed".format(slot, key),
     )
     for slot in SLOTS
     for key in SIGVERIFY_LC_KEYS

sw/device/silicon_creator/rom/e2e/ate/binaries/BUILD

@@ -2,9 +2,8 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 
-load("//rules:opentitan.bzl", "scramble_flash_vmem")
 load("//rules/opentitan:cc.bzl", "exec_env_filegroup")
-load("//rules/opentitan:legacy.bzl", "vmem_file")
+load("//rules/opentitan:legacy.bzl", "scramble_flash_vmem", "vmem_file")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -44,7 +43,7 @@ _DV_EXEC_ENVS = [
     scramble_flash_vmem(
         name = "ate_gpio_toggle_test_{}_scr_vmem64_signed".format(env),
         testonly = True,
-        vmem = ":ate_gpio_toggle_test_{}_vmem64_signed".format(env),
+        src = ":ate_gpio_toggle_test_{}_vmem64_signed".format(env),
     )
     for env in _DV_EXEC_ENVS
 ]