From 5b314fe391923d69215c6caa660aced5cb8b3faa Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 24 May 2017 09:47:19 +1000 Subject: [PATCH] Regenrate defconfigs The defconfigs have been manually edited. Regenerate them in preparation for the move to Buildroot 2017.05. Signed-off-by: Joel Stanley --- openpower/configs/barreleye_defconfig | 3 +-- openpower/configs/firenze_defconfig | 2 +- openpower/configs/firestone_defconfig | 1 - openpower/configs/garrison_defconfig | 1 - openpower/configs/habanero_defconfig | 2 +- openpower/configs/p9dsu_defconfig | 13 ++++++------- openpower/configs/palmetto_defconfig | 4 +--- openpower/configs/romulus_defconfig | 17 +++++++---------- openpower/configs/witherspoon_defconfig | 13 ++++++------- openpower/configs/zaius_defconfig | 13 ++++++------- openpower/configs/zz_defconfig | 2 +- 11 files changed, 30 insertions(+), 41 deletions(-) diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig index 5552f67ca9..d3e394398d 100644 --- a/openpower/configs/barreleye_defconfig +++ b/openpower/configs/barreleye_defconfig @@ -40,11 +40,10 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_CONFIG_FILE="barreleye.config" -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y +BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="barreleye-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="253622f22fe142ea67a0025e9bcc3044db038898" BR2_OPENPOWER_MACHINE_XML_FILENAME="barreleye.xml" -BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y BR2_OPENPOWER_SYSTEM_XML_FILENAME="BARRELEYE_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="BARRELEYE_hb.mrw.xml" BR2_OPENPOWER_BIOS_XML_FILENAME="BARRELEYE_bios.xml" diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig index cc6dde40fa..13d4990eac 100644 --- a/openpower/configs/firenze_defconfig +++ b/openpower/configs/firenze_defconfig @@ -41,6 +41,7 @@ BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y # BR2_PACKAGE_HOSTBOOT 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-firenze" BR2_PACKAGE_PETITBOOT=y @@ -50,4 +51,3 @@ BR2_PACKAGE_PETITBOOT_MTD=y # BR2_PACKAGE_CAPP_UCODE is not set BR2_PACKAGE_LOADKEYS=y # BR2_PACKAGE_IMA_CATALOG is not set -# BR2_PACKAGE_MACHINE_XML is not set \ No newline at end of file diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig index 39e04f6e0b..46f7956b9c 100644 --- a/openpower/configs/firestone_defconfig +++ b/openpower/configs/firestone_defconfig @@ -40,7 +40,6 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_CONFIG_FILE="firestone.config" -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="firestone-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="2494a430656504d014780000adbc2c2e7cfc54ab" BR2_OPENPOWER_MACHINE_XML_FILENAME="firestone.xml" diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig index c43fc3c657..172a8f7103 100644 --- a/openpower/configs/garrison_defconfig +++ b/openpower/configs/garrison_defconfig @@ -40,7 +40,6 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_CONFIG_FILE="garrison.config" -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="garrison-xml" BR2_OPENPOWER_MACHINE_XML_VERSION="19a516499e1090c20c5a3303db256529ef22c1c9" BR2_OPENPOWER_MACHINE_XML_FILENAME="garrison.xml" diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig index 6c8c3a291e..f4ebe50bde 100644 --- a/openpower/configs/habanero_defconfig +++ b/openpower/configs/habanero_defconfig @@ -41,10 +41,10 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_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" BR2_OPENPOWER_MACHINE_XML_FILENAME="habanero.xml" -BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y BR2_OPENPOWER_SYSTEM_XML_FILENAME="HABANERO_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="HABANERO_hb.mrw.xml" BR2_OPENPOWER_BIOS_XML_FILENAME="HABANERO_bios.xml" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index a4bdbb851b..9477b0c2c9 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -41,6 +41,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y BR2_HOSTBOOT_CONFIG_FILE="p9dsu.config" +BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="p9dsu-xml" +BR2_OPENPOWER_MACHINE_XML_VERSION="d429ddccae90d79769e4a0b5c8e07e37aa3edef5" +BR2_OPENPOWER_MACHINE_XML_FILENAME="p9dsu.xml" +BR2_OPENPOWER_SYSTEM_XML_FILENAME="P9DSU_hb.system.xml" +BR2_OPENPOWER_MRW_XML_FILENAME="P9DSU_hb.mrw.xml" +BR2_OPENPOWER_BIOS_XML_FILENAME="P9DSU_bios.xml" BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml" BR2_OPENPOWER_CONFIG_NAME="p9dsu" BR2_OPENPOWER_PNOR_FILENAME="p9dsu.pnor" @@ -56,11 +62,4 @@ BR2_PACKAGE_PETITBOOT_MTD=y BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="p9dsu-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="d429ddccae90d79769e4a0b5c8e07e37aa3edef5" -BR2_OPENPOWER_MACHINE_XML_FILENAME="p9dsu.xml" -BR2_OPENPOWER_SYSTEM_XML_FILENAME="P9DSU_hb.system.xml" -BR2_OPENPOWER_MRW_XML_FILENAME="P9DSU_hb.mrw.xml" -BR2_OPENPOWER_BIOS_XML_FILENAME="P9DSU_bios.xml" BR2_IMA_CATALOG_DTS="POWER9" diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig index 2a39f78829..41691b750a 100644 --- a/openpower/configs/palmetto_defconfig +++ b/openpower/configs/palmetto_defconfig @@ -1,5 +1,6 @@ BR2_powerpc64le=y BR2_powerpc_power8=y +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/palmetto-patches" BR2_GLIBC_VERSION_2_24=y BR2_BINUTILS_VERSION_2_27_X=y BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" @@ -39,10 +40,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_CONFIG_FILE="palmetto.config" -BR2_OPENPOWER_MACHINE_XML_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/package/machine-xml/palmetto-patches" -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="palmetto-xml" -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/palmetto-patches" BR2_OPENPOWER_MACHINE_XML_VERSION="c6f563966e9fadc4fb60194c064b2310c9b916b1" BR2_OPENPOWER_MACHINE_XML_FILENAME="palmetto.xml" BR2_OPENPOWER_SYSTEM_XML_FILENAME="PALMETTO_hb.system.xml" diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index 4a38c562ae..6f1540a4a1 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -41,16 +41,19 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y BR2_HOSTBOOT_CONFIG_FILE="romulus.config" +BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="romulus-xml" +BR2_OPENPOWER_MACHINE_XML_VERSION="301279cbdb3595ad1bbdce4d9d2189db0470a62a" +BR2_OPENPOWER_MACHINE_XML_FILENAME="romulus.xml" +BR2_OPENPOWER_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml" +BR2_OPENPOWER_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml" +BR2_OPENPOWER_BIOS_XML_FILENAME="ROMULUS_bios.xml" BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml" BR2_OPENPOWER_CONFIG_NAME="romulus" BR2_OPENPOWER_PNOR_FILENAME="romulus.pnor" -#BR2_OPENPOWER_PNOR_UPDATE_FILENAME="romulus_update.pnor" BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc" BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc" BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc" BR2_IMA_CATALOG_FILENAME="ima_catalog.bin" -BR2_IMA_CATALOG_DTS="POWER9" -#BR2_IMA_CATALOG_ECC_FILENAME="ima_catalog.bin.ecc" BR2_OPENPOWER_TARGETING_BIN_FILENAME="ROMULUS_HB.targeting.bin" BR2_OPENPOWER_TARGETING_ECC_FILENAME="ROMULUS_HB.targeting.bin.ecc" BR2_PACKAGE_PETITBOOT=y @@ -58,10 +61,4 @@ BR2_PACKAGE_PETITBOOT_MTD=y BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="romulus-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="301279cbdb3595ad1bbdce4d9d2189db0470a62a" -BR2_OPENPOWER_MACHINE_XML_FILENAME="romulus.xml" -BR2_OPENPOWER_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml" -BR2_OPENPOWER_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml" -BR2_OPENPOWER_BIOS_XML_FILENAME="ROMULUS_bios.xml" +BR2_IMA_CATALOG_DTS="POWER9" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index d8308d64f0..4e046b7f71 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -41,6 +41,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config" +BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml" +BR2_OPENPOWER_MACHINE_XML_VERSION="d389352298566dfaec3d7cfc28778eba012c9256" +BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml" +BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml" +BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml" +BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml" BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml" BR2_OPENPOWER_CONFIG_NAME="witherspoon" BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor" @@ -56,11 +62,4 @@ BR2_PACKAGE_PETITBOOT_MTD=y BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="d389352298566dfaec3d7cfc28778eba012c9256" -BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml" -BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml" -BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml" -BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml" BR2_IMA_CATALOG_DTS="POWER9" diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 3ad830a119..c0848a4837 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -41,6 +41,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y BR2_HOSTBOOT_CONFIG_FILE="zaius.config" +BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="zaius-xml" +BR2_OPENPOWER_MACHINE_XML_VERSION="6bcffcf4b3af8a2de7245c9d6d373b1144bd3037" +BR2_OPENPOWER_MACHINE_XML_FILENAME="zaius.xml" +BR2_OPENPOWER_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml" +BR2_OPENPOWER_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml" +BR2_OPENPOWER_BIOS_XML_FILENAME="ZAIUS_bios.xml" BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml" BR2_OPENPOWER_CONFIG_NAME="zaius" BR2_OPENPOWER_PNOR_FILENAME="zaius.pnor" @@ -55,11 +61,4 @@ BR2_PACKAGE_PETITBOOT_MTD=y BR2_OCC_BIN_FILENAME="occ.bin" BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin" BR2_PACKAGE_LOADKEYS=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y -BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="zaius-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="6bcffcf4b3af8a2de7245c9d6d373b1144bd3037" -BR2_OPENPOWER_MACHINE_XML_FILENAME="zaius.xml" -BR2_OPENPOWER_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml" -BR2_OPENPOWER_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml" -BR2_OPENPOWER_BIOS_XML_FILENAME="ZAIUS_bios.xml" BR2_IMA_CATALOG_DTS="POWER9" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index 148c91f714..afd6fc77ab 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -39,10 +39,10 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y -# BR2_PACKAGE_MACHINE_XML is not set # BR2_PACKAGE_HOST_OPENPOWER_FFS is not set # BR2_PACKAGE_HOSTBOOT 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-firenze" # BR2_TARGET_SKIBOOT_XZ is not set