From d6900bb65b53e8bb56e11bc8d64080721b3f2e2e Mon Sep 17 00:00:00 2001 From: Stuart Shelton Date: Thu, 17 Aug 2023 00:39:24 +0100 Subject: [PATCH] Remove standalone NOTEs... ... as requested at https://github.com/raspberrypi/documentation/pull/3038#discussion_r1283137635 Signed-off-by: Stuart Shelton --- documentation/asciidoc/computers/config_txt/boot.adoc | 8 -------- documentation/asciidoc/computers/config_txt/memory.adoc | 2 -- .../asciidoc/computers/config_txt/overclocking.adoc | 2 -- 3 files changed, 12 deletions(-) diff --git a/documentation/asciidoc/computers/config_txt/boot.adoc b/documentation/asciidoc/computers/config_txt/boot.adoc index 7300cf810a..bea2168cab 100644 --- a/documentation/asciidoc/computers/config_txt/boot.adoc +++ b/documentation/asciidoc/computers/config_txt/boot.adoc @@ -9,8 +9,6 @@ These options specify the firmware files transferred to the VideoCore GPU prior NOTE: Cut-down firmware (`start*cd.elf` and `fixup*cd.dat`) cannot be selected this way - the system will fail to boot. The only way to enable the cut-down firmware is to specify `gpu_mem=16`. The cut-down firmware removes support for cameras, codecs and 3D as well as limiting the initial early-boot framebuffer to 1080p @ 16bpp - although KMS can replace this with up-to 32bpp 4K framebuffer(s) at a later stage as with any firmware. -NOTE: `start_file` and `fixup_file` are used by the bootloader, and so are only valid in `config.txt` - === `start_x`, `start_debug` These provide a shortcut to some alternative `start_file` and `fixup_file` settings, and are the recommended methods for selecting firmware configurations. @@ -31,8 +29,6 @@ On the Raspberry Pi 4, if the files `start4x.elf` and `fixup4x.dat` are present, `start_x=1` should be specified when using the camera module. Enabling the camera via `raspi-config` will set this automatically. -NOTE: `start_x` and `start_debug` are used by the bootloader, and so are only valid in `config.txt` - === `disable_commandline_tags` Set the `disable_commandline_tags` command to `1` to stop `start.elf` from filling in ATAGS (memory from `0x100`) before launching the kernel. @@ -113,8 +109,6 @@ The `bootcode_delay` command delays for a given number of seconds in `bootcode.b This is particularly useful to insert a delay before reading the EDID of the monitor, for example if the Raspberry Pi and monitor are powered from the same source, but the monitor takes longer to start up than the Raspberry Pi. Try setting this value if the display detection is wrong on initial boot, but is correct if you soft-reboot the Raspberry Pi without removing power from the monitor. -NOTE: `bootcode_delay` is used by the bootloader, and so is only valid in `config.txt` - === `boot_delay` The `boot_delay` command instructs to wait for a given number of seconds in `start.elf` before loading the kernel: the default value is `1`. The total delay in milliseconds is calculated as `(1000 x boot_delay) + boot_delay_ms`. This can be useful if your SD card needs a while to get ready before Linux is able to boot from it. @@ -186,8 +180,6 @@ Setting `uart_2ndstage=1` causes the second-stage loader (`bootcode.bin` on devi 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. -NOTE: `uart_2ndstage` is used by the bootloader, and so is only valid in `config.txt` - [[upstream_kernel]] === `upstream_kernel` diff --git a/documentation/asciidoc/computers/config_txt/memory.adoc b/documentation/asciidoc/computers/config_txt/memory.adoc index 33ba9e62c7..aa9455004e 100644 --- a/documentation/asciidoc/computers/config_txt/memory.adoc +++ b/documentation/asciidoc/computers/config_txt/memory.adoc @@ -55,8 +55,6 @@ total_mem=1024 This value will be clamped between a minimum of 128MB, and a maximum of the total memory installed on the board. -NOTE: `gpu_mem`, `gpu_mem_256`, `gpu_mem_512`, `gpu_mem_1024` and `total_mem` are used by the bootloader, and so are only valid in `config.txt` - === `disable_l2cache` Setting this to `1` disables the CPU's access to the GPU's L2 cache and requires a corresponding L2 disabled kernel. Default value on BCM2835 is `0`. On BCM2836, BCM2837, and BCM2711, the ARMs have their own L2 cache and therefore the default is `1`. The standard Raspberry Pi `kernel.img` and `kernel7.img` builds reflect this difference in cache setting. diff --git a/documentation/asciidoc/computers/config_txt/overclocking.adoc b/documentation/asciidoc/computers/config_txt/overclocking.adoc index a348ea915e..4aa2808240 100644 --- a/documentation/asciidoc/computers/config_txt/overclocking.adoc +++ b/documentation/asciidoc/computers/config_txt/overclocking.adoc @@ -95,8 +95,6 @@ WARNING: Setting any overclocking parameters to values other than those used by | *3A+/3B+ only*. CPU speed throttle control. This sets the temperature at which the CPU clock speed throttling system activates. At this temperature, the clock speed is reduced from 1400MHz to 1200MHz. Defaults to `60`, can be raised to a maximum of `70`, but this may cause instability. |=== -NOTE: `sdram_freq` is used by the bootloader, and so is only valid in `config.txt` - This table gives the default values for the options on various Raspberry Pi models, all frequencies are stated in MHz. [cols=",^,^,^,^,^,^,^,^,^"]