From a433d8ef9fc03b653a770634624ac2ae084cf0b0 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 1 Apr 2021 14:59:43 +0000 Subject: ibm: Create p10bmc build target Replace rainier with p10bmc as build target. Keep the rainier.conf as a symlink to p10bmc.conf to allow the transition. Remove the rainier.conf and the machine override from p10bmc.conf in a later commit to complete the replacement. Tested: Built rainier and p10bmc and checked for some files/service units to exist on both. Change-Id: Ic8c8c6ffbc3507fbd9c692da259e37ae695359a6 Signed-off-by: Adriana Kobylak --- meta-ibm/conf/conf-notes.txt | 4 ++-- meta-ibm/conf/local.conf.sample | 2 +- meta-ibm/conf/machine/p10bmc.conf | 35 +++++++++++++++++++++++++++++++++++ meta-ibm/conf/machine/rainier.conf | 35 +---------------------------------- 4 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 meta-ibm/conf/machine/p10bmc.conf mode change 100644 => 120000 meta-ibm/conf/machine/rainier.conf (limited to 'meta-ibm') diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt index f56b88b1ba..d4578dcf48 100644 --- a/meta-ibm/conf/conf-notes.txt +++ b/meta-ibm/conf/conf-notes.txt @@ -2,11 +2,11 @@ Example build invocations: mihawk: DISTRO=openbmc-witherspoon MACHINE=mihawk bitbake obmc-phosphor-image +p10bmc: +DISTRO=openbmc-openpower MACHINE=p10bmc bitbake obmc-phosphor-image swift: DISTRO=openbmc-witherspoon MACHINE=swift bitbake obmc-phosphor-image witherspoon: DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image witherspoon-tacoma: DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image -rainier: -DISTRO=openbmc-openpower MACHINE=rainier bitbake obmc-phosphor-image diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index 4b70cade46..9f2228b80d 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -1,6 +1,6 @@ #MACHINE ?= "mihawk" +#MACHINE ?= "p10bmc" #MACHINE ?= "swift" -#MACHINE ?= "rainier" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" PACKAGE_CLASSES ?= "package_rpm" diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf new file mode 100644 index 0000000000..22b59b4263 --- /dev/null +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -0,0 +1,35 @@ +KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb aspeed-bmc-ibm-everest.dtb" +UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig" +UBOOT_DEVICETREE = "ast2600-rainier" +SPL_BINARY = "spl/u-boot-spl.bin" + +OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" + +# TODO remove the MACHINEOVERRIDES when the rainier.conf file is removed. +MACHINEOVERRIDES =. "p10bmc:" +require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/openpower.inc +include conf/machine/include/ibm-power10-cpu.inc +require conf/distro/include/openpower-virtual-pnor.inc +require conf/distro/include/phosphor-mmc.inc +require conf/distro/include/ibm-mpreboot.inc + +SERIAL_CONSOLES = "115200;ttyS4" + +MRW_XML = "witherspoon.xml" +PHOSPHOR_MRW_LICENSE = "Apache-2.0" +PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" +PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" + +VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" + +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ + "phosphor-fan-control-fan-config" +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ + "phosphor-fan-presence-config" + +SKIP_BROKEN_MRW = "1" + +IMAGE_FEATURES_remove = "obmc-ikvm" diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf deleted file mode 100644 index f7f08dd08f..0000000000 --- a/meta-ibm/conf/machine/rainier.conf +++ /dev/null @@ -1,34 +0,0 @@ -KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb aspeed-bmc-ibm-everest.dtb" -UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig" -UBOOT_DEVICETREE = "ast2600-rainier" -SPL_BINARY = "spl/u-boot-spl.bin" - -OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" - -MACHINEOVERRIDES =. "p10bmc:" -require conf/machine/include/ast2600.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/openpower.inc -include conf/machine/include/ibm-power10-cpu.inc -require conf/distro/include/openpower-virtual-pnor.inc -require conf/distro/include/phosphor-mmc.inc -require conf/distro/include/ibm-mpreboot.inc - -SERIAL_CONSOLES = "115200;ttyS4" - -MRW_XML = "witherspoon.xml" -PHOSPHOR_MRW_LICENSE = "Apache-2.0" -PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" -PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" - -VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" - -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ - "phosphor-fan-control-fan-config" -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ - "phosphor-fan-presence-config" - -SKIP_BROKEN_MRW = "1" - -IMAGE_FEATURES_remove = "obmc-ikvm" diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf new file mode 120000 index 0000000000..ddfb6ec6d1 --- /dev/null +++ b/meta-ibm/conf/machine/rainier.conf @@ -0,0 +1 @@ +p10bmc.conf \ No newline at end of file -- cgit v1.2.3