[coreboot-gerrit] [S] Change in coreboot[main]: amdfwtool: Set the level based on cookie

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81208?usp=email )

(

5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: amdfwtool: Set the level based on cookie
......................................................................

amdfwtool: Set the level based on cookie

It was complicated and weird to check both the cookie and whether one
table is a null pointer. Just checking the cookie is enough.

TEST=Identical test on all AMD SOC platform

Change-Id: Icab74714990f74e11fd5e899661e4e2d41230541
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81208
Reviewed-by: Felix Held 
Tested-by: build bot (Jenkins) 
---
M util/amdfwtool/amdfwtool.c
1 file changed, 5 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index d98c2a4..3e71832 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -878,14 +878,13 @@
     * flattened table which contains all applicable types.  These if-else
     * statements infer what the caller intended.  If a 2nd-level cookie
     * is passed, clearly a 2nd-level table is intended.  However, a
-	 * 1st-level cookie may indicate level 1 or flattened.  If the caller
-	 * passes a pointer to a 2nd-level table, then assume not flat.
+	 * 1st-level cookie may indicate level 1 or flattened.
     */
    if (!cb_config->multi_level)
    	level = PSP_BOTH;
    else if (cookie == PSPL2_COOKIE)
    	level = PSP_LVL2;
-	else if (pspdir2)
+	else if (cookie == PSP_COOKIE)
    	level = PSP_LVL1;
    else
    	level = PSP_BOTH;
@@ -893,7 +892,7 @@
    if (recovery_ab) {
    	if (cookie == PSPL2_COOKIE)
    		level = PSP_LVL2_AB;
-		else if (pspdir2)
+		else if (cookie == PSP_COOKIE)
    		level = PSP_LVL1_AB;
    	else
    		level = PSP_BOTH_AB;
@@ -1180,14 +1179,13 @@
     * flattened table which contains all applicable types.  These if-else
     * statements infer what the caller intended.  If a 2nd-level cookie
     * is passed, clearly a 2nd-level table is intended.  However, a
-	 * 1st-level cookie may indicate level 1 or flattened.  If the caller
-	 * passes a pointer to a 2nd-level table, then assume not flat.
+	 * 1st-level cookie may indicate level 1 or flattened.
     */
    if (!cb_config->multi_level)
    	level = BDT_BOTH;
    else if (cookie == BHDL2_COOKIE)
    	level = BDT_LVL2;
-	else if (biosdir2)
+	else if (cookie == BHD_COOKIE)
    	level = BDT_LVL1;
    else
    	level = BDT_BOTH;