diff options
| author | Tom Rini <[email protected]> | 2019-08-19 09:21:46 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-08-19 09:21:46 -0400 |
| commit | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (patch) | |
| tree | 1ae055f2a6243c62af81ac0ce31fc49db3f8f2e2 /doc | |
| parent | 81fed78c0a59af0d5698b13608eb4d26be84f397 (diff) | |
| parent | d117f917bfd2ccf4eaf90bddfa256501a554b1a4 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- QEMU build warning fix when CONFIG_DISTRO_DEFAULTS=n
- Small fixes on x86 reST docs
- Allow CBFS to be used in SPL
- Remove x86 specific GD flags
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/arch/x86.rst | 3 | ||||
| -rw-r--r-- | doc/board/intel/slimbootloader.rst | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst index 2eb524cc8f8..a441738ad13 100644 --- a/doc/arch/x86.rst +++ b/doc/arch/x86.rst @@ -709,7 +709,8 @@ to load a 'u-boot-payload.efi', see below test logs on QEMU. No controllers found Hit any key to stop autoboot: 0 -See README.u-boot_on_efi and README.uefi for details of EFI support in U-Boot. +See :doc:`../uefi/u-boot_on_efi` and :doc:`../uefi/uefi` for details of +EFI support in U-Boot. TODO List --------- diff --git a/doc/board/intel/slimbootloader.rst b/doc/board/intel/slimbootloader.rst index 4a46fed069e..07c9b126f77 100644 --- a/doc/board/intel/slimbootloader.rst +++ b/doc/board/intel/slimbootloader.rst @@ -87,7 +87,7 @@ The PayloadId can be any 4 Bytes value. $ qemu-system-x86_64 -machine q35 -nographic -serial mon:stdio -pflash Outputs/qemu/SlimBootloader.bin Build Instruction for Slim Bootloader for LeafHill (APL) target --------------------------------------------------------------- +--------------------------------------------------------------- LeafHill is using PCI UART2 device as a serial port. For MEM32 serial port, CONFIG_SYS_NS16550_MEM32 needs to be enabled in U-Boot. |