From b24a3e589e1a6eac0cb69d4c1ba2d1be36d1d2cb Mon Sep 17 00:00:00 2001 From: Ben_Pai Date: Mon, 15 Jul 2019 16:19:02 +0800 Subject: Add mihawk platform to meta-ibm The contents of this up-stream include the following items 1.Basic function 2.Led settings 3.GPIO monitor (id button and power supply) 4.Linux dts patch. (From meta-ibm rev: c53430a2234917b71f29d7e61d6aea749c45a2fc) Change-Id: Id0e47fd9197c8b2a70cbc94888bd572255664cdd Signed-off-by: Ben Pai Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/local.conf.sample | 1 + meta-ibm/meta-witherspoon/conf/machine/mihawk.conf | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/conf/machine/mihawk.conf (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample index 9dec7743d..d3a2303fc 100644 --- a/meta-ibm/meta-witherspoon/conf/local.conf.sample +++ b/meta-ibm/meta-witherspoon/conf/local.conf.sample @@ -1,3 +1,4 @@ +#MACHINE ?= "mihawk" #MACHINE ?= "swift" #MACHINE ?= "witherspoon-128" MACHINE ??= "witherspoon" diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf new file mode 100644 index 000000000..08d9ab74d --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf @@ -0,0 +1,38 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +KERNEL_FEATURES_append = " phosphor-wdt-on-panic" + +UBOOT_MACHINE = "ast_g5_ncsi_config" + +OBMC_POWER_SUPPLY_INSTANCES = "0 1" + +PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/openpower.inc +require conf/machine/include/p9.inc + +PHOSPHOR_MRW_LICENSE = "Apache-2.0" +PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +PHOSPHOR_MRW_URI = "git://github.com/open-power/mihawk-xml" +PHOSPHOR_MRW_REV = "b9929ba9fd96d78da01bce8a2a157851dce9e5cb" + + + +# Inhibit phosphor-hwmon-config-mrw +VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" + +# Inhibit phosphor-fan-presence-mrw-native +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ + "phosphor-fan-presence-config" + +# Inhibit phosphor-fan-control-fan-config-mrw-native +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ + "phosphor-fan-control-fan-config" + +# Inhibit mihawk-led-manager-config-native +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \ + "mihawk-led-manager-config-native" + +PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native" \ No newline at end of file -- cgit v1.2.3 From 537361a6a33b26796e09d2a374be2d955c12177a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 14 Aug 2019 09:16:41 -0500 Subject: witherspoon: Bump MRW version Pick up new IPMI clear sensor (From meta-ibm rev: 033ecca0a4321aba8000fd289c43aa38721255b2) Change-Id: I5c42bad754157bcae47463a1e8d6c0d1993e45d8 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 3f7aedcb9..20f515907 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -19,7 +19,7 @@ require conf/machine/include/p9.inc 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 = "e76c2fc5aeb512a0eb33438c239746de5b629885" +PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" # Inhibit phosphor-hwmon-config-mrw VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" -- cgit v1.2.3 From 0178703d47cae6f3c75dfddc4e0d6fccd653e177 Mon Sep 17 00:00:00 2001 From: Ben_Pai Date: Thu, 22 Aug 2019 17:07:01 +0800 Subject: meta-ibm: Enable mac2 on mihawk platform Since mihawk has share and dedicated two ports, so use two mac addresses. Tested:Use ip a command to see two mac addresses (From meta-ibm rev: ed92ee6fa8847511fbf2049e02ef3f8f0d7a7c70) Signed-off-by: Ben Pai Change-Id: I43b3b78f7efd7e339e91bdc356283f6b9ffe1a5c Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/mihawk.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf index 08d9ab74d..53a9f5b9c 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf @@ -12,6 +12,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc +require conf/distro/include/phosphor-aspeednic-use-mac2.inc PHOSPHOR_MRW_LICENSE = "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -- cgit v1.2.3 From 283f4a7bb09618c6dcdb41b67258f2aa27100105 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 25 Aug 2019 07:08:32 -0400 Subject: meta-ibm: add tacoma system The tacoma card is a boxelder replacement (witherspoon bmc card) with an ast2600 on it. By default use core-image-minimal as the initramfs. To add the full OpenBMC userspace set INITRAMFS_IMAGE="obmc-phosphor-image" in local.conf. Build instructions: TEMPLATECONF=meta-ibm/meta-witherspoon/conf . oe-init-build-env MACHINE=witherspoon-tacoma DISTRO=openbmc-openpower bitbake aspeed-image-norootfs (From meta-ibm rev: 77e917a89fd591bdc614aab362138f563460a316) Change-Id: I75374dbb3a01a66b2c70d96e56587a818262ebf8 Signed-off-by: Brad Bishop --- .../conf/machine/witherspoon-tacoma.conf | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf new file mode 100644 index 000000000..98d1978ee --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -0,0 +1,24 @@ +KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" +UBOOT_MACHINE = "evb-ast2600_defconfig" + +MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:" +require conf/machine/include/ast2600.inc +require conf/machine/include/openpower.inc +require conf/machine/include/p9.inc + +IMAGE_FSTYPES = "cpio.lzma" + +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" -- cgit v1.2.3 From af04d19514726cead1f7cfbaa5731a737d132f0d Mon Sep 17 00:00:00 2001 From: Alvin Wang Date: Wed, 28 Aug 2019 15:18:15 +0800 Subject: Add Mihawk mac address sync (From meta-ibm rev: effd83bdc65d9ae8f9d000205f8d55e0c29557e4) Change-Id: I5d8fb1cd15e0b0bf2c2360631be8f259f42be98f Signed-off-by: Alvin Wang Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/mihawk.conf | 5 ++++- .../images/obmc-phosphor-image.bbappend | 2 +- .../network/first-boot-set-mac_%.bbappend | 1 + .../vpd/mihawk-openpower-fru-inventory-native.bb | 19 +++++++++++++++++++ .../vpd/mihawk-openpower-fru-inventory/inventory | 3 +++ .../vpd/mihawk-openpower-fru-vpd-layout-native.bb | 20 ++++++++++++++++++++ .../vpd/mihawk-openpower-fru-vpd-layout/layout.yaml | 17 +++++++++++++++++ 7 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf index 53a9f5b9c..7a6fd8778 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf @@ -7,6 +7,7 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' +PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "mihawk-openpower-fru-vpd-layout-native" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc @@ -36,4 +37,6 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \ "mihawk-led-manager-config-native" -PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native" \ No newline at end of file +PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native" + +PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw = "mihawk-openpower-fru-inventory-native" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index 199d2c465..c66cc4efc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,2 +1,2 @@ OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname" -OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller" +OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend index cb167ee3f..fc8f6b861 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend @@ -1 +1,2 @@ SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " first-boot-set-mac@eth0.service" +SYSTEMD_SERVICE_${PN}_append_mihawk = " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service" \ No newline at end of file diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb new file mode 100644 index 000000000..e868fe99b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Mihawk Inventory config for openpower-vpd-parser" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit openpower-fru-vpd + +SRC_URI += "file://inventory" + +PROVIDES += "virtual/openpower-fru-inventory" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${inventory_datadir_native} + install -d ${DEST} + install inventory ${DEST} +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory new file mode 100644 index 000000000..5ae35ff9b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory @@ -0,0 +1,3 @@ +FRUS=ETHERNET,ETHERNET1 +PATHS=/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1 +EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0050/eeprom diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb new file mode 100644 index 000000000..0b9d6a785 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb @@ -0,0 +1,20 @@ +SUMMARY = "Mihawk VPD layout for openpower-fru-vpd" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit openpower-fru-vpd + +SRC_URI += "file://layout.yaml" + +PROVIDES += "virtual/openpower-fru-vpd-layout" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${vpdlayout_datadir} + + install -d ${DEST} + install layout.yaml ${DEST} +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml new file mode 100644 index 000000000..5bceb2f72 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml @@ -0,0 +1,17 @@ +BMC: + xyz.openbmc_project.Inventory.Decorator.Asset: + OPFR,VP: PartNumber + OPFR,VS: SerialNumber + OPFR,VN: Manufacturer + xyz.openbmc_project.Inventory.Item: + VINI,DR: PrettyName + xyz.openbmc_project.Inventory.Item.Bmc: +ETHERNET: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + VINI,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: +ETHERNET1: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + OPFR,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: + -- cgit v1.2.3 From ed03381645f8f1b8d642074ff2459aacd9300017 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 10 Sep 2019 09:43:10 -0400 Subject: meta-ibm: Add sample build invocations Display sample build invocations when sourcing oe-init-build-env. These are only the most commonly used combinations of distro/machine/image and not an exhaustive list of all supported configurations. Rather the purpose of displaying these is to help bitbake newcomers quickly initiate a build without having to set DISTRO and MACHINE in local.conf or wonder which image recipe to bake. (From meta-ibm rev: 85057176dc1cee6ab5c78ca949f89e5cdb555bca) Change-Id: Ie16860278d9d779fa1d53025a29609ad45dcb94f Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/conf-notes.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/conf-notes.txt b/meta-ibm/meta-witherspoon/conf/conf-notes.txt index 9b3c01a55..0c78d458d 100644 --- a/meta-ibm/meta-witherspoon/conf/conf-notes.txt +++ b/meta-ibm/meta-witherspoon/conf/conf-notes.txt @@ -1,2 +1,12 @@ -Common targets are: - obmc-phosphor-image +Sample meta-witherspoon build invocations: + +mihawk: +DISTRO=openbmc-witherspoon MACHINE=mihawk 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 aspeed-image-norootfs +witherspoon-128: +DISTRO=openbmc-witherspoon MACHINE=witherspoon-128 bitbake obmc-phosphor-image -- cgit v1.2.3 From 44d8109d65a066a3a4931ee189e95121e506c545 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 19 Sep 2019 15:19:43 -0500 Subject: Build full phosphor rootfs into witherspoon-tacoma (From meta-ibm rev: fd1276f3a466058f0f0adbbbc6de889c0ceff9ac) Change-Id: I6d9db69525486e394a3e4757d3173284d0b07109 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf index 98d1978ee..bbee6ad56 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -7,6 +7,7 @@ require conf/machine/include/openpower.inc require conf/machine/include/p9.inc IMAGE_FSTYPES = "cpio.lzma" +INITRAMFS_IMAGE = "obmc-phosphor-image" SERIAL_CONSOLES = "115200;ttyS4" -- cgit v1.2.3 From 3a878363c236e2dd7a30f6d831596e0626e7104d Mon Sep 17 00:00:00 2001 From: Ben_Pai Date: Fri, 20 Sep 2019 14:33:15 +0800 Subject: mihawk-xml: srcrev bump b9929ba9fd..f6ec5aa0f9 Change tpm connector instance name to prevent wrong name in bmc yaml file. (From meta-ibm rev: dad5e4f56d827cab311d9399a48bd09c26296f15) Change-Id: I919a8faadd3036b98215b76195602c1f8fb12435 Signed-off-by: Ben Pai Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/mihawk.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf index 7a6fd8778..a296e79b0 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf @@ -18,7 +18,7 @@ require conf/distro/include/phosphor-aspeednic-use-mac2.inc PHOSPHOR_MRW_LICENSE = "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" PHOSPHOR_MRW_URI = "git://github.com/open-power/mihawk-xml" -PHOSPHOR_MRW_REV = "b9929ba9fd96d78da01bce8a2a157851dce9e5cb" +PHOSPHOR_MRW_REV = "f6ec5aa0f9803d44b147a7670dec7ec935f59582" -- cgit v1.2.3 From 975bf61c12955b5a486d03048f04cf63e839fb74 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 16 Sep 2019 13:53:14 -0400 Subject: meta-ibm: Add rainier system Rainier is a POWER system with an ast2600. Build instructions: TEMPLATECONF=meta-ibm/meta-witherspoon/conf . oe-init-build env MACHINE=rainier DISTRO=openbmc-openpower bitbake obmc-phosphor-image (From meta-ibm rev: 4c39d65a0b5678042a96324197c37478d81d6d4a) Change-Id: I4bf5424d99ea643f7262ae17c962d2b7dd280076 Signed-off-by: Brad Bishop --- .../meta-witherspoon/conf/machine/rainier.conf | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/conf/machine/rainier.conf (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf new file mode 100644 index 000000000..81d808a7b --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -0,0 +1,24 @@ +KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" +UBOOT_MACHINE = "evb-ast2600_defconfig" + +MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:" +require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/openpower.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" + +FLASH_SIZE = "131072" -- cgit v1.2.3 From a114b070f745900c31ddfde97f383fde3cab0110 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 24 Sep 2019 21:59:07 -0400 Subject: ibm: tacoma: enable standard phosphor nor images Set the flash size so we get 128MiB images. Remove INITRAMFS and IMAGE_FSTYPES overrides so we get the standard phosphor images. (From meta-ibm rev: 1c12470b1ea14d6b043e0b214e800b974d10a36d) Change-Id: Ic941879b882aae809693a7901f3af95d23db5d05 Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf index bbee6ad56..e8a38300b 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -3,12 +3,10 @@ UBOOT_MACHINE = "evb-ast2600_defconfig" MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:" require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc -IMAGE_FSTYPES = "cpio.lzma" -INITRAMFS_IMAGE = "obmc-phosphor-image" - SERIAL_CONSOLES = "115200;ttyS4" MRW_XML = "witherspoon.xml" @@ -23,3 +21,5 @@ 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" + +FLASH_SIZE = "131072" -- cgit v1.2.3 From 7fe5760ae59db49e4b8c350cbc192097ba4e5958 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 19 Sep 2019 14:16:21 -0400 Subject: meta-ibm: layer.conf: add zeus compatibility OE-core master will be dropping warrior soon; zeus is the next release. (From meta-ibm rev: 9c8d1b961e1185ab2e7eabf6f6b42754fcb57db0) Change-Id: I791f06ddb596584d1a566657a38ad6eb13692521 Signed-off-by: Brad Bishop --- meta-ibm/conf/layer.conf | 2 +- meta-ibm/meta-palmetto/conf/layer.conf | 2 +- meta-ibm/meta-romulus/conf/layer.conf | 2 +- meta-ibm/meta-witherspoon/conf/layer.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-ibm/meta-witherspoon/conf') diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 131c45be3..4506bba62 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "thud warrior" +LAYERSERIES_COMPAT_ibm-layer = "warrior zeus" diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index 0329e5dc5..0bbb885ed 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "thud warrior" +LAYERSERIES_COMPAT_palmetto-layer = "warrior zeus" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index 13858d5a5..5b20790b6 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_romulus-layer = "thud warrior" +LAYERSERIES_COMPAT_romulus-layer = "warrior zeus" diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf index 62b067874..8cac30c39 100644 --- a/meta-ibm/meta-witherspoon/conf/layer.conf +++ b/meta-ibm/meta-witherspoon/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "witherspoon-layer" BBFILE_PATTERN_witherspoon-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_witherspoon-layer = "thud warrior" +LAYERSERIES_COMPAT_witherspoon-layer = "warrior zeus" -- cgit v1.2.3