diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2015-02-22 13:59:40 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-26 11:35:06 -0600 |
| commit | 6c9eac071a9a79921c4b360af53e023dad19666f (patch) | |
| tree | 98535b18a228033ff66be87b278f021edcc425e3 /src/usr/devtree | |
| parent | 7e662f6e8d5ed87b59b6aa9100fc0fa0f72b74ab (diff) | |
| download | talos-hostboot-6c9eac071a9a79921c4b360af53e023dad19666f.tar.gz talos-hostboot-6c9eac071a9a79921c4b360af53e023dad19666f.zip | |
Prioritize system vpd over memb vpd in devtree
If multiple targets are using the same physical eeprom for
their vpd, the most senior of the targets is what should be
reported into the devtree.
Change-Id: Ic05761b634d24f3ef71adc17c572834876f2cee9
RTC: 124396
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15884
Tested-by: Jenkins Server
Reviewed-by: William H. Schwartz <whs@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/devtree')
| -rw-r--r-- | src/usr/devtree/bld_devtree.C | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C index 8548989a7..dd81392da 100644 --- a/src/usr/devtree/bld_devtree.C +++ b/src/usr/devtree/bld_devtree.C @@ -351,9 +351,12 @@ void add_i2c_info( const TARGETING::Target* i_targ, } else if( l_type == TARGETING::TYPE_MEMBUF ) { - sprintf( l_label, "memb-vpd-%d", + //@fixme-RTC:118373-Remove Hab/Palm workaround + // once node vpd is supported + sprintf( l_label, "system-vpd" ); + /*sprintf( l_label, "memb-vpd-%d", eep2->assocTarg - ->getAttr<TARGETING::ATTR_POSITION>() ); + ->getAttr<TARGETING::ATTR_POSITION>() );*/ } else if( l_type == TARGETING::TYPE_DIMM ) { |
