diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-01 23:34:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-01 23:34:18 -0400 |
| commit | ecd4d99f654f3f7bfb96001891d69c3125e70b69 (patch) | |
| tree | 405530bb85d5fdc97aadd6c65d9678d4ce3c54b6 /arch/x86/cpu | |
| parent | b5d54d26ea1354fede1121671a7ca3b9b44b5b5c (diff) | |
| parent | 95cfa1d46c61461bdadb195799a205b48b907a5e (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Corrected some FSP-M/FSP-S settings for Chromebook Coral
- ICH SPI driver and mrccache fixes for obtaining the SPI memory map
- Fixed various warnings generated by latest version IASL when compiling
ACPI tables
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/intel_common/fast_spi.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/arch/x86/cpu/intel_common/fast_spi.c b/arch/x86/cpu/intel_common/fast_spi.c index a6e3d0a5bf..5d3944dee2 100644 --- a/arch/x86/cpu/intel_common/fast_spi.c +++ b/arch/x86/cpu/intel_common/fast_spi.c @@ -31,21 +31,30 @@ static ulong fast_spi_get_bios_region(struct fast_spi_regs *regs, return bios_start; } +int fast_spi_get_bios_mmap_regs(struct fast_spi_regs *regs, ulong *map_basep, + uint *map_sizep, uint *offsetp) +{ + ulong base; + + base = fast_spi_get_bios_region(regs, map_sizep); + *map_basep = (u32)-*map_sizep - base; + *offsetp = base; + + return 0; +} + int fast_spi_get_bios_mmap(pci_dev_t pdev, ulong *map_basep, uint *map_sizep, uint *offsetp) { struct fast_spi_regs *regs; - ulong bar, base, mmio_base; + ulong bar, mmio_base; /* Special case to find mapping without probing the device */ pci_x86_read_config(pdev, PCI_BASE_ADDRESS_0, &bar, PCI_SIZE_32); mmio_base = bar & PCI_BASE_ADDRESS_MEM_MASK; regs = (struct fast_spi_regs *)mmio_base; - base = fast_spi_get_bios_region(regs, map_sizep); - *map_basep = (u32)-*map_sizep - base; - *offsetp = base; - return 0; + return fast_spi_get_bios_mmap_regs(regs, map_basep, map_sizep, offsetp); } int fast_spi_early_init(pci_dev_t pdev, ulong mmio_base) |