From 356fa70c3c9a334f8ead280c61afd4d619f7a01d Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 5 Nov 2020 11:16:17 -0800 Subject: [PATCH] Update fpga-shells submodule | Fix Arty Makefile lines --- fpga/Makefile | 10 +++++----- scripts/init-submodules-no-riscv-tools-nolog.sh | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fpga/Makefile b/fpga/Makefile index 74af21e9..fa1f8e08 100644 --- a/fpga/Makefile +++ b/fpga/Makefile @@ -45,11 +45,11 @@ endif ifeq ($(SUB_PROJECT),arty) # TODO: Fix with Arty SBT_PROJECT ?= fpga_platforms - MODEL ?= BringupVCU118FPGATestHarness - VLOG_MODEL ?= BringupVCU118FPGATestHarness - MODEL_PACKAGE ?= chipyard.fpga.vcu118.bringup - CONFIG ?= RocketBringupConfig - CONFIG_PACKAGE ?= chipyard.fpga.vcu118.bringup + MODEL ?= ArtyFPGATestHarness + VLOG_MODEL ?= ArtyFPGATestHarness + MODEL_PACKAGE ?= chipyard.fpga.arty + CONFIG ?= E300ArtyDevKitConfig + CONFIG_PACKAGE ?= chipyard.fpga.arty GENERATOR_PACKAGE ?= chipyard TB ?= none # unused TOP ?= ChipTop diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh index db16d125..c861658d 100755 --- a/scripts/init-submodules-no-riscv-tools-nolog.sh +++ b/scripts/init-submodules-no-riscv-tools-nolog.sh @@ -39,8 +39,6 @@ git config submodule.vlsi/hammer-cadence-plugins.update none git config submodule.vlsi/hammer-synopsys-plugins.update none git config submodule.vlsi/hammer-mentor-plugins.update none git config submodule.software/firemarshal.update none -# Disable updates to the local FPGA tools -git config submodule.fpga/fpga-shells.update none git submodule update --init --recursive #--jobs 8 # Un-ignore toolchain submodules