gen_devtree: Switch to mrw::Util::getBMCTarget
Change-Id: Ibae7102dadb48ae78630e37c27b1873ece098a81
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/gen_devtree.pl b/gen_devtree.pl
index 2eb3622..baa4056 100755
--- a/gen_devtree.pl
+++ b/gen_devtree.pl
@@ -7,6 +7,7 @@
use warnings;
use XML::Simple;
use mrw::Targets;
+use mrw::Util;
use Getopt::Long;
use YAML::Tiny qw(LoadFile);
use Scalar::Util qw(looks_like_number);
@@ -85,10 +86,7 @@
# $g_bmc, $g_bmcModel, $g_bmcMfgr, $g_systemName
sub setGlobalAttributes
{
- $g_bmc = getBMCTarget();
- if (length($g_bmc) == 0) {
- die "Unable to find a BMC in this system\n";
- }
+ $g_bmc = Util::getBMCTarget($g_targetObj);
if ($g_targetObj->isBadAttribute($g_bmc, "MODEL")) {
die "The MODEL attribute on $g_bmc is missing or empty.\n";
@@ -1106,20 +1104,6 @@
}
-#Returns the target for the BMC chip.
-#Not worrying about multiple BMC systems for now.
-sub getBMCTarget()
-{
- foreach my $target (sort keys %{ $g_targetObj->getAllTargets() })
- {
- if ($g_targetObj->getType($target) eq "BMC") {
- return $target;
- }
- }
- return "";
-}
-
-
#Prints the device tree version line.
# $f = file handle
sub printVersion