Merge branch 'leep_con' into 'master'

Update to use released leep python package and clean up related scripts

See merge request hdl-libraries/bedrock!242

Author: lerwys

.gitlab-ci.yml

@@ -37,11 +37,6 @@ include:
   - local: .gitlab/ci/cdc_check.gitlab-ci.yml
   - local: .gitlab/ci/localbus.gitlab-ci.yml
   - local: .gitlab/ci/ctrace.gitlab-ci.yml
-  - local: .gitlab/ci/leep.gitlab-ci.yml
-
-leep_test:
-  script:
-    - cd projects/common && PYTHONPATH=../../build-tools python3 -m unittest -v
 
 flake8:
   stage: test

.gitlab/ci/leep.gitlab-ci.yml

@@ -133,6 +133,11 @@ RUN mkdir ${LITEX_INSTALL_PATH} && \
     cd ${LITEX_INSTALL_PATH} && \
     sh /litex_meta.sh
 
+# Install leep from public repo until we have
+# a PyPi home for it
+RUN pip3 install \
+    git+https://github.com/BerkeleyLab/leep.git
+
 # Install sv2v
 RUN apt-get update && \
     apt-get install -y \

Dockerfile

@@ -337,7 +337,7 @@ $(LB_DEMO_JSON): $(LB_STATIC_JSON) $(LB_SCALAR_JSON)
 	$(PYTHON) $(BEDROCK_BUILD_TOOLS)/merge_json.py -o $@ -i $^
 
 fake_config_romx.v: $(LB_DEMO_JSON)
-	$(PYTHON) $(BEDROCK_BUILD_TOOLS)/build_rom.py --mod_prefix fake_ -j $^ -v $@
+	$(PYTHON) -m leep.build_rom --mod_prefix fake_ -j $^ -v $@
 
 CLEAN += $(LB_DEMO_JSON)
 CLEAN += $(LB_SCALAR_JSON)

badger/tests/Makefile

@@ -16,7 +16,6 @@ sleep 1
 
 # Note that unlike speed_check.sh teststand_ac701.sh tftp_test.sh
 # this script uses leep commands from outside the badger directory
-export PYTHONPATH=$(dirname $0):$(dirname $0)/../../projects/common
 (
 $PYTHON -m leep.cli leep://localhost:3010 gitid
 $PYTHON -m leep.cli leep://localhost:3011 gitid

badger/tests/cluster_run.sh

@@ -5,7 +5,6 @@ Full information about the Zest hardware is at: https://github.com/BerkeleyLab/Z
 ### Using zest_setup.py
 
 ```
-export PYTHONPATH=../../dsp/:../../projects/common/leep
 # -r resets the board, -f sets the local bus clock frequency
 python zest_setup.py -a $IP -r -f 125.
 ```

board_support/zest/README.md

@@ -1,10 +1,6 @@
 import struct
 import sys
 import time
-import os
-
-sys.path.append(os.path.join(os.path.dirname(__file__), "../../projects/common"))
-
 from llspi_lmk01801 import c_llspi_lmk01801
 from llspi_ad9653 import c_llspi_ad9653
 from llspi_ad9781 import c_llspi_ad9781

board_support/zest/zest_setup.py

@@ -1,7 +1,7 @@
 # Functions related to Vivado and git
 
 # Revise config_romx git ID in-place using BRAM INIT_xx values
-# Absolutely depends on ROM contents that come out of bedrock/build-tools/build_rom.py
+# Absolutely depends on ROM contents that come out of build_rom.py
 # Two distinct cases:
 #   rowwidth = 8  for the case where the ROM is built with 2 x 8Kx8 BRAM (e.g., prc)
 #   rowwidth = 16 for the case where the ROM is built with 1 x 4Kx16 BRAM (e.g., marble1)

build-tools/build_rom.py

@@ -42,8 +42,8 @@ cmoc_top.v: marble_features_defs.vh marble_features_params.vh $(AUTOGEN_DIR)/con
 download: cmoc_top.bit
 	openocd -f $(BOARD_SUPPORT_DIR)/$(HARDWARE)/marble.cfg -c "transport select jtag; init; xc7_program xc7.tap; pld load 0 $^; exit"
 
-$(AUTOGEN_DIR)/config_romx.v: $(BUILD_DIR)/build_rom.py $(APP_NAME)_regmap.json
-	$(PYTHON) $< -v $@ -j $(APP_NAME)_regmap.json
+$(AUTOGEN_DIR)/config_romx.v: $(APP_NAME)_regmap.json
+	$(PYTHON) -m leep.build_rom -v $@ -j $(APP_NAME)_regmap.json
 
 $(DEPDIR)/$(TARGET).d: $(AUTOGEN_DIR)/config_romx.v