Change in coreboot[master]: soc/amd/picasso: Fix always empty AMDFWTOOL args

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63782 )

Change subject: soc/amd/picasso: Fix always empty AMDFWTOOL args
......................................................................

soc/amd/picasso: Fix always empty AMDFWTOOL args

APOB_NV_BASE/SIZE on the default apu/amdfw would always be unset,
because the ifeq statement is always 0.

Change-Id: I64617fa9cf56d0f7da9f2a384437a28e76cfb4d7
Signed-off-by: Arthur Heymans 
---
M src/soc/amd/picasso/Makefile.inc
1 file changed, 2 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/63782/1

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 8eef153..fbf466b 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -194,11 +194,6 @@

OPT_PSP_SOFTFUSE=$(call add_opt_prefix, $(PSP_SOFTFUSE), --soft-fuse)

-ifeq ($(CONFIG_VBOOT),)
-OPT_APOB0_NV_SIZE=$(OPT_APOB_NV_SIZE)
-OPT_APOB0_NV_BASE=$(OPT_APOB_NV_BASE)
-endif
-
 OPT_WHITELIST_FILE=$(call add_opt_prefix, $(PSP_WHITELIST_FILE), --whitelist)

# Add all the files listed in the config file
@@ -240,8 +235,8 @@
    @printf "    AMDFWTOOL  $(subst $(obj)/,,$(@))\n"
    $(AMDFWTOOL) \
    	$(AMDFW_COMMON_ARGS) \
-		$(OPT_APOB0_NV_SIZE) \
-		$(OPT_APOB0_NV_BASE) \
+		$(OPT_APOB_NV_SIZE) \
+		$(OPT_APOB_NV_BASE) \
    	$(OPT_VERSTAGE_FILE) \
    	$(OPT_VERSTAGE_SIG_FILE) \
    	--location $(shell printf "%#x" $(PICASSO_FWM_POSITION)) \