From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D05C3EB64DC for ; Mon, 17 Jul 2023 12:44:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CB2286660; Mon, 17 Jul 2023 14:44:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GOSlyiIN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3BD168666E; Mon, 17 Jul 2023 14:44:18 +0200 (CEST) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 576E686614 for ; Mon, 17 Jul 2023 14:44:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4fb77f21c63so7061423e87.2 for ; Mon, 17 Jul 2023 05:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689597854; x=1692189854; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=3Nz6mxCxMmN3C2s38C1Eb8H+hwvvtVuYh5li+4RIlyY=; b=GOSlyiINGsu26Gv00ibSEeKA/+SdEfsCqp0/+BRPSDW227djYsgfwwnzivH8CSF8Yp WGWU7be9wU1i+N+vp+9SLGG4S+SOGqwzZqleFRcksnyieAdzO1j8tf8nkDXBMoRc8HgB Xh+RJNU5OA/LupqM1GXSrFDvk74XNTahQNcr0beDHtOziK2I51LwzY7fcSgXI+J3DR7K uUH5MaMM8cTeAH3ZoMFZoNMx83DVZoymIXqnDDFlrM1WrBhQB5wwuynyFKRguS4GwwvQ 5o17ZXYeeSwBB2+SNTHgVub8Nze7CC1yuB1fMX5JOs9MM60+irrIxcHRf2mJvIarOe56 Is6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689597854; x=1692189854; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3Nz6mxCxMmN3C2s38C1Eb8H+hwvvtVuYh5li+4RIlyY=; b=GA7fdCdpQVUb5faxkO9z6ePHxe/06UwiqWNJOAAvBFnwAgHk6m4YB4bp2VzZDFx8y4 srpEie+ScBO8oKEhIwclWvZe3gipCjDneeD64fBGo9SVkUdW89wag02uapom9kznPq7a TfJD6k06oCdzAyuEa/ploADu/avXBdH+vYr7gHNhaI4NVODVafPkEwdkk/hUvv8l2yrw xV8RRQr4lpm+5+8hsTA3aNMEfnEEgrO6vq38UJDnmfKciNUtGEyabWDkIoAiWsS2LUiZ bVE2R5nnYLDA3uymD9b0pDWN5Xg/qZK62+YiHX4mvFb50wFZrWzppemxD6QJPcMCcz11 lwWQ== X-Gm-Message-State: ABy/qLatHF9hV8nUncm6pYbMM3RjX8ooM1gPW/3D6l9MQ5BMNV/G7s/M tPPJuHMG6OKJB7Ayi2g5alXZ+ZlX8O+d6osgLsXHVSzsR/ESvg== X-Google-Smtp-Source: APBJJlHG7RlF96aQifcXhJWEqOF8C3JyWdXDzolfmUwJHq3Am0kEG3iMcT4h45X/ppJvVYsCZOZ/HU5o7f3Q6T/DNgc= X-Received: by 2002:a19:ca17:0:b0:4fb:9168:1fc7 with SMTP id a23-20020a19ca17000000b004fb91681fc7mr6803820lfg.51.1689597854261; Mon, 17 Jul 2023 05:44:14 -0700 (PDT) MIME-Version: 1.0 From: Bin Meng Date: Mon, 17 Jul 2023 20:44:03 +0800 Message-ID: Subject: Please pull u-boot-x86 To: Tom Rini Cc: Simon Glass , U-Boot Mailing List Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Hi Tom, This PR includes the following x86 related changes for v2023.10 release: - bootstd: Add a bootmeth for ChromiumOS on x86 - x86: Use qemu-x86_64 to boot EFI installers Azure results: PASS https://dev.azure.com/bmeng/GitHub/_build/results?buildId=494&view=results The following changes since commit e6e67bb9e0a40f3eb3c87d16935192821987c3e0: Merge branch '2023-07-14-assorted-general-updates' (2023-07-14 15:21:48 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-x86 for you to fetch changes up to b8956425d525c3c25fd218f252f89a5e44df6a9f: x86: Switch QEMU over to use the bochs driver (2023-07-17 17:23:15 +0800) ---------------------------------------------------------------- Simon Glass (60): test: Skip flat-tree tests if devicetree is not used bootstd: Correct the name of the QEMU bootmeth bootstd: Use bootdev instead of bootdevice bootstd: Correct baudrate typo bootstd: Allow storing the OS command line in the bootflow bootstd: Use the bootargs env var for changing the cmdline bootstd: Allow storing x86 setup information bdinfo: Show information about the serial port bootstd: Add a function to update a command line bootstd: Add support for updating elements of the cmdline x86: qemu: Create a little more room for U-Boot x86: qemu: Switch to standard boot bootstd: Support automatically setting Linux parameters x86: Add a function to boot a zimage x86: zimage: Export the function to obtain the cmdline bootstd: Add a simple bootmeth for ChromiumOS x86: coreboot: Adjust various config options x86: coral: Adjust various config options x86: Allow listing MTRRs in SPL x86: mtrr: Add documentation bios_emulator: Add Kconfig and adjust Makefile for SPL bios_emulator: Drop VIDEO_IO_OFFSET x86: Tidy up EFI code in interrupt_init() x86: Add a comment for board_init_f_r_trampoline() x86: Show the CPU physical address size with bdinfo x86: Correct get_sp() implementation for 64-bit x86: Show an error when a BIOS exception occurs acpi: Add a comment to set the acpi tables bdinfo: Show the RAM top and approximate stack pointer part: Allow setting the partition-table type qfw: Show the file address if available log: Tidy up an ambiguous comment qfw: Set the address of the ACPI tables efi: Show all known UUIDs with CONFIG_CMD_EFIDEBUG x86: Improve the trampoline in 64-bit mode bdinfo: Show the malloc base with the bdinfo command nvme: Provide more useful debugging messages pci: Support autoconfig in SPL pci: Tidy up logging and reporting for video BIOS x86: Allow video-BIOS code to be built for SPL x86: Pass video settings from SPL to U-Boot proper x86: Ensure SPL banner is only shown once x86: Init video in SPL if enabled pci: Adjust video BIOS debugging to be SPL-friendly pci: Mask the ROM address in case it is already enabled x86: Enable display for QEMU 64-bit x86: Allow logging to be used in SPL reliably fs: fat: Shrink the size of a few strings x86: Enable useful options for qemu-86_64 x86: Refactor table-writing code a little x86: Record the start and end of the tables x86: Convert some debug statements to use logging x86: link: Support Micron memory x86: Make sure that the LPC is active before SDRAM init log: Support outputing function names in SPL sandbox: Correct header order in board file sandbox: Install ACPI tables on startup efi: Use the installed ACPI tables x86: video: Add a driver for QEMU bochs emulation x86: Switch QEMU over to use the bochs driver arch/sandbox/include/asm/global_data.h | 4 ++ arch/x86/cpu/i386/interrupt.c | 17 +++----- arch/x86/cpu/intel_common/mrc.c | 10 ++--- arch/x86/cpu/ivybridge/sdram.c | 4 +- arch/x86/cpu/mtrr.c | 61 +++++++++++++++++++++++++++++ arch/x86/cpu/qemu/Kconfig | 2 +- arch/x86/cpu/start64.S | 19 +++++++++ arch/x86/dts/chromebook_link.dts | 1 + arch/x86/include/asm/global_data.h | 4 ++ arch/x86/include/asm/mtrr.h | 20 ++++++++++ arch/x86/include/asm/u-boot-x86.h | 27 ++++++++++++- arch/x86/include/asm/zimage.h | 27 +++++++++++++ arch/x86/lib/Makefile | 7 ++-- arch/x86/lib/bdinfo.c | 5 +++ arch/x86/lib/bios.c | 4 +- arch/x86/lib/bootm.c | 2 +- arch/x86/lib/mrccache.c | 6 ++- arch/x86/lib/spl.c | 68 +++++++++++++++++++++++++++----- arch/x86/lib/tables.c | 46 +++++++++++++++------- arch/x86/lib/zimage.c | 93 +++++++++++++++++++++++++++++++++++++------- board/google/Kconfig | 7 ---- board/sandbox/sandbox.c | 22 +++++++++-- boot/Kconfig | 11 ++++++ boot/Makefile | 1 + boot/bootflow.c | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- boot/bootmeth-uclass.c | 2 +- boot/bootmeth_cros.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ boot/bootmeth_qfw.c | 2 +- cmd/Kconfig | 8 ++++ cmd/acpi.c | 24 ++++++++++-- cmd/bdinfo.c | 27 +++++++++++++ cmd/bootflow.c | 87 ++++++++++++++++++++++++++++++++++++++++- cmd/part.c | 34 ++++++++++++++++ cmd/qfw.c | 2 +- cmd/x86/mtrr.c | 60 ++-------------------------- common/bloblist.c | 1 + common/board_f.c | 12 +++--- common/board_r.c | 7 ++-- common/log.c | 2 +- common/log_console.c | 10 ++++- configs/chromebook_coral_defconfig | 10 ++++- configs/coreboot_defconfig | 14 +------ configs/qemu-x86_64_defconfig | 21 +++++++--- configs/qemu-x86_defconfig | 5 +-- configs/tools-only_defconfig | 1 + disk/part.c | 16 ++++++++ doc/usage/cmd/acpi.rst | 29 +++++++++++++- doc/usage/cmd/bootflow.rst | 100 ++++++++++++++++++++++++++++++++++++++++++++++- doc/usage/cmd/mtrr.rst | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/usage/cmd/part.rst | 74 +++++++++++++++++++++++++++++++++++ doc/usage/cmd/qfw.rst | 27 +++++++------ doc/usage/index.rst | 1 + drivers/Kconfig | 2 + drivers/Makefile | 2 +- drivers/bios_emulator/Kconfig | 10 +++++ drivers/bios_emulator/biosemui.h | 18 ++++----- drivers/bios_emulator/x86emu/sys.c | 1 + drivers/gpio/intel_ich6_gpio.c | 5 ++- drivers/misc/qfw.c | 13 +++++++ drivers/mmc/mmc_bootdev.c | 2 +- drivers/nvme/nvme.c | 36 ++++++++++++----- drivers/pch/pch9.c | 6 ++- drivers/pci/Kconfig | 5 +++ drivers/pci/pci-uclass.c | 10 ++++- drivers/pci/pci_rom.c | 119 ++++++++++++++++++++++++++++++++++++++------------------ drivers/scsi/scsi_bootdev.c | 2 +- drivers/usb/host/usb_bootdev.c | 2 +- drivers/video/Kconfig | 30 ++++++++++++++ drivers/video/Makefile | 1 + drivers/video/bochs.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/video/bochs.h | 36 +++++++++++++++++ fs/fat/fat.c | 20 +++++----- fs/fat/fat_write.c | 14 ++----- fs/sandbox/host_bootdev.c | 2 +- include/asm-generic/global_data.h | 13 +++++++ include/bloblist.h | 1 + include/bootdev.h | 2 +- include/bootflow.h | 100 ++++++++++++++++++++++++++++++++++++++++++++++- include/configs/conga-qeval20-qa3-e3845.h | 2 - include/configs/dfi-bt700.h | 2 - include/configs/minnowmax.h | 2 - include/configs/qemu-x86.h | 8 ---- include/configs/som-db5800-som-6867.h | 2 - include/configs/theadorable-x86-common.h | 2 - include/configs/x86-chromebook.h | 2 - include/env_callback.h | 6 ++- include/part.h | 9 +++++ include/video.h | 24 ++++++++++++ lib/efi_loader/efi_acpi.c | 33 +++++++++------- lib/uuid.c | 2 +- net/eth_bootdev.c | 2 +- test/boot/bootflow.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/cmd/bdinfo.c | 21 ++++++++++ test/dm/acpi.c | 38 ++++++++++++++++++ test/test-main.c | 3 +- 95 files changed, 2424 insertions(+), 318 deletions(-) create mode 100644 boot/bootmeth_cros.c create mode 100644 doc/usage/cmd/mtrr.rst create mode 100644 drivers/bios_emulator/Kconfig create mode 100644 drivers/video/bochs.c create mode 100644 drivers/video/bochs.h Regards, Bin