diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-02-17 14:57:57 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.ibm.com> | 2018-05-02 00:29:03 -0500 |
commit | 03671c06d119a673e14d290f0785deb148cd83fd (patch) | |
tree | 30e1b74673ba040cff3cffa937a0b16fb5808b77 /openpower | |
parent | 9307e07318cbdfb104118bf4dca1c174a3e8368b (diff) | |
download | talos-op-build-03671c06d119a673e14d290f0785deb148cd83fd.tar.gz talos-op-build-03671c06d119a673e14d290f0785deb148cd83fd.zip |
Split P8 and P9 Hostboot and OCC packages
This was causing a couple of issues:
1) increased complexity in build files
2) It breaks the pkg-version patch detection/checksum
3) Failing to apply patches to would silently fail
The split makes this a bit easier and requires less custom code.
We keep the P9 hostboot/occ named hostboot/occ, so that day-to-day,
nobody notices a difference. The only difference you'll notice
is if doing POWER8 hostboot/occ development, as the package name
will be 'hostboot-p8' or 'occ-p8'.
Fixes: https://github.com/open-power/op-build/issues/876
Fixes: https://github.com/open-power/op-build/issues/1194
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'openpower')
43 files changed, 168 insertions, 97 deletions
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig index d80ff4cd..d359d382 100644 --- a/openpower/configs/barreleye_defconfig +++ b/openpower/configs/barreleye_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -BR2_HOSTBOOT_CONFIG_FILE="barreleye.config" +BR2_HOSTBOOT_P8_CONFIG_FILE="barreleye.config" BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="barreleye-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="253622f22fe142ea67a0025e9bcc3044db038898" @@ -58,7 +58,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="BARRELEYE_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="BARRELEYE_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER8" diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig index d5d614a0..85018ff9 100644 --- a/openpower/configs/firenze_defconfig +++ b/openpower/configs/firenze_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -# BR2_PACKAGE_HOSTBOOT is not set +# BR2_PACKAGE_HOSTBOOT_P8 is not set # BR2_PACKAGE_HOSTBOOT_BINARIES is not set # BR2_PACKAGE_MACHINE_XML is not set # BR2_PACKAGE_OPENPOWER_PNOR is not set @@ -46,7 +46,6 @@ BR2_OPENPOWER_CONFIG_NAME="openpower-firenze" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y # BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set -# BR2_PACKAGE_OCC is not set # BR2_PACKAGE_CAPP_UCODE is not set BR2_PACKAGE_LOADKEYS=y # BR2_PACKAGE_IMA_CATALOG is not set diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig index bbd03c0b..2c33407a 100644 --- a/openpower/configs/firestone_defconfig +++ b/openpower/configs/firestone_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -BR2_HOSTBOOT_CONFIG_FILE="firestone.config" +BR2_HOSTBOOT_P8_CONFIG_FILE="firestone.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="firestone-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="2494a430656504d014780000adbc2c2e7cfc54ab" BR2_OPENPOWER_MACHINE_XML_FILENAME="firestone.xml" @@ -57,7 +57,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="FIRESTONE_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="FIRESTONE_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER8" diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig index 471200de..617a0656 100644 --- a/openpower/configs/garrison_defconfig +++ b/openpower/configs/garrison_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -BR2_HOSTBOOT_CONFIG_FILE="garrison.config" +BR2_HOSTBOOT_P8_CONFIG_FILE="garrison.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="garrison-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="19a516499e1090c20c5a3303db256529ef22c1c9" BR2_OPENPOWER_MACHINE_XML_FILENAME="garrison.xml" @@ -57,7 +57,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="GARRISON_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="GARRISON_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER8" diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig index 1ceb7b6b..eb582fca 100644 --- a/openpower/configs/habanero_defconfig +++ b/openpower/configs/habanero_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -BR2_HOSTBOOT_CONFIG_FILE="habanero.config" +BR2_HOSTBOOT_P8_CONFIG_FILE="habanero.config" BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="habanero-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="6a78496c286e284719a8201148a5088030b897de" @@ -59,7 +59,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="HABANERO_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="HABANERO_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER8" diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig index 3494c381..95687773 100644 --- a/openpower/configs/openpower_mambo_defconfig +++ b/openpower/configs/openpower_mambo_defconfig @@ -36,13 +36,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y # BR2_PACKAGE_HOST_OPENPOWER_FFS is not set -# BR2_PACKAGE_HOSTBOOT is not set +# BR2_PACKAGE_HOSTBOOT_P8 is not set # BR2_PACKAGE_HOSTBOOT_BINARIES is not set # BR2_PACKAGE_MACHINE_XML is not set # BR2_PACKAGE_OPENPOWER_PNOR is not set BR2_OPENPOWER_CONFIG_NAME="openpower-mambo" BR2_PACKAGE_PETITBOOT=y # BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set -# BR2_PACKAGE_OCC is not set # BR2_PACKAGE_CAPP_UCODE is not set # BR2_PACKAGE_IMA_CATALOG is not set diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig index 7a66a676..c4e1ba30 100644 --- a/openpower/configs/openpower_p9_mambo_defconfig +++ b/openpower/configs/openpower_p9_mambo_defconfig @@ -42,9 +42,9 @@ BR2_OPENPOWER_POWER9=y # BR2_PACKAGE_OPENPOWER_PNOR is not set BR2_OPENPOWER_CONFIG_NAME="openpower-mambo-p9" BR2_PACKAGE_PETITBOOT=y -# BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set -# BR2_PACKAGE_OCC is not set +BR2_PACKAGE_PETITBOOT_MTD=y # BR2_PACKAGE_HCODE is not set +# BR2_PACKAGE_OCC is not set # BR2_PACKAGE_CAPP_UCODE is not set # BR2_PACKAGE_HOST_PPE42_BINUTILS is not set # BR2_PACKAGE_HOST_PPE42_GCC is not set diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index 1576bf01..6c9c1808 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -58,7 +58,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="P9DSU_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="P9DSU_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER9" diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig index 9f890063..8b3a7649 100644 --- a/openpower/configs/palmetto_defconfig +++ b/openpower/configs/palmetto_defconfig @@ -37,7 +37,7 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -BR2_HOSTBOOT_CONFIG_FILE="palmetto.config" +BR2_HOSTBOOT_P8_CONFIG_FILE="palmetto.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="palmetto-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="c6f563966e9fadc4fb60194c064b2310c9b916b1" BR2_OPENPOWER_MACHINE_XML_FILENAME="palmetto.xml" @@ -55,7 +55,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="PALMETTO_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="PALMETTO_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER8" diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig index c1557a0c..e64420ba 100644 --- a/openpower/configs/pseries_defconfig +++ b/openpower/configs/pseries_defconfig @@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -# BR2_PACKAGE_HOSTBOOT is not set +# BR2_PACKAGE_HOSTBOOT_P8 is not set # BR2_PACKAGE_HOSTBOOT_BINARIES is not set # BR2_PACKAGE_MACHINE_XML is not set # BR2_PACKAGE_OPENPOWER_PNOR is not set @@ -47,7 +47,6 @@ BR2_OPENPOWER_CONFIG_NAME="openpower-firenze" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y # BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set -# BR2_PACKAGE_OCC is not set # BR2_PACKAGE_CAPP_UCODE is not set BR2_PACKAGE_LOADKEYS=y # BR2_PACKAGE_IMA_CATALOG is not set diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index 99ef0bc4..c7c143af 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -57,7 +57,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="ROMULUS_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="ROMULUS_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" # BR2_HCODE_INCLUDE_IONV is not set BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig index 70e50cea..ca31c40d 100644 --- a/openpower/configs/vesnin_defconfig +++ b/openpower/configs/vesnin_defconfig @@ -33,7 +33,7 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y -BR2_HOSTBOOT_CONFIG_FILE="vesnin.config" +BR2_HOSTBOOT_P8_CONFIG_FILE="vesnin.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="vesnin-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="dda5b93d90b6e56fd3e94b0dfd255fa8f47409cb" BR2_OPENPOWER_MACHINE_XML_FILENAME="vesnin.xml" @@ -52,7 +52,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="VESNIN_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="VESNIN_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER8" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index 34ea100f..18910517 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -57,7 +57,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_OCC_GPU_BIN_BUILD=y BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 5989872c..d2e139e5 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -57,7 +57,6 @@ BR2_OPENPOWER_TARGETING_BIN_FILENAME="ZAIUS_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="ZAIUS_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y -BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y BR2_IMA_CATALOG_DTS="POWER9" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index 1cee3b48..11a67196 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -49,7 +49,6 @@ BR2_OPENPOWER_CONFIG_NAME="openpower-firenze" BR2_PACKAGE_PETITBOOT=y BR2_PACKAGE_PETITBOOT_MTD=y # BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set -# BR2_PACKAGE_OCC is not set # BR2_PACKAGE_HCODE is not set # BR2_PACKAGE_CAPP_UCODE is not set BR2_PACKAGE_LOADKEYS=y diff --git a/openpower/package/Config.in b/openpower/package/Config.in index eb685db0..6e3fc973 100755 --- a/openpower/package/Config.in +++ b/openpower/package/Config.in @@ -1,5 +1,6 @@ source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-ffs/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot/Config.in" +source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-p8/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-binaries/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-mrw/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/common-p8-xml/Config.in" @@ -7,8 +8,9 @@ source "$BR2_EXTERNAL_OP_BUILD_PATH/package/machine-xml/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-pnor/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/petitboot/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/p8-pore-binutils/Config.in" -source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hcode/Config.in" +source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in" +source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ-p8/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/capp-ucode/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/skiboot/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/libflash/Config.in" diff --git a/openpower/package/common-p8-xml/Config.in b/openpower/package/common-p8-xml/Config.in index 2c017028..560c1d63 100644 --- a/openpower/package/common-p8-xml/Config.in +++ b/openpower/package/common-p8-xml/Config.in @@ -1,4 +1,4 @@ config BR2_PACKAGE_COMMON_P8_XML bool "Common P8 XML files" - default y if BR2_PACKAGE_HOSTBOOT + default y if BR2_PACKAGE_HOSTBOOT_P8 select BR2_PACKAGE_OPENPOWER_MRW diff --git a/openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch b/openpower/package/hostboot-p8/0001-Increase-uart-delay.patch index 5c916d2b..5c916d2b 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch +++ b/openpower/package/hostboot-p8/0001-Increase-uart-delay.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch b/openpower/package/hostboot-p8/0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch index 66bc0263..66bc0263 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch +++ b/openpower/package/hostboot-p8/0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0003-Default-to-std-gnu-03.patch b/openpower/package/hostboot-p8/0003-Default-to-std-gnu-03.patch index f6c67108..f6c67108 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0003-Default-to-std-gnu-03.patch +++ b/openpower/package/hostboot-p8/0003-Default-to-std-gnu-03.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0004-fix-build-error-return-statement-with-a-value-in-fun.patch b/openpower/package/hostboot-p8/0004-fix-build-error-return-statement-with-a-value-in-fun.patch index b1ecacd1..b1ecacd1 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0004-fix-build-error-return-statement-with-a-value-in-fun.patch +++ b/openpower/package/hostboot-p8/0004-fix-build-error-return-statement-with-a-value-in-fun.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0005-error-dereferencing-type-punned-pointer-will-break-s.patch b/openpower/package/hostboot-p8/0005-error-dereferencing-type-punned-pointer-will-break-s.patch index fcfe5701..fcfe5701 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0005-error-dereferencing-type-punned-pointer-will-break-s.patch +++ b/openpower/package/hostboot-p8/0005-error-dereferencing-type-punned-pointer-will-break-s.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch b/openpower/package/hostboot-p8/0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch index 666c7477..666c7477 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch +++ b/openpower/package/hostboot-p8/0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0007-error-the-compiler-can-assume-that-the-address-of-r-.patch b/openpower/package/hostboot-p8/0007-error-the-compiler-can-assume-that-the-address-of-r-.patch index 9c2c8f4e..9c2c8f4e 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0007-error-the-compiler-can-assume-that-the-address-of-r-.patch +++ b/openpower/package/hostboot-p8/0007-error-the-compiler-can-assume-that-the-address-of-r-.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch b/openpower/package/hostboot-p8/0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch index 73adecc5..73adecc5 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch +++ b/openpower/package/hostboot-p8/0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch b/openpower/package/hostboot-p8/0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch index 7e17bf96..7e17bf96 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch +++ b/openpower/package/hostboot-p8/0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0010-Use-std-gnu-03-for-host-g-invocations.patch b/openpower/package/hostboot-p8/0010-Use-std-gnu-03-for-host-g-invocations.patch index a9cef3f6..a9cef3f6 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0010-Use-std-gnu-03-for-host-g-invocations.patch +++ b/openpower/package/hostboot-p8/0010-Use-std-gnu-03-for-host-g-invocations.patch diff --git a/openpower/package/hostboot/p8Patches/hostboot-0012-kernel-Update-assembly-for-modern-binutils.patch b/openpower/package/hostboot-p8/0012-kernel-Update-assembly-for-modern-binutils.patch index 2c51fd3e..2c51fd3e 100644 --- a/openpower/package/hostboot/p8Patches/hostboot-0012-kernel-Update-assembly-for-modern-binutils.patch +++ b/openpower/package/hostboot-p8/0012-kernel-Update-assembly-for-modern-binutils.patch diff --git a/openpower/package/hostboot-p8/Config.in b/openpower/package/hostboot-p8/Config.in new file mode 100644 index 00000000..4dacfaba --- /dev/null +++ b/openpower/package/hostboot-p8/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HOSTBOOT_P8 + bool "hostboot-p8" + default y if (BR2_OPENPOWER_POWER8) + select BR2_CPP + help + Project to build the hostboot firmware codebase + +if BR2_PACKAGE_HOSTBOOT_P8 + +config BR2_HOSTBOOT_P8_CONFIG_FILE + string "Hostboot configuration file for compilation" + default default + help + String used to define hw specific make config file + +endif + diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk new file mode 100644 index 00000000..c50679e9 --- /dev/null +++ b/openpower/package/hostboot-p8/hostboot-p8.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# hostboot for POWER8 +# +################################################################################ +HOSTBOOT_P8_VERSION ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4 + +HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION)) + +HOSTBOOT_P8_LICENSE = Apache-2.0 +HOSTBOOT_P8_LICENSE_FILES = LICENSE +HOSTBOOT_P8_DEPENDENCIES = host-binutils + +HOSTBOOT_P8_INSTALL_IMAGES = YES +HOSTBOOT_P8_INSTALL_TARGET = NO + +HOSTBOOT_P8_ENV_VARS=$(TARGET_MAKE_ENV) \ + CONFIG_FILE=$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/hostboot/$(BR2_HOSTBOOT_P8_CONFIG_FILE) \ + OPENPOWER_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \ + HOSTBOOT_P8_VERSION=`cat $(HOSTBOOT_P8_VERSION_FILE)` + +HOSTBOOT_P8_POST_PATCH_HOOKS += HOSTBOOT_P8_APPLY_PATCHES + +define HOSTBOOT_P8_BUILD_CMDS + $(HOSTBOOT_P8_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE)' +endef + +define HOSTBOOT_P8_INSTALL_IMAGES_CMDS + cd $(@D) && source ./env.bash && $(@D)/src/build/tools/hbDistribute --openpower $(STAGING_DIR)/hostboot_build_images/ +endef + +$(eval $(generic-package)) diff --git a/openpower/package/hostboot/p9Patches/hostboot-0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch b/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch index e8def566..e8def566 100644 --- a/openpower/package/hostboot/p9Patches/hostboot-0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch +++ b/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in index d864c49d..b8181744 100644 --- a/openpower/package/hostboot/Config.in +++ b/openpower/package/hostboot/Config.in @@ -1,13 +1,17 @@ config BR2_PACKAGE_HOSTBOOT bool "hostboot" - default y if (BR2_OPENPOWER_PLATFORM) + default y if (BR2_OPENPOWER_POWER9) select BR2_CPP help Project to build the hostboot firmware codebase +if BR2_PACKAGE_HOSTBOOT config BR2_HOSTBOOT_CONFIG_FILE string "Hostboot configuration file for compilation" default default help String used to define hw specific make config file + +endif + diff --git a/openpower/package/hostboot/p9Patches/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch b/openpower/package/hostboot/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch index c572feef..c572feef 100644 --- a/openpower/package/hostboot/p9Patches/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch +++ b/openpower/package/hostboot/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch diff --git a/openpower/package/hostboot/p9Patches/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch b/openpower/package/hostboot/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch index 1bf10aa2..1bf10aa2 100644 --- a/openpower/package/hostboot/p9Patches/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch +++ b/openpower/package/hostboot/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk index c4b907f4..cb98e32a 100644 --- a/openpower/package/hostboot/hostboot.mk +++ b/openpower/package/hostboot/hostboot.mk @@ -1,12 +1,10 @@ ################################################################################ # -# hostboot +# hostboot for POWER9 # ################################################################################ -HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4 -HOSTBOOT_VERSION_BRANCH_MASTER ?= c38615a583b7f19c0ae6a5a152b575fe61ff3d2a -HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8)) +HOSTBOOT_VERSION ?= c38615a583b7f19c0ae6a5a152b575fe61ff3d2a HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION)) HOSTBOOT_LICENSE = Apache-2.0 @@ -21,23 +19,6 @@ HOSTBOOT_ENV_VARS=$(TARGET_MAKE_ENV) PERL_USE_UNSAFE_INC=1 \ OPENPOWER_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \ HOSTBOOT_VERSION=`cat $(HOSTBOOT_VERSION_FILE)` -define HOSTBOOT_APPLY_PATCHES - if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/hostboot/p9Patches \*.patch; \ - if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p9Patches ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p9Patches \*.patch; \ - fi; \ - fi; \ - if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/hostboot/p8Patches \*.patch; \ - if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p8Patches ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p8Patches \*.patch; \ - fi; \ - fi; -endef - -HOSTBOOT_POST_PATCH_HOOKS += HOSTBOOT_APPLY_PATCHES - define HOSTBOOT_BUILD_CMDS $(HOSTBOOT_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE)' endef diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk index e335e8b1..dc05d0d3 100644 --- a/openpower/package/machine-xml/machine-xml.mk +++ b/openpower/package/machine-xml/machine-xml.mk @@ -13,7 +13,14 @@ endif MACHINE_XML_LICENSE = Apache-2.0 MACHINE_XML_LICENSE_FILES = LICENSE -MACHINE_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml +MACHINE_XML_DEPENDENCIES = openpower-mrw common-p8-xml + +ifeq ($(BR2_OPENPOWER_POWER9),y) +MACHINE_XML_DEPENDENCIES += hostboot +endif +ifeq ($(BR2_OPENPOWER_POWER8),y) +MACHINE_XML_DEPENDENCIES += hostboot-p8 +endif MACHINE_XML_INSTALL_IMAGES = YES MACHINE_XML_INSTALL_TARGET = YES diff --git a/openpower/package/occ-p8/Config.in b/openpower/package/occ-p8/Config.in new file mode 100644 index 00000000..0137e94a --- /dev/null +++ b/openpower/package/occ-p8/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_OCC_P8 + bool "OCC for P8" + default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER8) + select BR2_CPP + help + Project to build OCC + +if BR2_PACKAGE_OCC_P8 + +config BR2_OCC_P8_BIN_FILENAME + string "Name of OCC P8 image file" + default "occ.bin" + help + String used to define name of the OCC binary image file + +endif diff --git a/openpower/package/occ-p8/occ-p8.mk b/openpower/package/occ-p8/occ-p8.mk new file mode 100644 index 00000000..7f64e592 --- /dev/null +++ b/openpower/package/occ-p8/occ-p8.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# occ for power8 +# +################################################################################ + +OCC_P8_VERSION ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a +OCC_P8_SITE ?= $(call github,open-power,occ,$(OCC_P8_VERSION)) +OCC_P8_LICENSE = Apache-2.0 + +OCC_P8_LICENSE_FILES = src/LICENSE + +OCC_P8_INSTALL_IMAGES = YES +OCC_P8_INSTALL_TARGET = NO + +OCC_P8_STAGING_DIR = $(STAGING_DIR)/occ + +OCC_P8_IMAGE_BIN_PATH = src/image.bin +OCC_P8_DEPENDENCIES = host-binutils host-p8-pore-binutils + +define OCC_P8_BUILD_CMDS + cd $(@D)/src && \ + make POREPATH=$(P8_PORE_BINUTILS_BIN)/bin/ OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) all && \ + make tracehash && \ + make combineImage +endef + +OCC_P8_BUILD_CMDS ?= $(OCC_P8_BUILD_CMDS_P8) + +define OCC_P8_INSTALL_IMAGES_CMDS + mkdir -p $(STAGING_DIR)/occ + cp $(@D)/$(OCC_P8_IMAGE_BIN_PATH) $(OCC_P8_STAGING_DIR)/$(BR2_OCC_P8_BIN_FILENAME) +endef + +$(eval $(generic-package)) diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in index a71f25df..2512e241 100644 --- a/openpower/package/occ/Config.in +++ b/openpower/package/occ/Config.in @@ -1,12 +1,15 @@ config BR2_PACKAGE_OCC - bool "occ" - default y if (BR2_OPENPOWER_PLATFORM) + bool "OCC (POWER9)" + default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9) select BR2_CPP help Project to build OCC +if BR2_PACKAGE_OCC + config BR2_OCC_BIN_FILENAME - string "Name of OCC image file" + string "Name of OCC P9 image file" + default "occ.bin" help String used to define name of the OCC binary image file @@ -22,3 +25,5 @@ config BR2_OCC_GPU_GPE_BIN_FILENAME help String used to define name of the OCC GPUE GPE binary image file +endif + diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk index e733af9d..f6b27cfd 100644 --- a/openpower/package/occ/occ.mk +++ b/openpower/package/occ/occ.mk @@ -1,58 +1,29 @@ ################################################################################ # -# occ +# occ for POWER9 # ################################################################################ -OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a -OCC_VERSION_BRANCH_MASTER ?= cd30b100eee09956a27b69f7893349451400e5ba +OCC_VERSION ?= cd30b100eee09956a27b69f7893349451400e5ba -OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8)) OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION)) OCC_LICENSE = Apache-2.0 -OCC_LICENSE_FILES_P8 = src/LICENSE -OCC_LICENSE_FILES_P9 = LICENSE -OCC_LICENSE_FILES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_LICENSE_FILES_P9),$(OCC_LICENSE_FILES_P8)) +OCC_LICENSE_FILES = LICENSE OCC_INSTALL_IMAGES = YES OCC_INSTALL_TARGET = NO OCC_STAGING_DIR = $(STAGING_DIR)/occ -OCC_IMAGE_BIN_PATH = $(if $(BR2_OPENPOWER_POWER9),obj/image.bin,src/image.bin) +OCC_IMAGE_BIN_PATH = obj/image.bin -OCC_DEPENDENCIES_P8 = host-binutils host-p8-pore-binutils -OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc hostboot-binaries +OCC_DEPENDENCIES = host-binutils host-ppe42-gcc ifeq ($(BR2_OCC_GPU_BIN_BUILD),y) - OCC_DEPENDENCIES_P9 += hostboot-binaries + OCC_DEPENDENCIES += hostboot-binaries endif -OCC_DEPENDENCIES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_DEPENDENCIES_P9),$(OCC_DEPENDENCIES_P8)) -define OCC_APPLY_PATCHES - if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/occ/p9Patches \*.patch; \ - if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p9Patches ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p9Patches \*.patch; \ - fi; \ - fi; \ - if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/occ/p8Patches \*.patch; \ - if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p8Patches ]; then \ - $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p8Patches \*.patch; \ - fi; \ - fi; -endef - -OCC_POST_PATCH_HOOKS += OCC_APPLY_PATCHES - -define OCC_BUILD_CMDS_P8 - cd $(@D)/src && \ - make POREPATH=$(P8_PORE_BINUTILS_BIN)/bin/ OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) all && \ - make tracehash && \ - make combineImage -endef -define OCC_BUILD_CMDS_P9 +define OCC_BUILD_CMDS if [ "$(BR2_OCC_GPU_BIN_BUILD)" == "y" ]; then \ cd $(@D)/src && \ make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib GPE1_BIN_IMAGE_PATH=$(STAGING_DIR)/hostboot_binaries/ OPOCC_GPU_SUPPORT=1 all; \ @@ -61,7 +32,7 @@ define OCC_BUILD_CMDS_P9 make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib all; \ fi; endef -OCC_BUILD_CMDS ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_BUILD_CMDS_P9),$(OCC_BUILD_CMDS_P8)) +OCC_BUILD_CMDS ?= $(OCC_BUILD_CMDS_P9) define OCC_INSTALL_IMAGES_CMDS mkdir -p $(STAGING_DIR)/occ diff --git a/openpower/package/openpower-mrw/Config.in b/openpower/package/openpower-mrw/Config.in index 633e1664..9e3b3550 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 + default y if (BR2_PACKAGE_HOSTBOOT_P8 || BR2_PACKAGE_HOSTBOOT_P9) diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in index 1c437353..836ef77a 100644 --- a/openpower/package/openpower-pnor/Config.in +++ b/openpower/package/openpower-pnor/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_OPENPOWER_PNOR bool "openpower_pnor" default y if (BR2_OPENPOWER_PLATFORM) - select BR2_PACKAGE_HOSTBOOT + select BR2_PACKAGE_HOSTBOOT if !BR2_OPENPOWER_POWER8 + select BR2_PACKAGE_HOSTBOOT_P8 if BR2_OPENPOWER_POWER8 select BR2_PACKAGE_HOSTBOOT_BINARIES select BR2_PACKAGE_SKIBOOT select BR2_PACKAGE_OPENPOWER_FFS - select BR2_PACKAGE_OCC + select BR2_PACKAGE_OCC if !BR2_OPENPOWER_POWER8 + select BR2_PACKAGE_OCC_P8 if BR2_OPENPOWER_POWER8 select BR2_PACKAGE_CAPP_UCODE select BR2_PACKAGE_IMA_CATALOG select BR2_PACKAGE_HOST_OPENPOWER_VPNOR diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk index 4591d6f7..cdbd5aa5 100644 --- a/openpower/package/openpower-pnor/openpower-pnor.mk +++ b/openpower/package/openpower-pnor/openpower-pnor.mk @@ -9,7 +9,7 @@ OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION)) OPENPOWER_PNOR_LICENSE = Apache-2.0 OPENPOWER_PNOR_LICENSE_FILES = LICENSE -OPENPOWER_PNOR_DEPENDENCIES = hostboot hostboot-binaries machine-xml skiboot host-openpower-ffs occ capp-ucode +OPENPOWER_PNOR_DEPENDENCIES = hostboot-binaries machine-xml skiboot host-openpower-ffs capp-ucode ifeq ($(BR2_OPENPOWER_POWER9),y) OPENPOWER_PNOR_DEPENDENCIES += hcode @@ -82,7 +82,14 @@ FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \ # Subpackages we want to include in the version info (do not include openpower-pnor) -OPENPOWER_VERSIONED_SUBPACKAGES = skiboot hostboot linux petitboot machine-xml occ hostboot-binaries capp-ucode +OPENPOWER_VERSIONED_SUBPACKAGES = skiboot +ifeq ($(BR2_PACKAGE_HOSTBOOT_P8),y) +OPENPOWER_VERSIONED_SUBPACKAGES += hostboot-p8 occ-p8 +endif +ifeq ($(BR2_PACKAGE_HOSTBOOT),y) +OPENPOWER_VERSIONED_SUBPACKAGES += hostboot occ +endif +OPENPOWER_VERSIONED_SUBPACKAGES += linux petitboot machine-xml hostboot-binaries capp-ucode OPENPOWER_PNOR = openpower-pnor ifeq ($(BR2_OPENPOWER_POWER9),y) @@ -90,6 +97,12 @@ ifeq ($(BR2_OPENPOWER_POWER9),y) OPENPOWER_VERSIONED_SUBPACKAGES += sbe hcode endif +ifeq ($(BR2_PACKAGE_OCC_P8),y) + OCC_BIN_FILENAME=$(BR2_OCC_P8_BIN_FILENAME) +else + OCC_BIN_FILENAME=$(BR2_OCC_BIN_FILENAME) +endif + define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS mkdir -p $(OPENPOWER_PNOR_SCRATCH_DIR) @@ -106,7 +119,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS -sbe_binary_dir $(SBE_BINARY_DIR) \ -sbec_binary_filename $(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) \ -wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \ - -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \ + -occ_binary_filename $(OCC_STAGING_DIR)/$(OCC_BIN_FILENAME) \ -capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \ -ima_catalog_binary_filename $(BINARIES_DIR)/$(BR2_IMA_CATALOG_FILENAME) \ -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) \ @@ -132,7 +145,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS -sbe_binary_filename $(BR2_HOSTBOOT_BINARY_SBE_FILENAME) \ -sbec_binary_filename $(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) \ -wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \ - -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \ + -occ_binary_filename $(OCC_STAGING_DIR)/$(OCC_BIN_FILENAME) \ -targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \ -wofdata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_WOFDATA_BINARY_FILENAME) \ -memddata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_MEMDDATA_BINARY_FILENAME) \ |