It is now possible to obtain the memory map for a SPI controllers instead
of having it hard-coded in the device tree. Update the code to support
this.
Signed-off-by: Simon Glass
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Use SPI mmap() instead of SPI flash
arch/x86/lib/mrccache.c | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 50c72bf962..7136166be6 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -210,6 +210,9 @@ int mrccache_get_region(struct udevice **devp, struct
mrc_region *entry)
{
struct udevice *dev;
ofnode mrc_node;
+ ulong map_base;
+ uint map_size;
+ uint offset;
u32 reg[2];
int ret;
@@ -221,10 +224,15 @@ int mrccache_get_region(struct udevice **devp, struct
mrc_region *entry)
ret = uclass_find_first_device(UCLASS_SPI_FLASH, );
if (ret)
return log_msg_ret("Cannot find SPI flash\n", ret);
- ret = dev_read_u32_array(dev, "memory-map", reg, 2);
- if (ret)
- return log_msg_ret("Cannot find memory map\n", ret);
- entry->base = reg[0];
+ ret = dm_spi_get_mmap(dev, _base, _size, );
+ if (!ret) {
+ entry->base = map_base;
+ } else {
+ ret = dev_read_u32_array(dev, "memory-map", reg, 2);
+ if (ret)
+ return log_msg_ret("Cannot find memory map\n", ret);
+ entry->base = reg[0];
+ }
/* Find the place where we put the MRC cache */
mrc_node = dev_read_subnode(dev, "rw-mrc-cache");
@@ -239,6 +247,8 @@ int mrccache_get_region(struct udevice **devp, struct
mrc_region *entry)
if (devp)
*devp = dev;
+ debug("MRC cache in '%s', offset %x, len %x, base %x\n",
+ dev->name, entry->offset, entry->length, entry->base);
return 0;
}
--
2.24.0.432.g9d3f5f5b63-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
