Please pull u-boot-x86/next into next
Bin Meng
bmeng.cn at gmail.com
Fri Sep 25 07:40:12 CEST 2020
Hi Tom,
This PR includes the following x86 changes for v2021.01 release:
- Enhance the 'zboot' command to be more like 'bootm' with sub-commands
- The last series of ACPI core changes for programmatic generation of
ACPI tables
- Add all required ACPI tables for ApolloLake and enable ACPIGEN on
Chromebook Coral
- A feature minor enhancements to the 'hob' command
- Intel edison: Support for writing an xFSTK image via binman
Azure results: PASS
https://dev.azure.com/bmeng/GitHub/_build/results?buildId=296&view=results
The following changes since commit e119de72e3ae3accf831b5541d83d5c2faf031ff:
Merge branch 'mpc85xx-for-v2021.01' into next (2020-09-24 08:30:25 -0400)
are available in the git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-x86 next
for you to fetch changes up to 8c180d669a0f4a8eb70bde8c74c73cef45993f67:
x86: edison: Add documentation for using am xFSTK image (2020-09-25
11:27:29 +0800)
----------------------------------------------------------------
Simon Glass (86):
x86: Update the bootparam header
x86: zimage: Use a state struct to hold the state
x86: zimage: Avoid using #ifdef
x86: zboot: Move kernel-version code into a function
x86: zboot: Correct image type
x86: zimage: Disable interrupts just before booting
x86: zboot: Set up a sub-command structure
x86: zboot: Add a 'go' subcommand
x86: zboot: Add an 'info' subcommand
x86: zboot: Add an 'load' subcommand
x86: zboot: Add an 'setup' subcommand
x86: zboot: Set environment variables for image locations
x86: zboot: Allow setting a separate setup base address
x86: zboot: Add an option to dump the setup information
x86: zboot: Allow overriding the command line
cros: Update chromium documentation
cros: Add information about booting Chrome OS on x86
x86: acpi: Add cros_ec tables
x86: acpi: Add base asl files for common x86 devices
x86: acpi: apl: Add asl files for Apollo Lake
x86: acpi: Add DPTF asl files
x86: apl: Correct PCIE_ECAM_BASE
x86: Add a config for the systemagent PCIEX regions size
x86: Add a common global NVS structure
x86: acpi: Support external GNVS tables
x86: acpi: Expand the GNVS
x86: coral: Add ACPI tables for coral
acpi: Add support for writing a _PRW
acpi: Add support for conditions and return values
acpi: Support generating a multi-function _DSM for devices
dm: acpi: Use correct GPIO polarity type in acpi_dp_add_gpio()
x86: link: Allow more space for U-Boot
i2c: Add a generic driver to generate ACPI info
x86: Add wake sources for the acpi_gpe driver
x86: apl: Support writing the IntelGraphicsMem table
x86: acpi: Add a common routine to write WiFi info
x86: Add some definitions for SMM
x86: apl: Add power-management definitions
x86: apl: Update iomap for ACPI
x86: Add a few common Intel CPU functions
x86: acpi: Support generation of the HPET table
x86: acpi: Support generation of the DBG2 table
acpi: Add support for generating processor tables
x86: acpi: Add PCT and PTC tables
acpi: Add more support for generating processor tables
x86: acpi: Add common Intel ACPI tables
x86: Support Atom SoCs using SWSMISCI rather than the SWSCI
x86: acpi: Add support for additional Intel tables
x86: apl: Allow reading hostbridge base addresses
p2sb: Add some definitions used for ACPI
x86: apl: Generate required ACPI tables
x86: apl: Add support for hostbridge ACPI generation
x86: apl: Generate CPU tables
x86: apl: Generate ACPI table for LPC
x86: apl: Drop unnecessary code in PMC driver
tpm: cr50: Add ACPI support
x86: fsp: Update the FSP API with the end-firmware method
x86: cpu: Report address width from cpu_get_info()
x86: Sort the MTRR table
x86: Notify the FSP of the 'end firmware' event
x86: Correct the assembly guard in e820.h
x86: Add a header guard to asm/acpi_table.h
x86: Correct handling of MADT table CPUs
acpi: tpm: Add a TPM2 table
acpi: tpm: Add a TPM1 table
x86: acpi: Set the log category for x86 table generation
x86: coral: Add audio descriptor files
x86: apl: Check low-level init in FSP-S pre-init
x86: fsp: Add more debugging for silicon init
x86: fsp: Show FSP-S or FSP-M address in fsp_get_header()
acpi: Use defines for field lengths
x86: Add a way to add to the e820 memory table
x86: Move include of bitops out of ACPI region
x86: coral: Update config and device tree for ACPI
acpi: Add more documentation for struct acpi_gpio
acpi: Use I2cSerialBusV2() instead of I2cSerialBus()
x86: hob: Add way to show a single hob entry
x86: hob: Try to show a name instead of a GUID
x86: Allow showing details about a HOB entry
x86: Add support for more than 8 MTRRs
x86: video: Show information about each video device
x86: Use multiple images
binman: Show an error when a file is missing
binman: Support adding a U-Boot environment
x86: edison: Generate an image suitable for xFSTK
x86: edison: Add documentation for using am xFSTK image
README | 4 +
arch/x86/Kconfig | 47 ++++++++
arch/x86/cpu/apollolake/Kconfig | 4 +
arch/x86/cpu/apollolake/Makefile | 1 +
arch/x86/cpu/apollolake/acpi.c | 211
++++++++++++++++++++++++++++++++
arch/x86/cpu/apollolake/cpu.c | 77
++++++++++++
arch/x86/cpu/apollolake/fsp_s.c | 2 +
arch/x86/cpu/apollolake/hostbridge.c | 243
+++++++++++++++++++++++++++++++++++--
arch/x86/cpu/apollolake/lpc.c | 18 +++
arch/x86/cpu/apollolake/pmc.c | 8 +-
arch/x86/cpu/cpu.c | 15 +++
arch/x86/cpu/i386/cpu.c | 23 ++++
arch/x86/cpu/intel_common/Makefile | 7 ++
arch/x86/cpu/intel_common/acpi.c | 377
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/cpu/intel_common/cpu.c | 79
++++++++++++
arch/x86/cpu/intel_common/generic_wifi.c | 120
+++++++++++++++++++
arch/x86/cpu/intel_common/intel_opregion.c | 168
++++++++++++++++++++++++++
arch/x86/cpu/mtrr.c | 24 +++-
arch/x86/cpu/tangier/Kconfig | 1 +
arch/x86/cpu/x86_64/cpu.c | 5 +
arch/x86/dts/chromebook_coral.dts | 226
++++++++++++++++++++++++++++++++---
arch/x86/dts/edison.dts | 34 ++++++
arch/x86/dts/emulation-u-boot.dtsi | 16 ++-
arch/x86/dts/quark-u-boot.dtsi | 8 +-
arch/x86/dts/u-boot.dtsi | 7 --
arch/x86/include/asm/acpi/chromeos.asl | 108
+++++++++++++++++
arch/x86/include/asm/acpi/cpu.asl | 25 ++++
arch/x86/include/asm/acpi/cros_ec/ac.asl | 22 ++++
arch/x86/include/asm/acpi/cros_ec/als.asl | 56 +++++++++
arch/x86/include/asm/acpi/cros_ec/battery.asl | 411
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/include/asm/acpi/cros_ec/cros_ec.asl | 57 +++++++++
arch/x86/include/asm/acpi/cros_ec/ec.asl | 557
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/include/asm/acpi/cros_ec/emem.asl | 53 +++++++++
arch/x86/include/asm/acpi/cros_ec/keyboard_backlight.asl | 52 ++++++++
arch/x86/include/asm/acpi/cros_ec/pd.asl | 15 +++
arch/x86/include/asm/acpi/cros_ec/superio.asl | 159
+++++++++++++++++++++++++
arch/x86/include/asm/acpi/cros_ec/tbmc.asl | 23 ++++
arch/x86/include/asm/acpi/cros_gnvs.asl | 29 +++++
arch/x86/include/asm/acpi/dptf/charger.asl | 65
++++++++++
arch/x86/include/asm/acpi/dptf/cpu.asl | 186
+++++++++++++++++++++++++++++
arch/x86/include/asm/acpi/dptf/dptf.asl | 121
+++++++++++++++++++
arch/x86/include/asm/acpi/dptf/fan.asl | 57 +++++++++
arch/x86/include/asm/acpi/dptf/thermal.asl | 521
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/include/asm/acpi/global_nvs.h | 5 +-
arch/x86/include/asm/acpi/lpc.asl | 141
++++++++++++++++++++++
arch/x86/include/asm/acpi/pci_osc.asl | 21 ++++
arch/x86/include/asm/acpi/pcr.asl | 80
+++++++++++++
arch/x86/include/asm/acpi/ramoops.asl | 32 +++++
arch/x86/include/asm/acpi/sleepstates.asl | 12 +-
arch/x86/include/asm/acpi_table.h | 162
+++++++++++++++++++++++++
arch/x86/include/asm/acpigen.h | 35 ++++++
arch/x86/include/asm/arch-apollolake/acpi.h | 18 +++
arch/x86/include/asm/arch-apollolake/acpi/dptf.asl | 35 ++++++
arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl | 41 +++++++
arch/x86/include/asm/arch-apollolake/acpi/gpio.asl | 191
+++++++++++++++++++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/gpiolib.asl | 109
+++++++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/lpss.asl | 105
++++++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl | 120
+++++++++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/pch_hda.asl | 77
++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl | 52 ++++++++
arch/x86/include/asm/arch-apollolake/acpi/pcie.asl | 22 ++++
arch/x86/include/asm/arch-apollolake/acpi/pcie_port.asl | 113
++++++++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/platform.asl | 10 ++
arch/x86/include/asm/arch-apollolake/acpi/pmc_ipc.asl | 49 ++++++++
arch/x86/include/asm/arch-apollolake/acpi/scs.asl | 173
+++++++++++++++++++++++++++
arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl | 50 ++++++++
arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl | 34 ++++++
arch/x86/include/asm/arch-apollolake/acpi/xhci.asl | 33 +++++
arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl | 23 ++++
arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl | 24 ++++
arch/x86/include/asm/arch-apollolake/global_nvs.h | 23 +---
arch/x86/include/asm/arch-apollolake/gpe.h | 135
+++++++++++++++++++++
arch/x86/include/asm/arch-apollolake/gpio.h | 3 +
arch/x86/include/asm/arch-apollolake/iomap.h | 16 +++
arch/x86/include/asm/arch-apollolake/pm.h | 40 ++++++-
arch/x86/include/asm/arch-apollolake/systemagent.h | 31 +++++
arch/x86/include/asm/bootparam.h | 25 +++-
arch/x86/include/asm/cpu.h | 9 ++
arch/x86/include/asm/cpu_common.h | 56 +++++++++
arch/x86/include/asm/e820.h | 4 +-
arch/x86/include/asm/fsp/fsp_api.h | 15 ++-
arch/x86/include/asm/fsp/fsp_hob.h | 25 ++++
arch/x86/include/asm/intel_acpi.h | 52 ++++++++
arch/x86/include/asm/intel_gnvs.h | 44 +++++++
arch/x86/include/asm/intel_opregion.h | 247
++++++++++++++++++++++++++++++++++++++
arch/x86/include/asm/mtrr.h | 15 ++-
arch/x86/include/asm/smm.h | 27 +++++
arch/x86/include/asm/zimage.h | 30 ++++-
arch/x86/lib/Makefile | 1 +
arch/x86/lib/acpi_table.c | 383
++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
arch/x86/lib/acpigen.c | 96
+++++++++++++++
arch/x86/lib/bootm.c | 2 +-
arch/x86/lib/fsp/fsp_common.c | 16 +++
arch/x86/lib/fsp/fsp_dram.c | 17 +++
arch/x86/lib/fsp/fsp_graphics.c | 32 +++++
arch/x86/lib/fsp2/fsp_silicon_init.c | 4 +-
arch/x86/lib/fsp2/fsp_support.c | 22 ++--
arch/x86/lib/zimage.c | 484
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
board/google/chromebook_coral/Kconfig | 2 +-
board/google/chromebook_coral/Makefile | 1 +
board/google/chromebook_coral/baseboard_dptf.asl | 71
+++++++++++
board/google/chromebook_coral/coral.c | 136
+++++++++++++++++++++
board/google/chromebook_coral/dialog-2ch-48khz-24b.dat | Bin
0 -> 100 bytes
board/google/chromebook_coral/dmic-1ch-48khz-16b.dat | Bin
0 -> 3048 bytes
board/google/chromebook_coral/dmic-2ch-48khz-16b.dat | Bin
0 -> 3048 bytes
board/google/chromebook_coral/dmic-4ch-48khz-16b.dat | Bin
0 -> 3048 bytes
board/google/chromebook_coral/dsdt.asl | 60
++++++++++
board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat | 0
board/google/chromebook_coral/variant_dptf.asl | 6 +
board/google/chromebook_coral/variant_ec.h | 75
++++++++++++
board/google/chromebook_coral/variant_gpio.h | 63
++++++++++
board/intel/edison/edison-environment.txt | 48 ++++++++
board/intel/edison/edison-osip.dat | 0
cmd/bdinfo.c | 32 ++++-
cmd/x86/hob.c | 100
++++++++++++++--
cmd/x86/mtrr.c | 9 +-
configs/chromebook_coral_defconfig | 13 +-
configs/chromebook_link_defconfig | 2 +-
doc/README.chromium | 41 ++++++-
doc/board/intel/edison.rst | 120
+++++++++++++++++++
doc/device-tree-bindings/chosen.txt | 18 +++
doc/device-tree-bindings/device.txt | 3 +
doc/device-tree-bindings/i2c/generic-acpi.txt | 42 +++++++
drivers/core/Kconfig | 9 ++
drivers/i2c/Makefile | 3 +
drivers/i2c/acpi_i2c.c | 226
+++++++++++++++++++++++++++++++++++
drivers/i2c/acpi_i2c.h | 15 +++
drivers/i2c/i2c-uclass.c | 17 +++
drivers/sound/max98357a.c | 2 +-
drivers/tpm/cr50_i2c.c | 55 +++++++++
include/acpi/acpi_device.h | 93
++++++++++++++-
include/acpi/acpi_dp.h | 2 +-
include/acpi/acpi_s3.h | 4 +
include/acpi/acpi_table.h | 140
++++++++++++++++++++--
include/acpi/acpigen.h | 415
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
include/bloblist.h | 8 ++
include/i2c.h | 23 ++++
include/p2sb.h | 8 ++
include/power/acpi_pmc.h | 4 +-
include/video.h | 6 +-
lib/acpi/acpi_device.c | 45 ++++++-
lib/acpi/acpi_dp.c | 4 +-
lib/acpi/acpi_table.c | 64
++++++++++
lib/acpi/acpigen.c | 354
++++++++++++++++++++++++++++++++++++++++++++++++++++++
test/dm/acpi_dp.c | 4 +-
test/dm/acpigen.c | 647
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/binman/etype/blob.py | 5 +-
tools/binman/etype/u_boot_env.py | 42 +++++++
tools/binman/ftest.py | 38 ++++++
tools/binman/test/173_missing_blob.dts | 14 +++
tools/binman/test/174_env.dts | 20 ++++
tools/binman/test/175_env_no_size.dts | 19 +++
tools/binman/test/176_env_too_small.dts | 20 ++++
153 files changed, 10787 insertions(+), 224 deletions(-)
create mode 100644 arch/x86/cpu/apollolake/acpi.c
create mode 100644 arch/x86/cpu/intel_common/acpi.c
create mode 100644 arch/x86/cpu/intel_common/generic_wifi.c
create mode 100644 arch/x86/cpu/intel_common/intel_opregion.c
create mode 100644 arch/x86/include/asm/acpi/chromeos.asl
create mode 100644 arch/x86/include/asm/acpi/cpu.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/ac.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/als.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/battery.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/cros_ec.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/ec.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/emem.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/keyboard_backlight.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/pd.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/superio.asl
create mode 100644 arch/x86/include/asm/acpi/cros_ec/tbmc.asl
create mode 100644 arch/x86/include/asm/acpi/cros_gnvs.asl
create mode 100644 arch/x86/include/asm/acpi/dptf/charger.asl
create mode 100644 arch/x86/include/asm/acpi/dptf/cpu.asl
create mode 100644 arch/x86/include/asm/acpi/dptf/dptf.asl
create mode 100644 arch/x86/include/asm/acpi/dptf/fan.asl
create mode 100644 arch/x86/include/asm/acpi/dptf/thermal.asl
create mode 100644 arch/x86/include/asm/acpi/lpc.asl
create mode 100644 arch/x86/include/asm/acpi/pci_osc.asl
create mode 100644 arch/x86/include/asm/acpi/pcr.asl
create mode 100644 arch/x86/include/asm/acpi/ramoops.asl
create mode 100644 arch/x86/include/asm/acpigen.h
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi.h
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/dptf.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/gpio.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/gpiolib.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/lpss.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pch_hda.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pcie.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pcie_port.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/platform.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pmc_ipc.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/scs.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl
create mode 100644 arch/x86/include/asm/arch-apollolake/gpe.h
create mode 100644 arch/x86/include/asm/intel_acpi.h
create mode 100644 arch/x86/include/asm/intel_gnvs.h
create mode 100644 arch/x86/include/asm/intel_opregion.h
create mode 100644 arch/x86/include/asm/smm.h
create mode 100644 arch/x86/lib/acpigen.c
create mode 100644 board/google/chromebook_coral/baseboard_dptf.asl
create mode 100644 board/google/chromebook_coral/dialog-2ch-48khz-24b.dat
create mode 100644 board/google/chromebook_coral/dmic-1ch-48khz-16b.dat
create mode 100644 board/google/chromebook_coral/dmic-2ch-48khz-16b.dat
create mode 100644 board/google/chromebook_coral/dmic-4ch-48khz-16b.dat
create mode 100644 board/google/chromebook_coral/dsdt.asl
create mode 100644
board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat
create mode 100644 board/google/chromebook_coral/variant_dptf.asl
create mode 100644 board/google/chromebook_coral/variant_ec.h
create mode 100644 board/google/chromebook_coral/variant_gpio.h
create mode 100644 board/intel/edison/edison-environment.txt
create mode 100644 board/intel/edison/edison-osip.dat
create mode 100644 doc/device-tree-bindings/i2c/generic-acpi.txt
create mode 100644 drivers/i2c/acpi_i2c.c
create mode 100644 drivers/i2c/acpi_i2c.h
create mode 100644 tools/binman/etype/u_boot_env.py
create mode 100644 tools/binman/test/173_missing_blob.dts
create mode 100644 tools/binman/test/174_env.dts
create mode 100644 tools/binman/test/175_env_no_size.dts
create mode 100644 tools/binman/test/176_env_too_small.dts
Regards,
Bin
More information about the U-Boot
mailing list