diff --git a/tcl/board/rpi3.cfg b/tcl/board/rpi3.cfg
index fd93a9d9d..a08bfeb12 100644
--- a/tcl/board/rpi3.cfg
+++ b/tcl/board/rpi3.cfg
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # This is the Raspberry Pi 3 board with BCM2837 chip
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2837/README.md
+# https://www.raspberrypi.com/documentation/computers/processors.html#bcm2837
 #
 # Enable JTAG GPIO on Raspberry Pi boards
-# https://www.raspberrypi.org/documentation/configuration/config-txt/gpio.md
+# https://www.raspberrypi.com/documentation/computers/legacy_config_txt.html#enable_jtag_gpio
 
 source [find target/bcm2837.cfg]
 transport select jtag
diff --git a/tcl/board/rpi4b.cfg b/tcl/board/rpi4b.cfg
index 5b046af7b..7d937e8c0 100644
--- a/tcl/board/rpi4b.cfg
+++ b/tcl/board/rpi4b.cfg
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # This is the Raspberry Pi 4 model B board with BCM2711 chip
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711/README.md
+# https://www.raspberrypi.com/documentation/computers/processors.html#bcm2711
 #
 # Enable JTAG GPIO on Raspberry Pi boards
-# https://www.raspberrypi.org/documentation/configuration/config-txt/gpio.md
+# https://www.raspberrypi.com/documentation/computers/legacy_config_txt.html#enable_jtag_gpio
 
 source [find target/bcm2711.cfg]
 transport select jtag
diff --git a/tcl/target/bcm2711.cfg b/tcl/target/bcm2711.cfg
index f8d2b3a65..9704daf81 100644
--- a/tcl/target/bcm2711.cfg
+++ b/tcl/target/bcm2711.cfg
@@ -3,8 +3,8 @@
 # The Broadcom BCM2711 used in Raspberry Pi 4
 # No documentation was found on Broadcom website
 
-# Partial information is available in raspberry pi website:
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711/
+# Partial information is available on the Raspberry Pi website:
+#  https://www.raspberrypi.com/documentation/computers/processors.html#bcm2711
 
 if { [info exists CHIPNAME] } {
 	set  _CHIPNAME $CHIPNAME
diff --git a/tcl/target/bcm2835.cfg b/tcl/target/bcm2835.cfg
index 32a03666c..645588730 100644
--- a/tcl/target/bcm2835.cfg
+++ b/tcl/target/bcm2835.cfg
@@ -3,8 +3,8 @@
 # This is the Broadcom chip used in the Raspberry Pi Model A, B, B+,
 # the Compute Module, and the Raspberry Pi Zero.
 
-# Partial information is available in raspberry pi website:
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2835
+# Partial information is available on the Raspberry Pi website:
+# https://www.raspberrypi.com/documentation/computers/processors.html#bcm2835
 
 if { [info exists CHIPNAME] } {
 	set  _CHIPNAME $CHIPNAME
diff --git a/tcl/target/bcm2836.cfg b/tcl/target/bcm2836.cfg
index 04921315e..695426e7a 100644
--- a/tcl/target/bcm2836.cfg
+++ b/tcl/target/bcm2836.cfg
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# The Broadcom chip used in the Raspberry Pi 2 Model B
+# The Broadcom chip used in the Raspberry Pi 2 Model B v1.1
 
-# Partial information is available in raspberry pi website:
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2836
+# Partial information is available on the Raspberry Pi website:
+# https://www.raspberrypi.com/documentation/computers/processors.html#bcm2836
 
 if { [info exists CHIPNAME] } {
 	set  _CHIPNAME $CHIPNAME
diff --git a/tcl/target/bcm2837.cfg b/tcl/target/bcm2837.cfg
index 749de3103..d41892c43 100644
--- a/tcl/target/bcm2837.cfg
+++ b/tcl/target/bcm2837.cfg
@@ -3,9 +3,9 @@
 # This is the Broadcom chip used in the Raspberry Pi 3,
 # and in later models of the Raspberry Pi 2.
 
-# Partial information is available in raspberry pi website:
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2837
-# https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2837b0
+# Partial information is available on the Raspberry Pi website:
+# https://www.raspberrypi.com/documentation/computers/processors.html#bcm2837
+# https://www.raspberrypi.com/documentation/computers/processors.html#bcm2837b0
 
 if { [info exists CHIPNAME] } {
 	set  _CHIPNAME $CHIPNAME
diff --git a/tcl/target/rp2040.cfg b/tcl/target/rp2040.cfg
index f64d4322b..da88a3125 100644
--- a/tcl/target/rp2040.cfg
+++ b/tcl/target/rp2040.cfg
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # RP2040 is a microcontroller with dual Cortex-M0+ core.
-# https://www.raspberrypi.com/documentation/microcontrollers/rp2040.html
+# https://www.raspberrypi.com/documentation/microcontrollers/silicon.html#rp2040
 
 # The device requires multidrop SWD for debug.
 transport select swd
diff --git a/tcl/target/rp2350.cfg b/tcl/target/rp2350.cfg
index b7617acd4..96bb9298f 100644
--- a/tcl/target/rp2350.cfg
+++ b/tcl/target/rp2350.cfg
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # RP2350 is a microcontroller with dual Cortex-M33 cores or dual Hazard3 RISC-V cores.
-# https://www.raspberrypi.com/documentation/microcontrollers/rp2350.html
+# https://www.raspberrypi.com/documentation/microcontrollers/silicon.html#rp2350
 
 transport select swd