Merge pull request #2361 from bdragon28/openpower-mrw-is-obsolete
Stop trying to build obsolete tools on POWER9.
diff --git a/openpower/package/machine-xml/Config.in b/openpower/package/machine-xml/Config.in
index 5fcf37a..3dedcfd 100755
--- a/openpower/package/machine-xml/Config.in
+++ b/openpower/package/machine-xml/Config.in
@@ -3,7 +3,7 @@
config BR2_PACKAGE_MACHINE_XML
bool "machine_xml"
default y if (BR2_OPENPOWER_PLATFORM)
- select BR2_PACKAGE_COMMON_P8_XML
+ select BR2_PACKAGE_COMMON_P8_XML if (BR2_OPENPOWER_POWER8)
help
choice
diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index dc05d0d..4d31c4f 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -13,13 +13,13 @@
MACHINE_XML_LICENSE = Apache-2.0
MACHINE_XML_LICENSE_FILES = LICENSE
-MACHINE_XML_DEPENDENCIES = openpower-mrw common-p8-xml
+MACHINE_XML_DEPENDENCIES =
ifeq ($(BR2_OPENPOWER_POWER9),y)
MACHINE_XML_DEPENDENCIES += hostboot
endif
ifeq ($(BR2_OPENPOWER_POWER8),y)
-MACHINE_XML_DEPENDENCIES += hostboot-p8
+MACHINE_XML_DEPENDENCIES += hostboot-p8 openpower-mrw common-p8-xml
endif
MACHINE_XML_INSTALL_IMAGES = YES
diff --git a/openpower/package/openpower-mrw/Config.in b/openpower/package/openpower-mrw/Config.in
index 9e3b355..ea052b4 100644
--- a/openpower/package/openpower-mrw/Config.in
+++ b/openpower/package/openpower-mrw/Config.in
@@ -1,3 +1,3 @@
config BR2_PACKAGE_OPENPOWER_MRW
bool "Machine Readable Workbook (MRW) infrastructure"
- default y if (BR2_PACKAGE_HOSTBOOT_P8 || BR2_PACKAGE_HOSTBOOT_P9)
+ default y if BR2_PACKAGE_HOSTBOOT_P8