diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/image/sbe_default_tool.c | 8 | ||||
-rwxr-xr-x | src/tools/scripts/ppeCreateAttrGetSetMacros.pl | 19 | ||||
-rwxr-xr-x | src/tools/scripts/ppeParseProcSbeFixed.pl | 2 |
3 files changed, 6 insertions, 23 deletions
diff --git a/src/tools/image/sbe_default_tool.c b/src/tools/image/sbe_default_tool.c index 82d34bc7..2600a365 100644 --- a/src/tools/image/sbe_default_tool.c +++ b/src/tools/image/sbe_default_tool.c @@ -94,13 +94,13 @@ void assertTarget(const char* str, unsigned int index) exit(1); } } else if(strcmp(str, "TARGET_TYPE_PERV") == 0) { - if (index > PERV_TARGET_COUNT) { - fprintf(stderr, "sbe_default_tool: index (%d) is larger than PERV_TARGET_COUNT (%d)\n", - index, PERV_TARGET_COUNT); + if (index > MAX_PERV_CHIPLETS) { + fprintf(stderr, "sbe_default_tool: index (%d) is larger than MAX_PERV_CHIPLETS (%d)\n", + index, MAX_PERV_CHIPLETS); exit(1); } } else { - if (index >= PERV_TARGET_COUNT) { + if (index >= MAX_PERV_CHIPLETS) { fprintf(stderr, "sbe_default_tool: target not supported:"); fprintf(stderr, " %s\n", str); exit(1); diff --git a/src/tools/scripts/ppeCreateAttrGetSetMacros.pl b/src/tools/scripts/ppeCreateAttrGetSetMacros.pl index a0004f39..a77054c9 100755 --- a/src/tools/scripts/ppeCreateAttrGetSetMacros.pl +++ b/src/tools/scripts/ppeCreateAttrGetSetMacros.pl @@ -366,24 +366,7 @@ if (@newAttributeDefines != 0) { print OUTFILE " __attribute__((always_inline)) inline uint32_t getPervAttrIndex(const fapi2::Target<TARGET_TYPE_PERV> &i_target) { - uint32_t l_index = static_cast<plat_target_handle_t>(i_target.get()).getTargetInstance(); - if(PPE_TARGET_TYPE_EQ & static_cast<plat_target_handle_t>(i_target.get()).getTargetType()) - { - l_index += (EQ_TARGET_OFFSET); - } - else if(PPE_TARGET_TYPE_CORE & static_cast<plat_target_handle_t>(i_target.get()).getTargetType()) - { - l_index += (CORE_TARGET_OFFSET); - } - else if(PPE_TARGET_TYPE_MCBIST & static_cast<plat_target_handle_t>(i_target.get()).getTargetType()) - { - l_index += (MCBIST_TARGET_OFFSET); - } - else - { - l_index += (NEST_GROUP1_TARGET_OFFSET); - } - return (l_index - NEST_GROUP1_TARGET_OFFSET); + return i_target.getChipletNumber(); } "; diff --git a/src/tools/scripts/ppeParseProcSbeFixed.pl b/src/tools/scripts/ppeParseProcSbeFixed.pl index f58a0ef5..80c68afb 100755 --- a/src/tools/scripts/ppeParseProcSbeFixed.pl +++ b/src/tools/scripts/ppeParseProcSbeFixed.pl @@ -298,7 +298,7 @@ foreach my $attr (@attrPervIds) { my $value = uc $attr->{valueType}; - print PEFILE "PROC_SBE_FIXED_TARGET_$value($attr->{id}, PERV_TARGET_COUNT);\n" + print PEFILE "PROC_SBE_FIXED_TARGET_$value($attr->{id}, MAX_PERV_CHIPLETS);\n" } |