Merge pull request #4200 from raspberrypi/mistaken-legacy

Move some options that are incorrectly in the legacy section.

Author: katshann-raspberry

documentation/asciidoc/computers/config_txt/boot.adoc

@@ -54,6 +54,12 @@ The following Raspberry Pi models support this flag:
 
 Flagship models since Raspberry Pi 5, Compute Modules since CM5, and Keyboard models since Pi 500 _only_ support the 64-bit kernel. Models that only support a 64-bit kernel ignore this flag.
 
+=== `armstub`
+
+`armstub` is the filename on the boot partition from which to load the Arm stub. The default Arm stub is stored in firmware and is selected automatically based on the Raspberry Pi model and various settings.
+
+The stub is a small piece of Arm code that is run before the kernel. Its job is to set up low-level hardware like the interrupt controller before passing control to the kernel.
+
 === `ramfsfile`
 
 `ramfsfile` is the optional filename on the boot partition of a `ramfs` to load.
@@ -173,6 +179,11 @@ By default, the PCIe x4 controller used by `RP1` is reset before starting the op
 
 Default: `1`
 
+[[sha256]]
+==== `sha256`
+
+If set to non-zero, enables the logging of SHA256 hashes for loaded files (the kernel, initramfs, Device Tree .dtb file, and overlays), as generated by the `sha256sum` utility. The logging output goes to the UART if enabled, and is also accessible via `sudo vclog --msg`. This option may be useful when debugging boot problems, but at the cost of potentially adding _many_ seconds to the boot time. Defaults to 0 on all platforms.
+
 [[uart_2ndstage]]
 ==== `uart_2ndstage`
 

documentation/asciidoc/computers/config_txt/gpio.adoc

@@ -40,3 +40,30 @@ GPIO changes made through this mechanism do not have any direct effect on the ke
 
 Note also that there is a delay of a few seconds between power being applied and the changes taking effect - longer if booting over the network or from a USB mass storage device.
 
+=== `enable_jtag_gpio`
+
+Setting `enable_jtag_gpio=1` selects Alt4 mode for GPIO pins 22-27, and sets up some internal SoC connections, enabling the JTAG interface for the Arm CPU. It works on all models of Raspberry Pi.
+
+|===
+| Pin # | Function
+
+| GPIO22
+| `ARM_TRST`
+
+| GPIO23
+| `ARM_RTCK`
+
+| GPIO24
+| `ARM_TDO`
+
+| GPIO25
+| `ARM_TCK`
+
+| GPIO26
+| `ARM_TDI`
+
+| GPIO27
+| `ARM_TMS`
+|===
+
+

documentation/asciidoc/computers/legacy_config_txt.adoc

@@ -2,8 +2,6 @@ include::legacy_config_txt/legacy.adoc[]
 
 include::legacy_config_txt/boot.adoc[]
 
-include::legacy_config_txt/gpio.adoc[]
-
 include::legacy_config_txt/overclocking.adoc[]
 
 include::legacy_config_txt/conditional.adoc[]

documentation/asciidoc/computers/legacy_config_txt/boot.adoc

@@ -29,12 +29,6 @@ WARNING: This setting is deprecated. Use `arm_64bit` instead to enable 64-bit ke
 
 Sets board-specific control bits.
 
-=== `armstub`
-
-`armstub` is the filename on the boot partition from which to load the ARM stub. The default ARM stub is stored in firmware and is selected automatically based on the Raspberry Pi model and various settings.
-
-The stub is a small piece of ARM code that is run before the kernel. Its job is to set up low-level hardware like the interrupt controller before passing control to the kernel.
-
 === `arm_peri_high`
 
 Set `arm_peri_high` to `1` to enable high peripheral mode on Raspberry Pi 4. It is set automatically if a suitable DTB is loaded.
@@ -75,17 +69,6 @@ The `boot_delay_ms` command means wait for a given number of milliseconds in `st
 
 On the Raspberry Pi 4B, if this value is set to `0` then the interrupts will be routed to the Arm cores using the legacy interrupt controller, rather than via the GIC-400. The default value is `1`.
 
-[[sha256]]
-=== `sha256`
-
-If set to non-zero, enables the logging of SHA256 hashes for loaded files (the kernel, initramfs, Device Tree .dtb file, and overlays), as generated by the `sha256sum` utility. The logging output goes to the UART if enabled, and is also accessible via `sudo vclog --msg`. This option may be useful when debugging boot problems, but at the cost of potentially adding _many_ seconds to the boot time. Defaults to 0 on all platforms.
-
-=== `uart_2ndstage`
-
-Setting `uart_2ndstage=1` causes the second-stage loader (`bootcode.bin` on devices prior to the Raspberry Pi 4, or the boot code in the  EEPROM for Raspberry Pi 4 devices) and the main firmware (`start*.elf`) to output diagnostic information to UART0.
-
-Be aware that output is likely to interfere with Bluetooth operation unless it is disabled (`dtoverlay=disable-bt`) or switched to the other UART (`dtoverlay=miniuart-bt`), and if the UART is accessed simultaneously to output from Linux, then data loss can occur leading to corrupted output. This feature should only be required when trying to diagnose an early boot loading problem.
-
 [[upstream_kernel]]
 === `upstream_kernel`