6 files changed, 164 insertions, 0 deletions
diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf
new file mode 100644
index 000000000..a296e79b0
--- /dev/null
+++ b/meta-ibm/conf/machine/mihawk.conf
@@ -0,0 +1,42 @@
+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/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf
new file mode 100644
index 000000000..1f8c21e73
--- /dev/null
+++ b/meta-ibm/conf/machine/rainier.conf
@@ -0,0 +1,27 @@
+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/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
new file mode 100644
index 000000000..4c0abb57d
--- /dev/null
+++ b/meta-ibm/conf/machine/swift.conf
@@ -0,0 +1,18 @@
+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/conf/machine/witherspoon-128.conf b/meta-ibm/conf/machine/witherspoon-128.conf
new file mode 100644
index 000000000..d21b9b22b
--- /dev/null
+++ b/meta-ibm/conf/machine/witherspoon-128.conf
@@ -0,0 +1,14 @@
+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/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
new file mode 100644
index 000000000..4d94d9e9d
--- /dev/null
+++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -0,0 +1,30 @@
+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/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
new file mode 100644
index 000000000..20f515907
--- /dev/null
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -0,0 +1,33 @@
+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"