Merge pull request #550 from jk-ozlabs/dependencies
Fix dependencies for openpower-pnor & xml packages
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index 902d2ec..571d4c0 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -1,6 +1,8 @@
source "$BR2_EXTERNAL/package/openpower-ffs/Config.in"
source "$BR2_EXTERNAL/package/hostboot/Config.in"
source "$BR2_EXTERNAL/package/hostboot-binaries/Config.in"
+source "$BR2_EXTERNAL/package/openpower-mrw/Config.in"
+source "$BR2_EXTERNAL/package/common-p8-xml/Config.in"
source "$BR2_EXTERNAL/package/palmetto-xml/Config.in"
source "$BR2_EXTERNAL/package/habanero-xml/Config.in"
source "$BR2_EXTERNAL/package/firestone-xml/Config.in"
diff --git a/openpower/package/barreleye-xml/Config.in b/openpower/package/barreleye-xml/Config.in
index 9187dac..5a8ba74 100755
--- a/openpower/package/barreleye-xml/Config.in
+++ b/openpower/package/barreleye-xml/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_BARRELEYE_XML
bool "barreleye_xml"
default y if (BR2_OPENPOWER_CONFIG_NAME = "barreleye")
+ select BR2_PACKAGE_COMMON_P8_XML
help
Utilites for building xml and the targeting binary image
diff --git a/openpower/package/barreleye-xml/barreleye-xml.mk b/openpower/package/barreleye-xml/barreleye-xml.mk
index 398ed99..13a3365 100755
--- a/openpower/package/barreleye-xml/barreleye-xml.mk
+++ b/openpower/package/barreleye-xml/barreleye-xml.mk
@@ -8,7 +8,7 @@
BARRELEYE_XML_SITE = $(call github,open-power,barreleye-xml,$(BARRELEYE_XML_VERSION))
BARRELEYE_XML_LICENSE = Apache-2.0
-BARRELEYE_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+BARRELEYE_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml
BARRELEYE_XML_INSTALL_IMAGES = YES
BARRELEYE_XML_INSTALL_TARGET = YES
diff --git a/openpower/package/common-p8-xml/Config.in b/openpower/package/common-p8-xml/Config.in
index e69de29..2c01702 100644
--- a/openpower/package/common-p8-xml/Config.in
+++ b/openpower/package/common-p8-xml/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_COMMON_P8_XML
+ bool "Common P8 XML files"
+ default y if BR2_PACKAGE_HOSTBOOT
+ select BR2_PACKAGE_OPENPOWER_MRW
diff --git a/openpower/package/firestone-xml/Config.in b/openpower/package/firestone-xml/Config.in
index f0c0948..3990b29 100755
--- a/openpower/package/firestone-xml/Config.in
+++ b/openpower/package/firestone-xml/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_FIRESTONE_XML
bool "firestone_xml"
default y if (BR2_OPENPOWER_CONFIG_NAME = "firestone")
+ select BR2_PACKAGE_COMMON_P8_XML
help
Utilites for building xml and the targeting binary image
diff --git a/openpower/package/firestone-xml/firestone.mk b/openpower/package/firestone-xml/firestone.mk
index c1c9a85..c86a441 100644
--- a/openpower/package/firestone-xml/firestone.mk
+++ b/openpower/package/firestone-xml/firestone.mk
@@ -8,7 +8,7 @@
FIRESTONE_XML_SITE ?= $(call github,open-power,firestone-xml,$(FIRESTONE_XML_VERSION))
FIRESTONE_XML_LICENSE = Apache-2.0
-FIRESTONE_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+FIRESTONE_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml
FIRESTONE_XML_INSTALL_IMAGES = YES
FIRESTONE_XML_INSTALL_TARGET = YES
diff --git a/openpower/package/garrison-xml/Config.in b/openpower/package/garrison-xml/Config.in
index a1626d0..a71a2c8 100755
--- a/openpower/package/garrison-xml/Config.in
+++ b/openpower/package/garrison-xml/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_GARRISON_XML
bool "garrison_xml"
default y if (BR2_OPENPOWER_CONFIG_NAME = "garrison")
+ select BR2_PACKAGE_COMMON_P8_XML
help
Utilites for building xml and the targeting binary image
diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index fd13639..9d19927 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -8,7 +8,7 @@
GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
GARRISON_XML_LICENSE = Apache-2.0
-GARRISON_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+GARRISON_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml
GARRISON_XML_INSTALL_IMAGES = YES
GARRISON_XML_INSTALL_TARGET = YES
diff --git a/openpower/package/habanero-xml/Config.in b/openpower/package/habanero-xml/Config.in
index 2939cb6..02420ce 100755
--- a/openpower/package/habanero-xml/Config.in
+++ b/openpower/package/habanero-xml/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_HABANERO_XML
bool "habanero_xml"
default y if (BR2_OPENPOWER_CONFIG_NAME = "habanero")
+ select BR2_PACKAGE_COMMON_P8_XML
help
Utilites for building xml and the targeting binary image
diff --git a/openpower/package/habanero-xml/habanero-xml.mk b/openpower/package/habanero-xml/habanero-xml.mk
index 07b8a36..307c47d 100644
--- a/openpower/package/habanero-xml/habanero-xml.mk
+++ b/openpower/package/habanero-xml/habanero-xml.mk
@@ -8,7 +8,7 @@
HABANERO_XML_SITE ?= $(call github,open-power,habanero-xml,$(HABANERO_XML_VERSION))
HABANERO_XML_LICENSE = Apache-2.0
-HABANERO_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+HABANERO_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml
HABANERO_XML_INSTALL_IMAGES = YES
HABANERO_XML_INSTALL_TARGET = YES
diff --git a/openpower/package/openpower-mrw/Config.in b/openpower/package/openpower-mrw/Config.in
index e69de29..633e166 100644
--- a/openpower/package/openpower-mrw/Config.in
+++ b/openpower/package/openpower-mrw/Config.in
@@ -0,0 +1,3 @@
+config BR2_PACKAGE_OPENPOWER_MRW
+ bool "Machine Readable Workbook (MRW) infrastructure"
+ default y if BR2_PACKAGE_HOSTBOOT
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 65a1a92..7719eda 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -1,6 +1,17 @@
config BR2_PACKAGE_OPENPOWER_PNOR
bool "openpower_pnor"
default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ select BR2_PACKAGE_HOSTBOOT
+ select BR2_PACKAGE_HOSTBOOT_BINARIES
+ select BR2_PACKAGE_SKIBOOT
+ select BR2_PACKAGE_OPENPOWER_FFS
+ select BR2_PACKAGE_OCC
+ select BR2_PACKAGE_CAPP_UCODE
+ select BR2_PACKAGE_BARRELEYE_XML if (BR2_OPENPOWER_XML_PACKAGE = "barreleye-xml")
+ select BR2_PACKAGE_FIRESTONE_XML if (BR2_OPENPOWER_XML_PACKAGE = "firestone-xml")
+ select BR2_PACKAGE_GARRISON_XML if (BR2_OPENPOWER_XML_PACKAGE = "garrison-xml")
+ select BR2_PACKAGE_HABANERO_XML if (BR2_OPENPOWER_XML_PACKAGE = "habanero-xml")
+ select BR2_PACKAGE_PALMETTO_XML if (BR2_OPENPOWER_XML_PACKAGE = "palmetto-xml")
help
Utilites for building a targeting binary image
@@ -37,6 +48,7 @@
config BR2_TARGET_SKIBOOT_XZ
boolean "Compress the skiboot image with XZ"
+ select BR2_OPENPOWER_PNOR_XZ_ENABLED
default y
config BR2_SKIBOOT_LID_XZ_NAME
@@ -73,6 +85,5 @@
String used to define name of openpower targeting binary file, ecc protected
config BR2_OPENPOWER_PNOR_XZ_ENABLED
- string "False if we are not compressing with XZ anywhere"
- default "false" if !BR2_TARGET_SKIBOOT_XZ
- default "true" if BR2_TARGET_SKIBOOT_XZ
+ bool "Enable xz compression in PNOR payloads"
+ default n
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 065cd85..cb04f95 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -25,7 +25,7 @@
endif
ifeq ($(BR2_OPENPOWER_PNOR_XZ_ENABLED),y)
-OPENPOWER_PNOR_DEPENDENCIES += host_xz
+OPENPOWER_PNOR_DEPENDENCIES += host-xz
endif
@@ -58,7 +58,7 @@
-capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \
-openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) \
-payload $(BINARIES_DIR)/$(BR2_SKIBOOT_LID_NAME) \
- -xz_compression $(BR2_OPENPOWER_PNOR_XZ_ENABLED)
+ $(if ($(BR2_OPENPOWER_PNOR_XZ_ENABLED),y),-xz_compression true)
mkdir -p $(STAGING_DIR)/pnor/
$(TARGET_MAKE_ENV) $(@D)/create_pnor_image.pl \
diff --git a/openpower/package/palmetto-xml/Config.in b/openpower/package/palmetto-xml/Config.in
index b07d517..05a094f 100755
--- a/openpower/package/palmetto-xml/Config.in
+++ b/openpower/package/palmetto-xml/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_PALMETTO_XML
bool "palmetto_xml"
default y if (BR2_OPENPOWER_CONFIG_NAME = "palmetto")
+ select BR2_PACKAGE_COMMON_P8_XML
help
Utilites for building xml and the targeting binary image
diff --git a/openpower/package/palmetto-xml/palmetto-xml.mk b/openpower/package/palmetto-xml/palmetto-xml.mk
index 5225e6f..7cc554d 100644
--- a/openpower/package/palmetto-xml/palmetto-xml.mk
+++ b/openpower/package/palmetto-xml/palmetto-xml.mk
@@ -8,7 +8,7 @@
PALMETTO_XML_SITE = $(call github,open-power,palmetto-xml,$(PALMETTO_XML_VERSION))
PALMETTO_XML_LICENSE = Apache-2.0
-PALMETTO_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+PALMETTO_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml
PALMETTO_XML_INSTALL_IMAGES = YES
PALMETTO_XML_INSTALL_TARGET = YES
diff --git a/openpower/scripts/op-target-dependencies b/openpower/scripts/op-target-dependencies
index cd24a56..c99c69d 100755
--- a/openpower/scripts/op-target-dependencies
+++ b/openpower/scripts/op-target-dependencies
@@ -56,7 +56,6 @@
my $package = shift;
my $level = shift;
- $package =~ s/-install-images//; # Strip off -install-images subpass.
$package =~ s/-rebuild.*//; # Strip off -rebuild* subpass.
$package =~ s/linux[0-9]*/linux/; # Strip off linux version.