3 files changed, 5 insertions, 2 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf
index 077d0b558..3915e2b98 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/swift.conf
@@ -7,7 +7,7 @@ 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 = "7880e778af3fca75f46aa3e94f7e9971a6ddbb1f"
+PHOSPHOR_MRW_REV = "2b59e12db44e167a1652777b770674d235ec55ba"
 
 # 128MB flash size
 FLASH_SIZE = "131072"
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf
index a3981cc4f..d21b9b22b 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf
@@ -1,5 +1,5 @@
+MACHINEOVERRIDES =. "witherspoon:"
 require conf/machine/witherspoon.conf
-MACHINEOVERRIDES .= ":witherspoon"
 
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
index 579b00d14..3f7aedcb9 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -8,6 +8,9 @@ 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