From b238548f217c0f48252d586046a70ba28c5c6e09 Mon Sep 17 00:00:00 2001 From: Cyril Koenig Date: Wed, 11 Oct 2023 15:45:48 +0200 Subject: [PATCH] fpga: Last review updates 2 --- sw/sw.mk | 2 +- target/xilinx/src/cheshire_top_xilinx.sv | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sw/sw.mk b/sw/sw.mk index c416f184..71226f77 100644 --- a/sw/sw.mk +++ b/sw/sw.mk @@ -140,7 +140,7 @@ $(foreach link,$(patsubst $(CHS_SW_LD_DIR)/%.ld,%,$(wildcard $(CHS_SW_LD_DIR)/*. CHS_CVA6_SDK_IMGS ?= $(addprefix $(CHS_SW_DIR)/deps/cva6-sdk/install64/,fw_payload.bin uImage) # Create full Linux disk image -$(CHS_SW_DIR)/boot/linux-${BOARD}.gpt.bin: $(CHS_SW_DIR)/boot/zsl.rom.bin $(CHS_SW_DIR)/boot/cheshire_$(BOARD).dtb $(CHS_CVA6_SDK_IMGS) +$(CHS_SW_DIR)/boot/linux-%.gpt.bin: $(CHS_SW_DIR)/boot/zsl.rom.bin $(CHS_SW_DIR)/boot/cheshire_%.dtb $(CHS_CVA6_SDK_IMGS) truncate -s $(CHS_SW_DISK_SIZE) $@ sgdisk --clear -g --set-alignment=1 \ --new=1:64:96 --typecode=1:$(CHS_SW_ZSL_TGUID) \ diff --git a/target/xilinx/src/cheshire_top_xilinx.sv b/target/xilinx/src/cheshire_top_xilinx.sv index 265df78f..2a9b06ed 100644 --- a/target/xilinx/src/cheshire_top_xilinx.sv +++ b/target/xilinx/src/cheshire_top_xilinx.sv @@ -554,6 +554,8 @@ module cheshire_top_xilinx .jtag_tms_i, .jtag_tdi_i, .jtag_tdo_o, + // TODO: connect to the tdo pad + .jtag_tdo_oe_o( ), `endif // I2C Uses internal signals that are always defined .i2c_sda_o ( i2c_sda_soc_out ),