From f3c7ecf8baebd392a5679f06d24c3d02b142cdf6 Mon Sep 17 00:00:00 2001 From: "-T.K.-" Date: Sat, 23 Sep 2023 19:17:54 -0700 Subject: [PATCH 1/4] REFACTOR: change bootaddr and reset vector address --- .../src/main/scala/config/fragments/PeripheralFragments.scala | 2 +- generators/testchipip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala index 8f52be7420..51d31094e1 100644 --- a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala @@ -29,7 +29,7 @@ import chipyard.{ExtTLMem} * @param hang the power-on reset vector, i.e. the program counter will be set to this value on reset * @param contentFileName the path to the BootROM image */ -class WithBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = 0x10040) extends Config((site, here, up) => { +class WithBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = 0x10000) extends Config((site, here, up) => { case BootROMLocated(x) => up(BootROMLocated(x), site) .map(_.copy( address = address, diff --git a/generators/testchipip b/generators/testchipip index 177e307199..4be9e3288b 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 177e3071991421bdb042fec8411c51463477c7fc +Subproject commit 4be9e3288b72ea9c1f36b5022647c3931a72706c From 8fa8be566914ab331b3d998baf85aa4da98e7006 Mon Sep 17 00:00:00 2001 From: "-T.K.-" Date: Wed, 27 Sep 2023 10:54:57 -0700 Subject: [PATCH 2/4] ADD: bump testchipip --- generators/testchipip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/testchipip b/generators/testchipip index 4be9e3288b..307fca3c3e 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 4be9e3288b72ea9c1f36b5022647c3931a72706c +Subproject commit 307fca3c3ec4484d071744df6752bbbb77be7ddb From d96629c6f15f24ad6cff182d3af4231c6b210468 Mon Sep 17 00:00:00 2001 From: "-T.K.-" Date: Wed, 1 Nov 2023 11:45:50 -0700 Subject: [PATCH 3/4] ADD: bump testchipip --- generators/testchipip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/testchipip b/generators/testchipip index 307fca3c3e..e3fa307268 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 307fca3c3ec4484d071744df6752bbbb77be7ddb +Subproject commit e3fa307268e0ed97d0389edd2c45ac0dd4993e72 From 5eae64667b6c06974d5056933f4d8a42baa1c5b5 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Thu, 2 Nov 2023 12:37:41 -0700 Subject: [PATCH 4/4] Update docs to reflect bootrom change --- docs/Customization/Boot-Process.rst | 2 +- docs/Prototyping/Arty.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Customization/Boot-Process.rst b/docs/Customization/Boot-Process.rst index a84c4e99e3..52ea32c1eb 100644 --- a/docs/Customization/Boot-Process.rst +++ b/docs/Customization/Boot-Process.rst @@ -12,7 +12,7 @@ Device Tree Binary (dtb) which details the components of the system. The assembly for the BootROM code is located in `generators/testchipip/src/main/resources/testchipip/bootrom/bootrom.S `_. The BootROM address space starts at ``0x10000`` (determined by the ``BootROMParams`` key in the configuration) and execution starts at address -``0x10040`` (given by the linker script and reset vector in the ``BootROMParams``), which is marked by the ``_hang`` label in the BootROM assembly. +``0x10000`` (given by the linker script and reset vector in the ``BootROMParams``), which is marked by the ``_hang`` label in the BootROM assembly. The Chisel generator encodes the assembled instructions into the BootROM hardware at elaboration time, so if you want to change the BootROM code, you diff --git a/docs/Prototyping/Arty.rst b/docs/Prototyping/Arty.rst index 15347cf8d6..b4424bcfd8 100644 --- a/docs/Prototyping/Arty.rst +++ b/docs/Prototyping/Arty.rst @@ -34,7 +34,7 @@ Probe an address on the target system: .. code-block:: shell - ./uart_tsi +tty=/dev/ttyUSBX +init_read=0x10040 none + ./uart_tsi +tty=/dev/ttyUSBX +init_read=0x10000 none Write some address before running a program: