[coreboot-gerrit] Change in coreboot[master]: Revert "amdfwtool: Use relative address for EFS gen2"

[Kangheui Won (Code Review)]

Attention is currently required from: Jason Glenesk, Bao Zheng, Raul Rangel, Martin Roth, Marshall Dawson, Paul Menzel, Zheng Bao, Felix Held.
Hello Bao Zheng, build bot (Jenkins), Jason Glenesk, Raul Rangel, Martin Roth, Marshall Dawson, Paul Menzel, Zheng Bao, Felix Held,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/56131

to review the following change.

Change subject: Revert "amdfwtool: Use relative address for EFS gen2"
......................................................................

Revert "amdfwtool: Use relative address for EFS gen2"

This reverts commit 0fc87e31e0b9ad15dd199fe96189a2ade6abf240.

Reason for revert: Breaks psp_verstage in guybrush

BUG=b:182477057

Change-Id: Ie50cba4aaf31425ef8fee848c098a826f55c98da
---
M util/amdfwtool/amdfwtool.c
1 file changed, 3 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/56131/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 9299aec..1e75278 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -343,12 +343,11 @@
 typedef struct _context {
    char *rom;		/* target buffer, size of flash device */
    uint32_t rom_size;	/* size of flash device */
-	uint32_t abs_address;	/* produce absolute or relative address */
    uint32_t current;	/* pointer within flash & proxy buffer */
 } context;

#define RUN_BASE(ctx) (0xFFFFFFFF - (ctx).rom_size + 1)
-#define RUN_OFFSET(ctx, offset) ((ctx).abs_address ? RUN_BASE(ctx) + (offset) : (offset))
+#define RUN_OFFSET(ctx, offset) (RUN_BASE(ctx) + (offset))
 #define RUN_CURRENT(ctx) RUN_OFFSET((ctx), (ctx).current)
 #define BUFF_OFFSET(ctx, offset) ((void *)((ctx).rom + (offset)))
 #define BUFF_CURRENT(ctx) BUFF_OFFSET((ctx), (ctx).current)
@@ -1537,6 +1536,8 @@
    	romsig_offset = ctx.current = dir_location - rom_base_address;
    else
    	romsig_offset = ctx.current = AMD_ROMSIG_OFFSET;
+	printf("    AMDFWTOOL  Using firmware directory location of 0x%08x\n",
+			RUN_CURRENT(ctx));

amd_romsig = BUFF_OFFSET(ctx, romsig_offset);
    amd_romsig->signature = EMBEDDED_FW_SIGNATURE;
@@ -1555,13 +1556,6 @@
    	fprintf(stderr, "WARNING: No SOC name specified.\n");
    }

-	if (amd_romsig->efs_gen.gen == EFS_SECOND_GEN)
-		ctx.abs_address = 0;
-	else
-		ctx.abs_address = 1;
-	printf("    AMDFWTOOL  Using firmware directory location of %s address: 0x%08x\n",
-			ctx.abs_address == 1 ? "absolute" : "relative", RUN_CURRENT(ctx));
-
    integrate_firmwares(&ctx, amd_romsig, amd_fw_table);

ctx.current = ALIGN(ctx.current, 0x10000U); /* TODO: is it necessary? */