diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-04-22 21:06:02 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-27 19:52:12 +0300 |
commit | e161514219e0dc8a957dabbb8529fb9fcac4e115 (patch) | |
tree | 5de46006517d690f5793eec41281d60611228ecd /meta-ibm/meta-witherspoon/conf | |
parent | a3f54c8b8cbd50bc86efdc52cfb7d348d8c19d21 (diff) | |
download | openbmc-e161514219e0dc8a957dabbb8529fb9fcac4e115.tar.xz |
meta-ibm: move all meta-witherspoon metadata
The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon. Move everything to meta-ibm.
The meta-ibm README is re-written to more accurately reflect the scope
of the layer.
Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.
(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)
Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/conf')
7 files changed, 0 insertions, 169 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf deleted file mode 100644 index 1ccdeb3f58..0000000000 --- a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf +++ /dev/null @@ -1,5 +0,0 @@ -require conf/distro/openbmc-openpower.conf -require conf/distro/include/phosphor-ubi.inc -require conf/distro/include/phosphor-tiny.inc -require conf/distro/include/openpower-mrw.inc -require conf/distro/include/openpower-ubi.inc diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf deleted file mode 100644 index a296e79b09..0000000000 --- a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf +++ /dev/null @@ -1,42 +0,0 @@ -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 = '' -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 -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" -PHOSPHOR_MRW_URI = "git://github.com/open-power/mihawk-xml" -PHOSPHOR_MRW_REV = "f6ec5aa0f9803d44b147a7670dec7ec935f59582" - - - -# 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" - -PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw = "mihawk-openpower-fru-inventory-native" diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf deleted file mode 100644 index 1f8c21e73a..0000000000 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ /dev/null @@ -1,27 +0,0 @@ -KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" -UBOOT_DEVICETREE = "ast2600-rainier" - -OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" - -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" -SKIP_BROKEN_MRW = "1" diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf deleted file mode 100644 index 4c0abb57d3..0000000000 --- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf +++ /dev/null @@ -1,18 +0,0 @@ -require conf/machine/witherspoon.conf - -IMAGE_FSTYPES += "ext4 mmc-ext4-tar" - -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" - -PHOSPHOR_MRW_LICENSE = "Apache-2.0" -PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -PHOSPHOR_MRW_URI = "git://git@github.com/open-power/swift-xml;protocol=ssh" -PHOSPHOR_MRW_REV = "2b59e12db44e167a1652777b770674d235ec55ba" - -# 128MB flash size -FLASH_SIZE = "131072" - -# 32MB read-write filesystem -FLASH_UBI_RWFS_SIZE ?= "32768" -FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" -BMC_RW_SIZE = "0x2000000" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf deleted file mode 100644 index d21b9b22b2..0000000000 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf +++ /dev/null @@ -1,14 +0,0 @@ -MACHINEOVERRIDES =. "witherspoon:" -require conf/machine/witherspoon.conf - -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" - -MRW_XML = "witherspoon.xml" - -# 128MB flash size -FLASH_SIZE = "131072" - -# 32MB read-write filesystem -FLASH_UBI_RWFS_SIZE ?= "32768" -FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" -BMC_RW_SIZE = "0x2000000" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf deleted file mode 100644 index 4d94d9e9de..0000000000 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ /dev/null @@ -1,30 +0,0 @@ -KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" -UBOOT_DEVICETREE = "ast2600-tacoma" - -IMAGE_FSTYPES += "ext4 mmc-ext4-tar" - -OBMC_POWER_SUPPLY_INSTANCES = "0 1" - -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 - -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" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf deleted file mode 100644 index 20f515907f..0000000000 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ /dev/null @@ -1,33 +0,0 @@ -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 = '' - -# A machine override for common machine configuration for all of IBM's -# "Accelerated Computing" class of systems. -MACHINEOVERRIDES =. "ibm-ac-server:" -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=e3fc50a88d0a364313df4b21ef20c29e" -PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" -PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7" - -# 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" |