[XS] Change in coreboot[main]: amdfwtool: Change&Record the current table in integration function

[Bao Zheng (Code Review)]

Attention is currently required from: Zheng Bao.

Hello Zheng Bao,

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

https://review.coreboot.org/c/coreboot/+/78280?usp=email

to review the following change.

Change subject: amdfwtool: Change&Record the current table in integration function
......................................................................

amdfwtool: Change&Record the current table in integration function

Align with the function integrating PSP FWs.

TEST=Identical test on all AMD platform

Change-Id: I1a98614f3a5756a462b01085e9565b52cf9a9343
Signed-off-by: Zheng Bao 
---
M util/amdfwtool/amdfwtool.c
1 file changed, 4 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/78280/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index caa8cda..99b0f9a 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1206,7 +1206,6 @@
    ((bios_directory_hdr *) ptr)->additional_info = 0;
    ((bios_directory_hdr *) ptr)->additional_info_fields.address_mode = ctx->address_mode;
    ((bios_directory_hdr *) ptr)->additional_info_fields.dir_size = table_size / TABLE_ALIGNMENT;
-	ctx->current_table = ctx->current;
    adjust_current_pointer(ctx, table_size, 1);
    return ptr;
 }
@@ -1295,6 +1294,7 @@
    int apob_idx;
    uint32_t size;
    uint64_t source;
+	uint32_t current_table_save;

/* This function can create a primary table, a secondary table, or a
     * flattened table which contains all applicable types.  These if-else
@@ -1312,6 +1312,8 @@
    else
    	level = BDT_BOTH;

+	current_table_save = ctx->current_table;
+	ctx->current_table = (char *)biosdir - ctx->rom;
    adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT);

for (i = 0, count = 0; fw_table[i].type != AMD_BIOS_INVALID; i++) {
@@ -1512,6 +1514,7 @@
    }

fill_dir_header(biosdir, count, cookie, ctx);
+	ctx->current_table = current_table_save;
 }

enum {