Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- Enable SeaBIOS support for Crown Bay
- Update SeaBIOS build instructions in the x86 doc
- Enable CONFIG_SPI_FLASH_SMART_HWCAPS for Crown Bay
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index d7ee0fe..58c370a 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -12,6 +12,7 @@
CONFIG_SMP=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
+CONFIG_SEABIOS=y
CONFIG_FIT=y
CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
@@ -46,7 +47,6 @@
CONFIG_REGMAP=y
CONFIG_SYSCON=y
CONFIG_CPU=y
-# CONFIG_SPI_FLASH_SMART_HWCAPS is not set
CONFIG_E1000=y
CONFIG_SOUND=y
CONFIG_SOUND_I8254=y
diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst
index 0fdd43b..5494155 100644
--- a/doc/arch/x86.rst
+++ b/doc/arch/x86.rst
@@ -379,24 +379,19 @@
Using e1000#0 device
TFTP from server 10.10.0.100; our IP address is 10.10.0.108
...
- Bytes transferred = 122124 (1dd0c hex)
- ## Starting application at 0x000ff06e ...
- SeaBIOS (version rel-1.9.0)
+ Bytes transferred = 128748 (1f6ec hex)
+ ## Starting application at 0x000fd269 ...
+ SeaBIOS (version rel-1.14.0-0-g155821a)
...
-bios.bin.elf is the SeaBIOS image built from SeaBIOS source tree.
-Make sure it is built as follows::
+bios.bin.elf is the SeaBIOS image built from SeaBIOS source tree. At the time
+being, SeaBIOS release 1.14.0 has been tested. To build the SeaBIOS image::
- $ make menuconfig
-
-Inside the "General Features" menu, select "Build for coreboot" as the
-"Build Target". Inside the "Debugging" menu, turn on "Serial port debugging"
-so that we can see something as soon as SeaBIOS boots. Leave other options
-as in their default state. Then::
-
+ $ echo -e 'CONFIG_COREBOOT=y\nCONFIG_COREBOOT_FLASH=n\nCONFIG_DEBUG_SERIAL=y\nCONFIG_DEBUG_COREBOOT=n' > .config
+ $ make olddefconfig
$ make
...
- Total size: 121888 Fixed: 66496 Free: 9184 (used 93.0% of 128KiB rom)
+ Total size: 128512 Fixed: 69216 Free: 2560 (used 98.0% of 128KiB rom)
Creating out/bios.bin.elf
Currently this is tested on QEMU x86 target with U-Boot chain-loading SeaBIOS