From 17135368a643ccbef699b63df0b80de041c1da55 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 26 May 2023 09:33:35 -0700 Subject: [PATCH] Rename offchipbus manager to client --- generators/chipyard/src/main/scala/config/ChipConfigs.scala | 2 +- .../src/main/scala/config/PeripheralDeviceConfigs.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/ChipConfigs.scala b/generators/chipyard/src/main/scala/config/ChipConfigs.scala index c7c6cae2..e4acefd5 100644 --- a/generators/chipyard/src/main/scala/config/ChipConfigs.scala +++ b/generators/chipyard/src/main/scala/config/ChipConfigs.scala @@ -65,7 +65,7 @@ class ChipBringupHostConfig extends Config( //============================ // Setup bus topology on the bringup system //============================ - new testchipip.WithOffchipBusManager(SBUS, // offchip bus hans off the SBUS + new testchipip.WithOffchipBusClient(SBUS, // offchip bus hans off the SBUS blockRange = AddressSet.misaligned(0x80000000L, (BigInt(1) << 30) * 4)) ++ // offchip bus should not see the main memory of the testchip, since that can be accesses directly through this system new testchipip.WithOffchipBus ++ // offchip bus diff --git a/generators/chipyard/src/main/scala/config/PeripheralDeviceConfigs.scala b/generators/chipyard/src/main/scala/config/PeripheralDeviceConfigs.scala index db766a1e..7ad1f17d 100644 --- a/generators/chipyard/src/main/scala/config/PeripheralDeviceConfigs.scala +++ b/generators/chipyard/src/main/scala/config/PeripheralDeviceConfigs.scala @@ -66,7 +66,7 @@ class dmiRocketConfig extends Config( class ManyPeripheralsRocketConfig extends Config( new testchipip.WithBlockDevice ++ // add block-device module to peripherybus - new testchipip.WithOffchipBusManager(MBUS) ++ + new testchipip.WithOffchipBusClient(MBUS) ++ new testchipip.WithOffchipBus ++ new testchipip.WithSerialTLMem(isMainMemory=true) ++ // set lbwif memory base to DRAM_BASE, use as main memory new chipyard.harness.WithSimSPIFlashModel(true) ++ // add the SPI flash model in the harness (read-only)