aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/amd/picasso/Makefile.inc6
-rw-r--r--util/amdfwtool/amdfwtool.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 42f1ef59f6..a0f3ec49a2 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -184,7 +184,10 @@ OPT_VERSTAGE_SIG_FILE=$(call add_opt_prefix, $(PSP_VERSTAGE_SIG_FILE), --verstag
OPT_PSP_APCB_FILES=$(foreach i, $(shell seq $(words $(PSP_APCB_FILES))), \
$(call add_opt_prefix, $(word $(i), $(PSP_APCB_FILES)), \
- --instance $(shell printf "%x" $$(($(i)-1))) --apcb ))
+ --instance $(shell printf "%x" $$(($(i)-1))) --apcb ) )
+OPT_PSP_APCB_FILES_BK=$(foreach i, $(shell seq $(words $(PSP_APCB_FILES))), \
+ $(call add_opt_prefix, $(word $(i), $(PSP_APCB_FILES)), \
+ --instance $(shell printf "1%x" $$(($(i)-1))) --apcb ) )
OPT_APOB_ADDR=$(call add_opt_prefix, $(PSP_APOB_BASE), --apob-base)
OPT_PSP_BIOSBIN_FILE=$(call add_opt_prefix, $(PSP_BIOSBIN_FILE), --bios-bin)
@@ -213,6 +216,7 @@ POUND_SIGN=$(call strip_quotes, "\#")
DEP_FILES= $(patsubst %,$(FIRMWARE_LOCATION)/%, $(shell sed -e /^$(POUND_SIGN)/d -e /^FIRMWARE_LOCATION/d $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}' ))
AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
+ $(OPT_PSP_APCB_FILES_BK) \
$(OPT_APOB_ADDR) \
$(OPT_PSP_BIOSBIN_FILE) \
$(OPT_PSP_BIOSBIN_DEST) \
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 401cf20d6c..5ae6d06186 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1342,9 +1342,11 @@ int main(int argc, char **argv)
sub = 0;
break;
case 'a':
- register_bdt_data(AMD_BIOS_APCB, sub, instance, optarg);
- register_bdt_data(AMD_BIOS_APCB_BK, sub,
- instance, optarg);
+ if ((instance & 0xF0) == 0)
+ register_bdt_data(AMD_BIOS_APCB, sub, instance & 0xF, optarg);
+ else
+ register_bdt_data(AMD_BIOS_APCB_BK, sub,
+ instance & 0xF, optarg);
sub = instance = 0;
break;
case 'Q':