fpga: Updating FPGA synth scripts for OpenTitan.

fpga: Introcued scripts to generate the "eFuse" and boot roms with given code. fpga: Updated artifact management to take select only useful envvar
pulp-platform · Oct 12, 2023 · d65caef · d65caef
1 parent 3c43574
commit d65caef
Show file tree

Hide file tree

Showing 13 changed files with 9,325 additions and 4 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -352,7 +352,7 @@ packages:
     - common_cells
     - common_verification
   opentitan:
-    revision: 4946c1ab9dd0f3191a9dea91edd58aa3647a0e80
+    revision: 74ed88bf04dacc159fe03128677d0cd90518e21c
     version: null
     source:
       Git: https://github.com/pulp-platform/opentitan.git
@@ -514,7 +514,7 @@ packages:
     - register_interface
     - tech_cells_generic
   tech_cells_generic:
-    revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf
+    revision: 7e92d7aae3af501b7f0d96bf902ee84b50e1b5c6
     version: 0.2.13
     source:
       Git: https://github.com/pulp-platform/tech_cells_generic.git

diff --git a/Bender.yml b/Bender.yml
@@ -10,6 +10,7 @@ package:
     - "Robert Balas <[email protected]>"
 
 dependencies:
+<<<<<<< HEAD
   register_interface: { git: https://github.com/pulp-platform/register_interface.git,   version: 0.4.2                                }
   axi:                { git: https://github.com/pulp-platform/axi.git,                  version: 0.39.1                               }
   cheshire:           { git: https://github.com/pulp-platform/cheshire.git,             rev: 93877a2b475a136af1173caefeb0bc01f42ce220 } # branch: aottaviano/carfield
@@ -18,6 +19,16 @@ dependencies:
   safety_island:      { git: [email protected]:carfield/safety-island.git,         rev: cc541a6cf5995eea29dd255db68fbe7d2cd10af6 } # branch: michaero/carfield
   pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 8356888056441d6cf5b94e348a0817264b9b1b8c } # branch: yt/rapidrecovery
   opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: 4946c1ab9dd0f3191a9dea91edd58aa3647a0e80 } # branch: carfield_soc
+=======
+  register_interface: { git: https://github.com/pulp-platform/register_interface.git,   version: 0.4.1                                }
+  axi:                { git: https://github.com/pulp-platform/axi.git,                  version: 0.39.0-beta.10                       }
+  cheshire:           { git: https://github.com/pulp-platform/cheshire.git,             rev: 6c314fa41f56174edd88f85a899d44b9107d174a } # branch: aottaviano/carfield
+  hyperbus:           { git: https://github.com/pulp-platform/hyperbus.git,             rev: 4714902ecf23074fb20bb462db4c66d96cc631f5 } # branch: lv/phys_in_use
+  car_l2:             { git: [email protected]:carfield/carfield_l2_mem.git,       rev: d6ab486b2777bf78c38b49352b5977565a272a58 } # branch: main
+  safety_island:      { git: [email protected]:carfield/safety-island.git,         rev: b0501345b1741fa96b781ef5d845026fec036fd2 } # branch: param_banks
+  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 3ef692aea035919933aceaa065c4d9a3753c8db6 } # branch: yt/rapidrecovery
+  opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: 74ed88bf04dacc159fe03128677d0cd90518e21c } # branch: carfield-soc
+>>>>>>> 8ae5391 (fpga: Updating FPGA synth scripts for OpenTitan.)
   mailbox_unit:       { git: [email protected]:pulp-platform/mailbox_unit.git,             version: 1.1.0                                }
   apb:                { git: https://github.com/pulp-platform/apb.git,                  version: 0.2.3                                }
   timer_unit:         { git: https://github.com/pulp-platform/timer_unit.git,           version: 1.0.2                                }

diff --git a/target/xilinx/xilinx.mk b/target/xilinx/xilinx.mk
@@ -11,16 +11,19 @@ PROJECT       ?= carfield
 BOARD         ?= vcu128
 ip-dir        := $(CAR_XIL_DIR)/xilinx
 USE_ARTIFACTS ?= 0
+ELABORATION_ONLY ?= 0
 
 
+xilinx_defs  ?= TARGET_XILINX
+
 # Select board specific variables
 ifeq ($(BOARD),vcu128)
 	XILINX_PART  ?= xcvu37p-fsvh2892-2L-e
 	XILINX_BOARD ?= xilinx.com:vcu128:part0:1.0
 	XILINX_PORT  ?= 3232
 	FPGA_PATH    ?= xilinx_tcf/Xilinx/091847100638A
 	XILINX_HOST  ?= bordcomputer
-	ips-names    := xlnx_mig_ddr4 xlnx_clk_wiz xlnx_vio
+	ips-names    := xlnx_mig_ddr4 xlnx_clk_wiz xlnx_vio xilinx_rom_bank_1024x22 xilinx_rom_bank_8192x40
 endif
 
 # Location of ip outputs

diff --git a/target/xilinx/xilinx/common.mk b/target/xilinx/xilinx/common.mk
@@ -31,7 +31,8 @@ $(PROJECT).xpr:
 
 # Generate a sha based on env variables and artifacts_in
 generate_sha256:
-	@echo $(VIVADOENV) $(VIVADO) $(PROJECT) $(ARTIFACTS_IN) > .generated_env
+	@echo $(VIVADO) $(PROJECT) > .generated_env
+	@echo $(VIVADOENV) | tr " " "\n" | grep $(foreach var,$(ARTIFACTS_VARS), $(addprefix -e ,$(var)))  >> .generated_env
 	@sha256sum $(ARTIFACTS_IN) >> .generated_env
 	@sha256sum .generated_env | awk '{print $$1}' > .generated_sha256
 

diff --git a/target/xilinx/xilinx/xilinx_rom_bank_1024x22/Makefile b/target/xilinx/xilinx/xilinx_rom_bank_1024x22/Makefile
@@ -0,0 +1,10 @@
+# Copyright 2022 ETH Zurich and University of Bologna.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
+PROJECT:=xilinx_rom_bank_1024x22
+# The files and variables on which the IP configuration depends
+ARTIFACTS_IN:=Makefile tcl/run.tcl otp.coe
+ARTIFACTS_VARS:=XILINX_PART XILINX_BOARD BOARD
+
+include ../common.mk