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 <https://github.com/ucb-bar/testchipip/blob/master/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 0575d81133..843c05f574 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:
 
diff --git a/docs/Prototyping/NexysVideo.rst b/docs/Prototyping/NexysVideo.rst
index 773084b97e..5256261f7f 100644
--- a/docs/Prototyping/NexysVideo.rst
+++ b/docs/Prototyping/NexysVideo.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:
 
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 6436959d99..c4c0774f5f 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 6436959d997d0bb578790d95078648b478ca049b
+Subproject commit c4c0774f5ff7a407dd81e5f0b4289a2fdd9e8d63