Merge pull request #645 from klausk/everest_defconfig
Create a p10ebmc_defconfig for Rainier 2U, 4U and Everst configs
diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
new file mode 100644
index 0000000..c691f73
--- /dev/null
+++ b/openpower/configs/p10ebmc_defconfig
@@ -0,0 +1,82 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_GCC_VERSION_8_X=y
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="skiroot"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
+BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
+BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/users-table"
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.ibm.com:p10/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e4f7620c0a1e46e93ab9130f30bfa28b32322ca1"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux-p10"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
+BR2_PACKAGE_CRYPTSETUP=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_IPMITOOL_USB=y
+BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_SERVER is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_UTIL_LINUX_AGETTY=y
+BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER10=y
+BR2_HOSTBOOT_P10_CONFIG_FILE="rainier.config"
+# BR2_PACKAGE_MACHINE_XML is not set
+BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
+BR2_RAINIER_2U_XML_CUSTOM_GIT=y
+BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+BR2_RAINIER_2U_XML_VERSION="b788d5ea3e435f46d2a7334c82690290afc357bd"
+BR2_RAINIER_2U_XML_SYSTEM_FILENAME="RAINIER_hb.system.xml"
+BR2_RAINIER_2U_XML_TARGETING_FILENAME="RAINIER_hb.mrw.xml"
+BR2_RAINIER_4U_XML_CUSTOM_GIT=y
+BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+BR2_RAINIER_4U_XML_VERSION="b788d5ea3e435f46d2a7334c82690290afc357bd"
+BR2_RAINIER_4U_XML_SYSTEM_FILENAME="RAINIER_hb.system.xml"
+BR2_RAINIER_4U_XML_TARGETING_FILENAME="RAINIER_hb.mrw.xml"
+BR2_PACKAGE_EVEREST_XML=y
+BR2_EVEREST_XML_CUSTOM_GIT=y
+BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+BR2_EVEREST_XML_VERSION="b788d5ea3e435f46d2a7334c82690290afc357bd"
+BR2_EVEREST_XML_FILENAME="Rainier-2U-MRW.xml"
+BR2_EVEREST_XML_SYSTEM_FILENAME="EVEREST_hb.system.xml"
+BR2_EVEREST_XML_TARGETING_FILENAME="EVEREST_hb.mrw.xml"
+BR2_PACKAGE_OPENPOWER_PNOR_P10=y
+BR2_OPENPOWER_P10_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
+BR2_OPENPOWER_PNOR_P10_LEGACY_PNOR_TARGET="rainier"
+BR2_OPENPOWER_P10_XMLS="rainier-2u-xml rainier-4u-xml everest-xml"
+BR2_HOSTBOOT_P10_BINARY_SBE_FILENAME="p10_sbe.img.ecc"
+BR2_HOSTBOOT_P10_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_P10_BINARY_WINK_FILENAME="p10.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_P10_FILENAME="ima_catalog.bin"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+BR2_PACKAGE_LOADKEYS=y
+BR2_IMA_CATALOG_DTS="POWER9"
+BR2_PACKAGE_OCMB_EXPLORER_FW=y
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index b449eca..ebbb6ac 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -8,6 +8,7 @@
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/machine-xml/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/rainier-2u-xml/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/rainier-4u-xml/Config.in"
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/everest-xml/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-pnor/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-pnor-p10/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/petitboot/Config.in"
diff --git a/openpower/package/everest-xml/Config.in b/openpower/package/everest-xml/Config.in
new file mode 100644
index 0000000..8b8cccb
--- /dev/null
+++ b/openpower/package/everest-xml/Config.in
@@ -0,0 +1,86 @@
+menu "Everest XML (MRW)"
+
+config BR2_PACKAGE_EVEREST_XML
+ bool "everest_xml"
+
+if BR2_PACKAGE_EVEREST_XML
+
+choice
+ prompt "Everest XML location"
+
+config BR2_EVEREST_XML_GITHUB_PROJECT
+ bool "OpenPOWER Github project name"
+
+config BR2_EVEREST_XML_CUSTOM_GIT
+ bool "Custom URL of Everest xml repository"
+
+endchoice
+
+config BR2_EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES
+ bool "Filter Unwanted Attributes"
+ default y
+
+config BR2_EVEREST_XML_OPPOWERVM_ATTRIBUTES
+ bool "OPPOWERVM Attributes/Target"
+ default y
+
+config BR2_EVEREST_XML_TARGET_TYPES_OPENPOWER_XML
+ bool "Include target_types_openpower.xml"
+ default y
+
+config BR2_EVEREST_XML_CUSTOM_GIT_VALUE
+ string "URL of Everest xml repository"
+ depends on BR2_EVEREST_XML_CUSTOM_GIT
+
+config BR2_EVEREST_XML_GITHUB_PROJECT_VALUE
+ string "The Github project name (e.g. everest-xml)"
+ default "everest-xml"
+ depends on BR2_EVEREST_XML_GITHUB_PROJECT
+
+config BR2_EVEREST_XML_VERSION
+ string "Version of Everest XML"
+
+config BR2_EVEREST_XML_FILENAME
+ string "Everest XML filename (e.g. Everest-MRW.xml)"
+ default "Everest-MRW.xml"
+ help
+ The name of the MRW XML file. Note that this file MUST
+ come with the '.xml' prefix (all lowercase)
+
+config BR2_EVEREST_XML_SYSTEM_FILENAME
+ string "Targeting Everest system xml filename"
+ default ""
+ help
+ Defines the name of the system XML filename
+ to be used when creating targeting binary image
+
+config BR2_EVEREST_XML_TARGETING_FILENAME
+ string "Targeting Everest mrw xml filename"
+ default ""
+ help
+ Defines the name of the mrw XML filename
+ to be used when creating targeting binary image
+
+config BR2_EVEREST_XML_BIOS_FILENAME
+ string "BIOS Everest metadata XML filename"
+ default "Everest-MRW_bios.xml"
+ help
+ Defines the name of the BIOS XML filename
+ to parse when generating BIOS metadata
+
+config BR2_EVEREST_XML_TARGETING_BIN_FILENAME
+ string "Name of the openpower binary targeting file"
+ default "Everest-MRW.targeting.bin"
+ help
+ String used to define name of openpower targeting binary file
+
+config BR2_EVEREST_XML_TARGETING_ECC_FILENAME
+ string "Name of the openpower binary targeting ecc file"
+ default "Everest-MRW.targeting.bin.ecc"
+ help
+ String used to define name of openpower
+ targeting binary file, ecc protected
+
+endif
+
+endmenu
diff --git a/openpower/package/everest-xml/everest-xml.mk b/openpower/package/everest-xml/everest-xml.mk
new file mode 100644
index 0000000..29cdb8c
--- /dev/null
+++ b/openpower/package/everest-xml/everest-xml.mk
@@ -0,0 +1,166 @@
+################################################################################
+# everest-xml
+#
+################################################################################
+
+EVEREST_XML_VERSION ?= $(call qstrip,$(BR2_EVEREST_XML_VERSION))
+ifeq ($(BR2_EVEREST_XML_GITHUB_PROJECT),y)
+EVEREST_XML_SITE = $(call github,open-power,$(BR2_EVEREST_XML_GITHUB_PROJECT_VALUE),$(EVEREST_XML_VERSION))
+else ifeq ($(BR2_EVEREST_XML_CUSTOM_GIT),y)
+EVEREST_XML_SITE_METHOD = git
+EVEREST_XML_SITE = $(BR2_EVEREST_XML_CUSTOM_GIT_VALUE)
+endif
+
+EVEREST_XML_LICENSE = Apache-2.0
+EVEREST_XML_LICENSE_FILES = LICENSE
+EVEREST_XML_DEPENDENCIES += hostboot-p10
+
+EVEREST_XML_INSTALL_IMAGES = YES
+EVEREST_XML_INSTALL_TARGET = YES
+
+EVEREST_XML_MRW_SCRATCH=$(STAGING_DIR)/openpower_mrw_scratch
+EVEREST_XML_MRW_HB_TOOLS=$(STAGING_DIR)/hostboot_build_images
+
+# Defines for BIOS metadata creation
+EVEREST_XML_BIOS_SCHEMA_FILE = $(EVEREST_XML_MRW_HB_TOOLS)/bios.xsd
+EVEREST_XML_BIOS_CONFIG_FILE = \
+ $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_BIOS_FILENAME))
+EVEREST_XML_BIOS_METADATA_FILE = \
+ $(call qstrip,$(EVEREST_XML_MRW_HB_TOOLS)/$(BR2_OPENPOWER_P10_CONFIG_NAME)_bios_metadata.xml)
+EVEREST_XML_PETITBOOT_XSLT_FILE = $(EVEREST_XML_MRW_HB_TOOLS)/bios_metadata_petitboot.xslt
+EVEREST_XML_PETITBOOT_BIOS_METADATA_FILE = \
+ $(call qstrip, \
+ $(EVEREST_XML_MRW_HB_TOOLS)/$(BR2_OPENPOWER_P10_CONFIG_NAME)_bios_metadata_petitboot.xml)
+# XXX TODO: Figure out what to do with the bios_metadata.xml. Right now, the last xml
+# package file processed 'wins' and all previously processed xml packages are
+# overriden.
+EVEREST_XML_PETITBOOT_BIOS_INITRAMFS_FILE = \
+ $(TARGET_DIR)/usr/share/bios_metadata.xml
+
+ifeq ($(BR2_EVEREST_XML_OPPOWERVM_ATTRIBUTES),y)
+EVEREST_XML_OPPOWERVM_ATTR_XML = $(EVEREST_XML_MRW_HB_TOOLS)/attribute_types_oppowervm.xml
+EVEREST_XML_OPPOWERVM_TARGET_XML = $(EVEREST_XML_MRW_HB_TOOLS)/target_types_oppowervm.xml
+endif
+ifeq ($(BR2_EVEREST_XML_TARGET_TYPES_OPENPOWER_XML),y)
+EVEREST_XML_TARGET_TYPES_OPENPOWER_XML = $(EVEREST_XML_MRW_HB_TOOLS)/target_types_openpower.xml
+endif
+
+define EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES
+ chmod +x $(EVEREST_XML_MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl
+
+ $(EVEREST_XML_MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl \
+ --tgt-xml $(EVEREST_XML_MRW_HB_TOOLS)/target_types_merged.xml \
+ --tgt-xml $(EVEREST_XML_MRW_HB_TOOLS)/target_types_hb.xml \
+ --tgt-xml $(EVEREST_XML_MRW_HB_TOOLS)/target_types_oppowervm.xml \
+ --tgt-xml $(EVEREST_XML_MRW_HB_TOOLS)/target_types_openpower.xml \
+ --mrw-xml $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(BR2_EVEREST_XML_TARGETING_FILENAME))
+
+ cp $(call qstrip, $(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_TARGETING_FILENAME)).updated \
+ $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_TARGETING_FILENAME))
+endef
+
+define EVEREST_XML_BUILD_CMDS
+ # copy the machine xml where the common lives
+ $(INSTALL) -m 0644 -D $(@D)/$(call qstrip,$(BR2_EVEREST_XML_FILENAME)) \
+ $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip,$(BR2_EVEREST_XML_FILENAME))
+ $(INSTALL) -m 0644 -D $(@D)/$(call qstrip,$(BR2_EVEREST_XML_BIOS_FILENAME)) \
+ $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip,$(BR2_EVEREST_XML_BIOS_FILENAME))
+
+ # generate the system mrw xml
+ perl -I $(EVEREST_XML_MRW_HB_TOOLS) \
+ $(EVEREST_XML_MRW_HB_TOOLS)/processMrw.pl -x \
+ $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_FILENAME))
+
+ $(if $(BR2_EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES), $(call EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES))
+
+ # merge in any system specific attributes, hostboot attributes
+ $(EVEREST_XML_MRW_HB_TOOLS)/mergexml.sh \
+ $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_SYSTEM_FILENAME)) \
+ $(EVEREST_XML_MRW_HB_TOOLS)/attribute_types.xml \
+ $(EVEREST_XML_MRW_HB_TOOLS)/attribute_types_hb.xml \
+ $(EVEREST_XML_OPPOWERVM_ATTR_XML) \
+ $(EVEREST_XML_MRW_HB_TOOLS)/attribute_types_openpower.xml \
+ $(EVEREST_XML_MRW_HB_TOOLS)/target_types_merged.xml \
+ $(EVEREST_XML_MRW_HB_TOOLS)/target_types_hb.xml \
+ $(EVEREST_XML_OPPOWERVM_TARGET_XML) \
+ $(EVEREST_XML_TARGET_TYPES_OPENPOWER_XML) \
+ $(call qstrip, \
+ $(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_TARGETING_FILENAME)) \
+ > $(EVEREST_XML_MRW_HB_TOOLS)/$(call qstrip, \
+ $(BR2_EVEREST_XML_TARGETING_FILENAME))_temporary_hb.hb.xml;
+
+ # creating the targeting binary
+ # XXX TODO: xmltohb.pl creates a 'targeting.bin' in the output directory, we want
+ # that file to be unique if we don't want to risk collisions on eventual
+ # parallel builds
+ $(EVEREST_XML_MRW_HB_TOOLS)/xmltohb.pl \
+ --hb-xml-file=$(EVEREST_XML_MRW_HB_TOOLS)/$(call qstrip, \
+ $(BR2_EVEREST_XML_TARGETING_FILENAME))_temporary_hb.hb.xml \
+ --fapi-attributes-xml-file=$(EVEREST_XML_MRW_HB_TOOLS)/fapiattrs.xml \
+ --src-output-dir=$(EVEREST_XML_MRW_HB_TOOLS)/ \
+ --img-output-dir=$(EVEREST_XML_MRW_HB_TOOLS)/ \
+ --vmm-consts-file=$(EVEREST_XML_MRW_HB_TOOLS)/vmmconst.h --noshort-enums \
+ --bios-xml-file=$(EVEREST_XML_BIOS_CONFIG_FILE) \
+ --bios-schema-file=$(EVEREST_XML_BIOS_SCHEMA_FILE) \
+ --bios-output-file=$(EVEREST_XML_BIOS_METADATA_FILE)
+
+ # Transform BIOS XML into Petitboot specific BIOS XML via the schema
+ xsltproc -o \
+ $(EVEREST_XML_PETITBOOT_BIOS_METADATA_FILE) \
+ $(EVEREST_XML_PETITBOOT_XSLT_FILE) \
+ $(EVEREST_XML_BIOS_METADATA_FILE)
+
+ # Create the wofdata
+ if [ -e $(EVEREST_XML_MRW_HB_TOOLS)/wof-tables-img ]; then \
+ chmod +x $(EVEREST_XML_MRW_HB_TOOLS)/wof-tables-img; \
+ fi
+
+ if [ -d $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(BR2_EVEREST_XML_FILENAME:.xml=.wofdata)) ]; then \
+ $(EVEREST_XML_MRW_HB_TOOLS)/wof-tables-img \
+ --create $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(EVEREST_XML_FILENAME:.xml=.wof_output)) \
+ $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(BR2_EVEREST_XML_FILENAME:.xml=wofdata)); \
+ fi
+
+ # Create the MEMD binary
+ if [ -e $(EVEREST_XML_MRW_HB_TOOLS)/memd_creation.pl ]; then \
+ chmod +x $(EVEREST_XML_MRW_HB_TOOLS)/memd_creation.pl; \
+ fi
+
+ if [ -d $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(BR2_EVEREST_XML_FILENAME:.xml=.memd_binaries)) ]; then \
+ $(EVEREST_XML_MRW_HB_TOOLS)/memd_creation.pl \
+ -memd_dir $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(BR2_EVEREST_XML_FILENAME:.xml=.memd_binaries)) \
+ -memd_output $(EVEREST_XML_MRW_SCRATCH)/$(call qstrip, \
+ $(BR2_EVEREST_XML_FILENAME:.xml=.memd_output.dat)); \
+ fi
+
+endef
+
+define EVEREST_XML_INSTALL_IMAGES_CMDS
+ mv $(EVEREST_XML_MRW_HB_TOOLS)/targeting.bin $(call qstrip, \
+ $(EVEREST_XML_MRW_HB_TOOLS)/$(BR2_EVEREST_XML_TARGETING_BIN_FILENAME))
+ if [ -e $(EVEREST_XML_MRW_HB_TOOLS)/targeting.bin.protected ]; then \
+ mv -v $(EVEREST_XML_MRW_HB_TOOLS)/targeting.bin.protected \
+ $(call qstrip, \
+ $(EVEREST_XML_MRW_HB_TOOLS)/$(BR2_EVEREST_XML_TARGETING_BIN_FILENAME)).protected; \
+ fi
+ if [ -e $(EVEREST_XML_MRW_HB_TOOLS)/targeting.bin.unprotected ]; then \
+ mv -v $(EVEREST_XML_MRW_HB_TOOLS)/targeting.bin.unprotected \
+ $(call qstrip, \
+ $(EVEREST_XML_MRW_HB_TOOLS)/$(BR2_EVEREST_XML_TARGETING_BIN_FILENAME)).unprotected; \
+ fi
+endef
+
+define EVEREST_XML_INSTALL_TARGET_CMDS
+ # Install Petitboot specific BIOS XML into initramfs's usr/share/ dir
+ $(INSTALL) -D -m 0644 \
+ $(EVEREST_XML_PETITBOOT_BIOS_METADATA_FILE) \
+ $(EVEREST_XML_PETITBOOT_BIOS_INITRAMFS_FILE)
+endef
+
+$(eval $(generic-package))