summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2019-03-01 10:22:19 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-03-06 20:02:06 +0000
commitf8edeffe6b2cfd68b7962a4e5c43e97afa225d85 (patch)
tree0ce9d344b3580873780c7431b3ae47aa6a4d6ef7
parent6bdfc8027bb68bcecd7c31069065c1e7c8ef3598 (diff)
mb/google/sarien: add ish firmware_variant field to _DSD
We want to publish "arcada_ish.bin" as the fw name for Integrated Sensor Hub (ISH) so the kernel shim loader code can use it to construct the correct path in /lib/firmware/intel for the firmware load process. BUG=b:122722008 TEST=Verify that shim loader CLs use new value when constructing firmware path Change-Id: I6299de82566a3bad8521f8158bb047d5c1ff0cf8 Signed-off-by: Jett Rink <jettrink@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31683 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/mainboard/google/sarien/Kconfig1
-rw-r--r--src/mainboard/google/sarien/variants/arcada/devicetree.cb7
2 files changed, 7 insertions, 1 deletions
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index ce6b810a5d..462ff06064 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -4,6 +4,7 @@ config BOARD_GOOGLE_BASEBOARD_SARIEN
select BOARD_ROMSIZE_KB_32768
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_HID
+ select DRIVERS_INTEL_ISH if BOARD_GOOGLE_ARCADA
select DRIVERS_SPI_ACPI
select DRIVERS_USB_ACPI
select EC_GOOGLE_WILCO
diff --git a/src/mainboard/google/sarien/variants/arcada/devicetree.cb b/src/mainboard/google/sarien/variants/arcada/devicetree.cb
index 244ba7a9e8..c966e9ac68 100644
--- a/src/mainboard/google/sarien/variants/arcada/devicetree.cb
+++ b/src/mainboard/google/sarien/variants/arcada/devicetree.cb
@@ -195,7 +195,12 @@ chip soc/intel/cannonlake
device pci 12.0 on end # Thermal Subsystem
device pci 12.5 off end # UFS SCS
device pci 12.6 off end # GSPI #2
- device pci 13.0 on end # Integrated Sensor Hub
+ device pci 13.0 on # Integrated Sensor Hub
+ chip drivers/intel/ish
+ register "firmware_name" = ""arcada_ish.bin""
+ device generic 0 on end
+ end
+ end
device pci 14.0 on
chip drivers/usb/acpi
register "desc" = ""Root Hub""