Nico Huber merged this change.

View Change

Approvals: David Hendricks: Looks good to me, approved build bot (Jenkins): Verified
fixup! Make read_ich_descriptors_from_dump() available in flashrom

Add a guard around read_ich_descriptors_via_fdo() which uses raw
hardware access and is only called from `ichspi`.

Fixes linking in case `NEED_RAW_ACCESS != 1`.

Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20265
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M ich_descriptors.c
1 file changed, 3 insertions(+), 0 deletions(-)

diff --git a/ich_descriptors.c b/ich_descriptors.c
index 34100cb..a12022c 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -847,6 +847,8 @@
return (1 << (19 + size_enc));
}

+/* Only used by ichspi.c */
+#if CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__))
static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar)
{
uint32_t control = 0;
@@ -918,6 +920,7 @@
msg_pdbg2(" done.\n");
return ICH_RET_OK;
}
+#endif

/**
* @brief Read a layout from the dump of an Intel ICH descriptor.

To view, visit change 20265. To unsubscribe, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: staging
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002
Gerrit-Change-Number: 20265
Gerrit-PatchSet: 3
Gerrit-Owner: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>