summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsrc/build/mkrules/dist.targets.mk3
-rw-r--r--src/include/usr/errl/errludattribute.H97
-rw-r--r--src/usr/errl/errl.mk3
-rw-r--r--src/usr/errl/errludattribute.C83
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/xmltohb.pl169
-rw-r--r--src/usr/targeting/makefile3
-rw-r--r--src/usr/targeting/runtime/makefile3
-rwxr-xr-xsrc/usr/targeting/xmltohb/makefile5
8 files changed, 226 insertions, 140 deletions
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index e78385a6c..879522d06 100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -358,7 +358,8 @@ fsp.tar_CONTENTS = \
src/include/usr/hwas/common/hwasCallout.H:hwas/ \
src/include/usr/devicefw/driverif.H:devicefw/ \
src/include/usr/devicefw/userif.H:devicefw/ \
- obj/genfiles/plugins/errludattribute.H:plugins/ \
+ obj/genfiles/plugins/errludattribute_gen.H:plugins/ \
+ src/include/usr/errl/errludattribute.H:plugins/ \
obj/genfiles/plugins/errludtarget.H:plugins/ \
$(addsuffix :plugins/,\
$(call ROOTPATH_WILDCARD,obj/genfiles/plugins/hbfwSrcParse*.C)) \
diff --git a/src/include/usr/errl/errludattribute.H b/src/include/usr/errl/errludattribute.H
new file mode 100644
index 000000000..369f4a562
--- /dev/null
+++ b/src/include/usr/errl/errludattribute.H
@@ -0,0 +1,97 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/include/usr/errl/errludattribute.H $ */
+/* */
+/* OpenPOWER HostBoot Project */
+/* */
+/* Contributors Listed Below - COPYRIGHT 2019 */
+/* [+] International Business Machines Corp. */
+/* */
+/* */
+/* Licensed under the Apache License, Version 2.0 (the "License"); */
+/* you may not use this file except in compliance with the License. */
+/* You may obtain a copy of the License at */
+/* */
+/* http://www.apache.org/licenses/LICENSE-2.0 */
+/* */
+/* Unless required by applicable law or agreed to in writing, software */
+/* distributed under the License is distributed on an "AS IS" BASIS, */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
+/* implied. See the License for the specific language governing */
+/* permissions and limitations under the License. */
+/* */
+/* IBM_PROLOG_END_TAG */
+
+#ifndef ERRL_UDATTRIBUTE_H
+#define ERRL_UDATTRIBUTE_H
+
+/**
+ * Defines the classes that allow you to save attribute data to
+ * an error log.
+ */
+
+#if !defined(PARSER) && !defined(LOGPARSER)
+
+#include <errl/errluserdetails.H>
+
+namespace TARGETING // Forward reference
+{ class Target; }
+
+namespace ERRORLOG
+{
+class ErrlUserDetailsAttribute : public ErrlUserDetails {
+ public:
+
+ /**
+ * @brief Constructor to add a single attribute
+ *
+ * @param i_target Target from whom the attribute is being read
+ * @param i_attr Attribute id/hash
+ */
+ ErrlUserDetailsAttribute(const TARGETING::Target * i_pTarget,
+ uint32_t i_attr);
+
+ /**
+ * @brief Constructor to add no attributes (need to call addData)
+ *
+ * @param i_target Target from whom the attribute is being read
+ */
+ ErrlUserDetailsAttribute(const TARGETING::Target * i_pTarget);
+
+ /**
+ * @brief Add an additional attribute to the log
+ *
+ * @param i_attr Attribute id/hash
+ */
+ void addData(uint32_t i_attr);
+
+
+ /**
+ * @brief Destructor
+ */
+ virtual ~ErrlUserDetailsAttribute();
+
+ private:
+
+ // Disabled
+ ErrlUserDetailsAttribute(const ErrlUserDetailsAttribute &);
+ ErrlUserDetailsAttribute & operator=(const ErrlUserDetailsAttribute &);
+
+ // internal function
+ void dumpAll();
+
+ const TARGETING::Target * iv_pTarget;
+ uint32_t iv_dataSize;
+};
+}
+#else // if LOGPARSER defined
+
+#include "errluserdetails.H"
+
+// Pull in the auto-generated portion for the parser
+#include <errl/errludattribute_gen.H>
+
+#endif
+
+#endif //ERRL_UDATTRIBUTE_H
diff --git a/src/usr/errl/errl.mk b/src/usr/errl/errl.mk
index 8cab37324..8caf92216 100644
--- a/src/usr/errl/errl.mk
+++ b/src/usr/errl/errl.mk
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2015,2018
+# Contributors Listed Below - COPYRIGHT 2015,2019
# [+] International Business Machines Corp.
#
#
@@ -41,3 +41,4 @@ OBJS += errludsensor.o
OBJS += errludstate.o
OBJS += errlmanager_common.o
OBJS += errli2c.o
+OBJS += errludattribute.o
diff --git a/src/usr/errl/errludattribute.C b/src/usr/errl/errludattribute.C
new file mode 100644
index 000000000..4f2b322f7
--- /dev/null
+++ b/src/usr/errl/errludattribute.C
@@ -0,0 +1,83 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/errl/errludattribute.C $ */
+/* */
+/* OpenPOWER HostBoot Project */
+/* */
+/* Contributors Listed Below - COPYRIGHT 2019 */
+/* [+] International Business Machines Corp. */
+/* */
+/* */
+/* Licensed under the Apache License, Version 2.0 (the "License"); */
+/* you may not use this file except in compliance with the License. */
+/* You may obtain a copy of the License at */
+/* */
+/* http://www.apache.org/licenses/LICENSE-2.0 */
+/* */
+/* Unless required by applicable law or agreed to in writing, software */
+/* distributed under the License is distributed on an "AS IS" BASIS, */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
+/* implied. See the License for the specific language governing */
+/* permissions and limitations under the License. */
+/* */
+/* IBM_PROLOG_END_TAG */
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <errl/errludattribute.H>
+#include <errl/errlreasoncodes.H>
+#include <targeting/common/targetservice.H>
+#include <targeting/common/trace.H>
+
+namespace ERRORLOG
+{
+using namespace TARGETING;
+extern TARG_TD_t g_trac_errl;
+
+
+//------------------------------------------------------------------------------
+ErrlUserDetailsAttribute::ErrlUserDetailsAttribute(
+ const Target * i_pTarget, uint32_t i_attr)
+ : iv_pTarget(i_pTarget), iv_dataSize(0)
+{
+ // Set up ErrlUserDetails instance variables
+ iv_CompId = ERRL_COMP_ID;
+ iv_Version = 1;
+ iv_SubSection = ERRL_UDT_ATTRIBUTE;
+ // override the default of false
+ iv_merge = true;
+
+ // first, write out the HUID
+ addData(ATTR_HUID);
+ if (i_attr != ATTR_HUID) {
+ addData(i_attr);
+ }
+}
+
+//------------------------------------------------------------------------------
+ErrlUserDetailsAttribute::ErrlUserDetailsAttribute(
+ const Target * i_pTarget)
+ : iv_pTarget(i_pTarget), iv_dataSize(0)
+{
+ // Set up ErrlUserDetails instance variables
+ iv_CompId = ERRL_COMP_ID;
+ iv_Version = 1;
+ iv_SubSection = ERRL_UDT_ATTRIBUTE;
+ // override the default of false
+ iv_merge = true;
+
+ // first, write out the HUID
+ addData(ATTR_HUID);
+}
+
+//------------------------------------------------------------------------------
+ErrlUserDetailsAttribute::~ErrlUserDetailsAttribute()
+{ }
+} // namespace
+
+// Pull in the auto-generated portion
+// ::addData
+// ::dumpAll
+#include <errludattribute_gen.C>
+
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index 1575bdc9e..e3d0f3677 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -363,17 +363,17 @@ if( !($cfgSrcOutputDir =~ "none") )
writeFapi2PlatAttrMacrosHeaderFileFooter ($fapi2PlatAttrMacrosHeaderFile);
close $fapi2PlatAttrMacrosHeaderFile;
- open(ATTR_ATTRERRL_C_FILE,">$cfgSrcOutputDir"."errludattribute.C")
+ open(ATTR_ATTRERRL_C_FILE,">$cfgSrcOutputDir"."errludattribute_gen.C")
or croak ("Attribute errlog C file: \"$cfgSrcOutputDir"
- . "errludattribute.C\" could not be opened.");
+ . "errludattribute_gen.C\" could not be opened.");
my $attrErrlCFile = *ATTR_ATTRERRL_C_FILE;
writeAttrErrlCFile($attributes,$attrErrlCFile);
close $attrErrlCFile;
mkdir("$cfgSrcOutputDir/errl");
- open(ATTR_ATTRERRL_H_FILE,">$cfgSrcOutputDir"."errl/errludattribute.H")
+ open(ATTR_ATTRERRL_H_FILE,">$cfgSrcOutputDir"."errl/errludattribute_gen.H")
or croak ("Attribute errlog H file: \"$cfgSrcOutputDir"
- . "errl/errludattribute.H\" could not be opened.");
+ . "errl/errludattribute_gen.H\" could not be opened.");
my $attrErrlHFile = *ATTR_ATTRERRL_H_FILE;
writeAttrErrlHFile($attributes,$attrErrlHFile);
close $attrErrlHFile;
@@ -2750,14 +2750,6 @@ VERBATIM
sub writeAttrErrlCFile {
my($attributes,$outFile) = @_;
- #First setup the includes and function definition
- print $outFile "#include <stdint.h>\n";
- print $outFile "#include <stdio.h>\n";
- print $outFile "#include <string.h>\n";
- print $outFile "#include <errl/errludattribute.H>\n";
- print $outFile "#include <errl/errlreasoncodes.H>\n";
- print $outFile "#include <targeting/common/targetservice.H>\n";
- print $outFile "#include <targeting/common/trace.H>\n";
print $outFile "\n";
print $outFile "namespace ERRORLOG\n";
print $outFile "{\n";
@@ -2774,52 +2766,38 @@ sub writeAttrErrlCFile {
print $outFile "\n";
print $outFile " switch (i_attr) {\n";
- print $outFile " case (ATTR_SERIAL_NUMBER): { //simpleType:uint, :int...\n";
- print $outFile " //TRACDCOMP( g_trac_errl, \"ErrlUserDetailsAttribute: SERIAL_NUMBER entry\");\n";
- print $outFile " AttributeTraits<ATTR_SERIAL_NUMBER>::Type tmp;\n";
- print $outFile " if( iv_pTarget->tryGetAttr<ATTR_SERIAL_NUMBER>(tmp) ) {\n";
- print $outFile " tmpBuffer = new char[sizeof(tmp)];\n";
- print $outFile " memcpy(tmpBuffer, &tmp, sizeof(tmp));\n";
- print $outFile " attrSize = sizeof(tmp);\n";
- print $outFile " }\n";
- print $outFile " break;\n";
- print $outFile " }\n";
- print $outFile " case (ATTR_PART_NUMBER): { //simpleType:uint, :int...\n";
- print $outFile " //TRACDCOMP( g_trac_errl, \"ErrlUserDetailsAttribute: PART_NUMBER entry\");\n";
- print $outFile " AttributeTraits<ATTR_PART_NUMBER>::Type tmp;\n";
- print $outFile " if( iv_pTarget->tryGetAttr<ATTR_PART_NUMBER>(tmp) ) {\n";
- print $outFile " tmpBuffer = new char[sizeof(tmp)];\n";
- print $outFile " memcpy(tmpBuffer, &tmp, sizeof(tmp));\n";
- print $outFile " attrSize = sizeof(tmp);\n";
- print $outFile " }\n";
- print $outFile " break;\n";
- print $outFile " }\n";
- print $outFile " case (ATTR_PEC_PCIE_HX_KEYWORD_DATA): { //simpleType:uint, :int...\n";
- print $outFile " //TRACDCOMP( g_trac_errl, \"ErrlUserDetailsAttribute: PEC_PCIE_HX_KEYWORD_DATA entry\");\n";
- print $outFile " AttributeTraits<ATTR_PEC_PCIE_HX_KEYWORD_DATA>::Type tmp;\n";
- print $outFile " if( iv_pTarget->tryGetAttr<ATTR_PEC_PCIE_HX_KEYWORD_DATA>(tmp) ) {\n";
- print $outFile " tmpBuffer = new char[sizeof(tmp)];\n";
- print $outFile " memcpy(tmpBuffer, &tmp, sizeof(tmp));\n";
- print $outFile " attrSize = sizeof(tmp);\n";
- print $outFile " }\n";
- print $outFile " break;\n";
- print $outFile " }\n";
- print $outFile "#if 0 //\@fixme-RTC:152874\n";
+ # List of attributes we want to explicitly support
+ my @allowed_attributes = (
+ "SERIAL_NUMBER",
+ "PART_NUMBER",
+ "PEC_PCIE_HX_KEYWORD_DATA",
+ "ECID",
+ "HUID",
+ );
- # loop through every attribute to make the swith/case
+ # loop through every attribute to make the switch/case
foreach my $attribute (@{$attributes->{attribute}})
{
+ my $skippedattr = 0;
+ if( grep { $_ eq $attribute->{id} } @allowed_attributes )
+ {
+ print "Allowing $attribute->{id}\n";
+ }
+ else
+ {
+ print $outFile "#if 0 //\@fixme-RTC:152874\n";
+ $skippedattr = 1;
+ }
+
# things we'll skip:
if(!(exists $attribute->{readable}) || # write-only attributes
- !(exists $attribute->{writeable}) || # read-only attributes
(exists $attribute->{simpleType} && (
(exists $attribute->{simpleType}->{hbmutex}) ||
(exists $attribute->{simpleType}->{hbrecrusivemutex}) ||
(exists $attribute->{simpleType}->{fspmutex}))) # mutex attributes
) {
print $outFile " case (ATTR_",$attribute->{id},"): { break; }\n";
- next;
}
# any complicated types just get dumped as raw hex binary
elsif(exists $attribute->{complexType}) {
@@ -2904,6 +2882,11 @@ sub writeAttrErrlCFile {
print $outFile " break;\n";
print $outFile " }\n";
}
+
+ if( $skippedattr )
+ {
+ print $outFile "#endif //\@fixme-RTC:152874\n";
+ }
}
print $outFile " default: { //Shouldn't be anything here!!\n";
@@ -2911,7 +2894,6 @@ sub writeAttrErrlCFile {
print $outFile " break;\n";
print $outFile " }\n";
- print $outFile "#endif //\@fixme-RTC:152874\n";
print $outFile " } //switch\n";
print $outFile "\n";
@@ -2930,45 +2912,6 @@ sub writeAttrErrlCFile {
print $outFile "}\n";
print $outFile "\n";
- # build constructor that dumps 1 attribute
- print $outFile "\n";
- print $outFile "//------------------------------------------------------------------------------\n";
- print $outFile "ErrlUserDetailsAttribute::ErrlUserDetailsAttribute(\n";
- print $outFile " const Target * i_pTarget, uint32_t i_attr)\n";
- print $outFile " : iv_pTarget(i_pTarget), iv_dataSize(0)\n";
- print $outFile "{\n";
- print $outFile " // Set up ErrlUserDetails instance variables\n";
- print $outFile " iv_CompId = ERRL_COMP_ID;\n";
- print $outFile " iv_Version = 1;\n";
- print $outFile " iv_SubSection = ERRL_UDT_ATTRIBUTE;\n";
- print $outFile " // override the default of false\n";
- print $outFile " iv_merge = true;\n";
- print $outFile "\n";
- print $outFile " // first, write out the HUID\n";
- print $outFile " addData(ATTR_HUID);\n";
- print $outFile " if (i_attr != ATTR_HUID) {\n";
- print $outFile " addData(i_attr);\n";
- print $outFile " }\n";
- print $outFile "}\n";
- print $outFile "\n";
-
- # build constructor that dumps all attributes
- print $outFile "//------------------------------------------------------------------------------\n";
- print $outFile "ErrlUserDetailsAttribute::ErrlUserDetailsAttribute(\n";
- print $outFile " const Target * i_pTarget)\n";
- print $outFile " : iv_pTarget(i_pTarget), iv_dataSize(0)\n";
- print $outFile "{\n";
- print $outFile " // Set up ErrlUserDetails instance variables\n";
- print $outFile " iv_CompId = ERRL_COMP_ID;\n";
- print $outFile " iv_Version = 1;\n";
- print $outFile " iv_SubSection = ERRL_UDT_ATTRIBUTE;\n";
- print $outFile " // override the default of false\n";
- print $outFile " iv_merge = true;\n";
- print $outFile "\n";
- print $outFile " dumpAll();\n";
- print $outFile "}\n";
- print $outFile "\n";
-
# build internal function that dumps all attributes
print $outFile "//------------------------------------------------------------------------------\n";
print $outFile "void ErrlUserDetailsAttribute::dumpAll()\n";
@@ -2999,10 +2942,7 @@ sub writeAttrErrlCFile {
print $outFile "\n";
- print $outFile "//------------------------------------------------------------------------------\n";
- print $outFile "ErrlUserDetailsAttribute::~ErrlUserDetailsAttribute()\n";
- print $outFile "{ }\n";
- print $outFile "} // namespace\n";
+ print $outFile "} // namespace\n\n";
} # sub writeAttrErrlCFile
@@ -3012,44 +2952,7 @@ sub writeAttrErrlCFile {
sub writeAttrErrlHFile {
my($attributes,$outFile) = @_;
- #First setup the includes and function definition
- print $outFile "\n";
- print $outFile "#ifndef ERRL_UDATTRIBUTE_H\n";
- print $outFile "#define ERRL_UDATTRIBUTE_H\n";
- print $outFile "\n";
- print $outFile "#if !defined(PARSER) && !defined(LOGPARSER)\n";
- print $outFile "\n";
- print $outFile "#include <errl/errluserdetails.H>\n";
- print $outFile "\n";
- print $outFile "namespace TARGETING // Forward reference\n";
- print $outFile "{ class Target; }\n";
- print $outFile "\n";
- print $outFile "namespace ERRORLOG\n";
- print $outFile "{\n";
- print $outFile "class ErrlUserDetailsAttribute : public ErrlUserDetails {\n";
- print $outFile "public:\n";
- print $outFile "\n";
- print $outFile " ErrlUserDetailsAttribute(const TARGETING::Target * i_pTarget, uint32_t i_attr);\n";
- print $outFile " ErrlUserDetailsAttribute(const TARGETING::Target * i_pTarget);\n";
- print $outFile " void addData(uint32_t i_attr);\n";
- print $outFile " virtual ~ErrlUserDetailsAttribute();\n";
- print $outFile "\n";
- print $outFile "private:\n";
- print $outFile "\n";
- print $outFile " // Disabled\n";
- print $outFile " ErrlUserDetailsAttribute(const ErrlUserDetailsAttribute &);\n";
- print $outFile " ErrlUserDetailsAttribute & operator=(const ErrlUserDetailsAttribute &);\n";
- print $outFile "\n";
- print $outFile " // internal function\n";
- print $outFile " void dumpAll();\n";
- print $outFile "\n";
- print $outFile " const TARGETING::Target * iv_pTarget;\n";
- print $outFile " uint32_t iv_dataSize;\n";
- print $outFile "};\n";
- print $outFile "}\n";
- print $outFile "#else // if LOGPARSER defined\n";
- print $outFile "\n";
- print $outFile "#include \"errluserdetails.H\"\n";
+ # Inserts inside LOGPARSER leg in errludattribute.H
print $outFile "\n";
print $outFile "namespace ERRORLOG\n";
print $outFile "{\n";
@@ -3082,6 +2985,7 @@ sub writeAttrErrlHFile {
print $outFile " // first 4 bytes is the attr enum\n";
print $outFile " uint32_t attrEnum = ntohl(*(uint32_t *)l_ptr);\n";
print $outFile " l_ptr += sizeof(attrEnum);\n";
+ print $outFile " char* tmplabel = NULL;\n";
print $outFile "\n";
print $outFile " switch (attrEnum) {\n";
@@ -3328,7 +3232,9 @@ sub writeAttrErrlHFile {
print $outFile " }\n";
}
print $outFile " default: {\n";
- print $outFile " pLabel = \"unknown Attribute\";\n";
+ print $outFile " tmplabel = new char[30];\n";
+ print $outFile " sprintf( tmplabel, \"Unknown [0x%x]\", attrEnum );\n";
+ print $outFile " pLabel = tmplabel;\n";
print $outFile " break;\n";
print $outFile " }\n";
print $outFile " } // switch\n";
@@ -3337,6 +3243,7 @@ sub writeAttrErrlHFile {
print $outFile " if (pLabel != NULL) {\n";
print $outFile " i_parser.PrintString(pLabel, &(l_traceEntry[0]));\n";
print $outFile " }\n";
+ print $outFile " if( tmplabel != NULL ) { delete[] tmplabel; }\n";
print $outFile " } // for\n";
print $outFile " } // parse\n\n";
print $outFile "private:\n";
@@ -3345,9 +3252,7 @@ sub writeAttrErrlHFile {
print $outFile "ErrlUserDetailsParserAttribute(const ErrlUserDetailsParserAttribute &);\n";
print $outFile "ErrlUserDetailsParserAttribute & operator=(const ErrlUserDetailsParserAttribute &);\n";
print $outFile "};\n";
- print $outFile "} // namespace\n";
- print $outFile "#endif\n";
- print $outFile "#endif\n";
+ print $outFile "} // namespace\n\n";
} # sub writeAttrErrlHFile
######
diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
index 531c3fb7f..56f29e51d 100644
--- a/src/usr/targeting/makefile
+++ b/src/usr/targeting/makefile
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2011,2018
+# Contributors Listed Below - COPYRIGHT 2011,2019
# [+] International Business Machines Corp.
#
#
@@ -54,7 +54,6 @@ HOSTBOOT_SPECIFIC_OBJS += ${ATTR_RP_OBJS}
HOSTBOOT_SPECIFIC_OBJS += ${DEBUG_OBJS}
HOSTBOOT_SPECIFIC_OBJS += ${HOSTBOOT_RT_IPL_COMMON_OBJS}
HOSTBOOT_SPECIFIC_OBJS += namedtarget.o
-HOSTBOOT_SPECIFIC_OBJS += errludattribute.o
HOSTBOOT_SPECIFIC_OBJS += attrcheck_errl.o
OBJS += persistrwattrcheck.o
diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile
index ffb2e8a14..9d872cef7 100644
--- a/src/usr/targeting/runtime/makefile
+++ b/src/usr/targeting/runtime/makefile
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2013,2018
+# Contributors Listed Below - COPYRIGHT 2013,2019
# [+] International Business Machines Corp.
#
#
@@ -38,7 +38,6 @@ HOSTBOOT_RUNTIME_SPECIFIC_OBJS += start_rt.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += targplatutil.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_targeting.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrPlatOverride_rt.o
-HOSTBOOT_RUNTIME_SPECIFIC_OBJS += errludattribute.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attributestrings.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrsync.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_startup.o
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index 2f3dabf3b..5a14ebe88 100755
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -232,7 +232,8 @@ CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml})
CLEAN_TARGETS += ${GENDIR}/${HB_PLAT_ATTR_SRVC_H}
CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_GENERIC_XML}
CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_FAPI_XML}
-CLEAN_TARGETS += ${GENDIR}/errl/errludattribute.H
+CLEAN_TARGETS += ${GENDIR}/errl/errludattribute_gen.H
+CLEAN_TARGETS += ${GENDIR}/errludattribute_gen.C
CLEAN_TARGETS += ${GENDIR}/errl/errludtarget.H
CLEAN_TARGETS += ${GENDIR}/targAttrInfo.csv
CLEAN_TARGETS += ${GENDIR}/targAttrOverrideData.H
@@ -411,7 +412,7 @@ $(XMLTOHB_RAN_INDICATION): ${XMLTOHB_COMPILER_SCRIPT} \
$(addprefix --fapi-attributes-xml-file=,${GENDIR}/${XMLTOHB_FAPI_XML}) \
--src-output-dir=$(GENDIR) --img-output-dir=none \
--img-output-file=none
- cp ${GENDIR_ERRL}/errludattribute.H ${GENDIR_PLUGINS}
+ cp ${GENDIR_ERRL}/errludattribute_gen.H ${GENDIR_PLUGINS}
cp ${GENDIR_ERRL}/errludtarget.H ${GENDIR_PLUGINS}
touch $(XMLTOHB_RAN_INDICATION)
OpenPOWER on IntegriCloud