[flashrom-gerrit] Change in flashrom[1.0.x]: ichspi: Fix software sequencing for Skylake

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/22332

Change subject: ichspi: Fix software sequencing for Skylake
......................................................................

ichspi: Fix software sequencing for Skylake

Two occurences of ICH9_REG_OPMENU were overlooked and not replaced,
rendering the software sequencing unusable on Skylake.

Change-Id: I16eebcf37ab8ba39b02f33135535552e380b0b92
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/22273
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
(cherry picked from commit 8b2152d54a67e4139525ce49aefe1a6d0e41b85c)
---
M ichspi.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/32/22332/1

diff --git a/ichspi.c b/ichspi.c
index 9d6b62b..ec81628 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -983,8 +983,8 @@
    }

/* Select opcode */
-	opmenu = REGREAD32(ICH9_REG_OPMENU);
-	opmenu |= ((uint64_t)REGREAD32(ICH9_REG_OPMENU + 4)) << 32;
+	opmenu = REGREAD32(swseq_data.reg_opmenu);
+	opmenu |= ((uint64_t)REGREAD32(swseq_data.reg_opmenu + 4)) << 32;

for (opcode_index = 0; opcode_index < 8; opcode_index++) {
    	if ((opmenu & 0xff) == op.opcode) {