summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-04-18 08:29:35 -0600
committerTom Rini <[email protected]>2024-04-18 08:29:35 -0600
commitcdd20e3f66fe910da0545d3615decf511519b4a6 (patch)
tree9162980e2293b2a2405060f44529fe7a25cd0e1e /doc
parent3434b88d2c2fdad3cc947f9e9b03dabfdd3feb5c (diff)
Revert "Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled""
As reported by Jonas Karlman this series breaks booting on some AArch64 platforms with common use cases. For now the best path forward is to revert the series. This reverts commit 777c28460947371ada40868dc994dfe8537d7115, reversing changes made to ab3453e7b12daef47b9e91da2a2a3d48615dc6fc. Link: https://lore.kernel.org/u-boot/[email protected]/ Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'doc')
-rw-r--r--doc/android/fastboot.rst1
-rw-r--r--doc/board/emulation/qemu-x86.rst2
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/android/fastboot.rst b/doc/android/fastboot.rst
index 9e337cae2cb..05d8f777595 100644
--- a/doc/android/fastboot.rst
+++ b/doc/android/fastboot.rst
@@ -128,7 +128,6 @@ Boot command
When executing the fastboot ``boot`` command, if ``fastboot_bootcmd`` is set
then that will be executed in place of ``bootm <CONFIG_FASTBOOT_BUF_ADDR>``.
-This is supported if CONFIG_CMDLINE is enabled, which it normally is.
Partition Names
---------------
diff --git a/doc/board/emulation/qemu-x86.rst b/doc/board/emulation/qemu-x86.rst
index 4eeba46ba7a..c604e42990e 100644
--- a/doc/board/emulation/qemu-x86.rst
+++ b/doc/board/emulation/qemu-x86.rst
@@ -134,7 +134,7 @@ The output will be something like this::
U-Boot SPL 2023.07 (Jul 23 2023 - 08:00:12 -0600)
Trying to boot from SPI
- Jumping to 64-bit U-Boot
+ Jumping to 64-bit U-Boot: Note many features are missing
U-Boot 2023.07 (Jul 23 2023 - 08:00:12 -0600)