Please pull u-boot-x86

Bin Meng
2020-05-27T06:45:19Z

Hi Tom,

This PR includes the following x86 changes for v2020.07 release:

- Use device tree for FSP-M and FSP-S configuration on Intel Apollo Lake
- Add SMBIOS cbmem entry parsing for coreboot
- Various clean-ups to CBFS implementation

The following changes since commit 0ab24c37f03a3a23982edb63d88c4f22bb8bc2c5:

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv
(2020-05-26 15:27:04 -0400)

are available in the git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-x86

for you to fetch changes up to 0621b5e1eeb6bcf08b220136f09d433d880f65a5:

cbfs: Don't require the CBFS size with cbfs_init_mem() (2020-05-27
14:40:09 +0800)

----------------------------------------------------------------
Bernhard Messerklinger (3):
x86: apl: Only load VBT if CONFIG_HAVE_VBT is enabled
x86: apl: Use devicetree for FSP-M configuration
x86: apl: Use devicetree for FSP-S configuration

Christian Gmeiner (2):
x86: coreboot: add SMBIOS cbmem entry parsing
cbfs: drop file_cbfs_result declaration

Simon Glass (14):
x86: mtrr: Drop the mask display when changing an mtrr
cbfs: Rename the result variable
cbfs: Use ulong consistently
cbfs: Use bool type for whether initialised
cbfs: Adjust return value of file_cbfs_next_file()
cbfs: Adjust file_cbfs_load_header() to use cbfs_priv
cbfs: Adjust cbfs_load_header_ptr() to use cbfs_priv
cbfs: Unify the two header loaders
cbfs: Use void * for the position pointers
cbfs: Record the start address in cbfs_priv
cbfs: Return the error code from file_cbfs_init()
cbfs: Change file_cbfs_find_uncached() to return an error
cbfs: Allow reading a file from a CBFS given its base addr
cbfs: Don't require the CBFS size with cbfs_init_mem()

arch/x86/cpu/apollolake/Makefile | 1 +
arch/x86/cpu/apollolake/fsp_bindings.c | 1805
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/cpu/apollolake/fsp_m.c | 169 +---------
arch/x86/cpu/apollolake/fsp_s.c | 430
++------------------------
arch/x86/cpu/coreboot/tables.c | 14 +
arch/x86/dts/chromebook_coral.dts | 73 ++++-
arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h | 168 ++++++++++
arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h | 202 ++++++++++++
arch/x86/include/asm/arch-apollolake/fsp_bindings.h | 110 +++++++
arch/x86/include/asm/arch-coreboot/sysinfo.h | 2 +
arch/x86/include/asm/coreboot_tables.h | 11 +
arch/x86/lib/fsp2/fsp_init.c | 3 +-
cmd/cbfs.c | 3 +-
cmd/x86/mtrr.c | 1 -
doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt | 320
+++++++++++++++++++
doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt | 483
+++++++++++++++++++++++++++++
fs/cbfs/cbfs.c | 240 +++++++++------
include/cbfs.h | 42 ++-
18 files changed, 3399 insertions(+), 678 deletions(-)
create mode 100644 arch/x86/cpu/apollolake/fsp_bindings.c
create mode 100644 arch/x86/include/asm/arch-apollolake/fsp_bindings.h
create mode 100644 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt
create mode 100644 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt

Regards,
Bin