Hi Tom, CI: https://source.denx.de/u-boot/custodians/u-boot-x86/-/pipelines/17270
The following changes since commit ef8336e2705fce2502383f25d68188c6b1f94dd0: Merge branch '2023-08-08-introuce-Arm-FF-A-support' (2023-08-08 15:23:16 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-x86.git tags/x86-pull-20230809 for you to fetch changes up to 9234b77b9d42ebd77585091a072b4ab958ba83ed: x86: qemu-x86: Convert to text environment (2023-08-09 23:31:12 +0800) ---------------------------------------------------------------- - x86: Fixes for distro booting - x86: Move some boards to text environment ---------------------------------------------------------------- Simon Glass (36): usb: Return -ENOENT when no devices are found lib: Suppress E when writing error-string output bootstd: Rename bootdev_setup_sibling_blk() bootstd: Correct creating of bootdev sibling bootstd: Add some more debugging in the bootdev uclass x86: coreboot: Update doc for CBFS access x86: spl: Drop unwanted debug() video: Tidy up Makefile rule for video x86: Run QEMU machine setup in SPL Revert "x86: Switch QEMU over to use the bochs driver" x86: Correct copying of BIOS mode information video: Add a Kconfig option for SPL video handoff x86: Enable useful options for qemu-86 x86: Update qemu documentation doc: Explain how to avoid the distro-boot scripts env: Use include/env for text-environment includes env: Explain how to use #include files in text environment x86: Drop CFG_SYS_STACK_SIZE x86: i8254: Include required ibmpc.h header x86: edison: Drop inclusion of ibmpc.h x86: Drop inclusion of ibmpc.h x86: Drop unused distro settings x86: Add a common include for environment settings x86: coreboot: Convert to text environment x86: crownbay: Convert to text environment x86: bayleybay: Convert to text environment x86: galileo: Convert to text environment x86: edison: Convert to text environment x86: cherryhill: Convert to text environment x86: cougarcanyon2: Convert to text environment x86: minnowmax: Convert to text environment x86: slimbootloader: Convert to text environment x86: efi-x86_app: Convert to text environment x86: efi-x86_payload: Convert to text environment x86: qemu: Add required linux/sizes.h include x86: qemu-x86: Convert to text environment arch/x86/cpu/qemu/Kconfig | 2 +- arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + arch/x86/cpu/qemu/qemu.c | 2 +- arch/x86/include/asm/qemu.h | 14 ++++++++++++++ arch/x86/lib/bios.c | 2 +- arch/x86/lib/i8254.c | 1 + arch/x86/lib/physmem.c | 3 ++- arch/x86/lib/spl.c | 4 +++- board/coreboot/coreboot/coreboot.env | 9 +++++++++ board/efi/efi-x86_app/efi-x86_app.env | 6 ++++++ board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++++ board/emulation/qemu-x86/qemu-x86.env | 6 ++++++ board/intel/bayleybay/bayleybay.env | 9 +++++++++ board/intel/cherryhill/cherryhill.env | 9 +++++++++ board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++++ board/intel/crownbay/crownbay.env | 6 ++++++ board/intel/edison/edison.env | 6 ++++++ board/intel/galileo/galileo.env | 11 +++++++++++ board/intel/minnowmax/minnowmax.env | 11 +++++++++++ board/intel/slimbootloader/slimbootloader.env | 23 +++++++++++++++++++++++ board/keymile/km83xx/km83xx.env | 4 ++-- board/keymile/kmcent2/kmcent2.env | 2 +- board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 ++-- board/ti/am62x/am62x.env | 4 ++-- board/ti/am64x/am64x.env | 6 +++--- board/ti/am65x/am65x.env | 8 ++++---- board/ti/j721e/j721e.env | 10 +++++----- board/ti/j721s2/j721s2.env | 10 +++++----- board/ti/ks2_evm/k2e_evm.env | 4 ++-- board/ti/ks2_evm/k2g_evm.env | 6 +++--- board/ti/ks2_evm/k2hk_evm.env | 4 ++-- board/ti/ks2_evm/k2l_evm.env | 4 ++-- boot/bootdev-uclass.c | 17 +++++++++++++---- common/board_f.c | 3 +-- common/usb_storage.c | 2 +- configs/qemu-x86_64_defconfig | 4 ++++ configs/qemu-x86_defconfig | 11 +++++++++++ doc/board/coreboot/coreboot.rst | 34 ++++++++++++++++++++++++++++++++++ doc/board/emulation/qemu-x86.rst | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- doc/develop/bootstd.rst | 4 ++-- doc/usage/environment.rst | 8 +++++++- drivers/Makefile | 4 ++-- drivers/block/ide.c | 4 ++-- drivers/mmc/mmc-uclass.c | 2 +- drivers/nvme/nvme.c | 2 +- drivers/scsi/scsi.c | 2 +- drivers/usb/host/usb-uclass.c | 2 +- drivers/video/Kconfig | 10 ++++++++++ drivers/video/video-uclass.c | 2 +- drivers/virtio/virtio-uclass.c | 2 +- include/bootdev.h | 10 +++++----- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 ++-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 ++-- include/configs/am65x_evm.h | 6 +++--- include/configs/bayleybay.h | 17 ----------------- include/configs/cherryhill.h | 13 ------------- include/configs/coreboot.h | 20 -------------------- include/configs/cougarcanyon2.h | 13 ------------- include/configs/crownbay.h | 17 ----------------- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/edison.h | 11 ----------- include/configs/efi-x86_app.h | 11 ----------- include/configs/efi-x86_payload.h | 17 ----------------- include/configs/galileo.h | 19 ------------------- include/configs/minnowmax.h | 16 ---------------- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 ++-- include/configs/qemu-x86.h | 23 ----------------------- include/configs/sifive-unleashed.h | 2 +- include/configs/slimbootloader.h | 35 ----------------------------------- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 ++-- include/configs/x86-common.h | 19 ------------------- include/{environment => env}/distro/sf.h | 0 include/{environment => env}/pg-wcom/common.env | 0 include/{environment => env}/pg-wcom/ls102xa.env | 2 +- include/{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 include/{environment => env}/ti/ti_armv7_common.env | 0 include/{environment => env}/ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 include/env/x86.env | 20 ++++++++++++++++++++ include/usb.h | 9 ++++++++- lib/vsprintf.c | 5 +++-- 103 files changed, 404 insertions(+), 326 deletions(-) create mode 100644 arch/x86/include/asm/qemu.h create mode 100644 board/coreboot/coreboot/coreboot.env create mode 100644 board/efi/efi-x86_app/efi-x86_app.env create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env create mode 100644 board/emulation/qemu-x86/qemu-x86.env create mode 100644 board/intel/bayleybay/bayleybay.env create mode 100644 board/intel/cherryhill/cherryhill.env create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env create mode 100644 board/intel/crownbay/crownbay.env create mode 100644 board/intel/edison/edison.env create mode 100644 board/intel/galileo/galileo.env create mode 100644 board/intel/minnowmax/minnowmax.env create mode 100644 board/intel/slimbootloader/slimbootloader.env rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%) create mode 100644 include/env/x86.env Regards, Bin
