commit b652e467727899419334e6bf8b5b63e3a4150b56
author Adriana Kobylak <anoo@us.ibm.com> Mon May 20 14:36:35 2019 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue May 28 22:34:48 2019 +0000
tree c7194bc454afbfa591eb3cdde635137a007c14c5
parent fdd8f7bb1cca6b505d6b92c741d04a9c6bbfafa7

swift: Point to swift's kernel device tree

The kernel device tree for swift has been merged upstream.

Tested:
    Output of "bitbake obmc-phosphor-image -e":
    # pre-expansion value:
    #   "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
    KERNEL_DEVICETREE="aspeed-bmc-opp-swift.dtb"

Change-Id: Ie56a243e8635fdb616ed930f0389f77e61271abf
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

meta-witherspoon/conf/machine/swift.conf

diff --git a/meta-witherspoon/conf/machine/swift.conf b/meta-witherspoon/conf/machine/swift.conf
index 4a84b0c..6b5b7ce 100644
--- a/meta-witherspoon/conf/machine/swift.conf
+++ b/meta-witherspoon/conf/machine/swift.conf
@@ -1,9 +1,7 @@
 require conf/machine/witherspoon.conf
 
-# TODO Change to ${KMACHINE}-bmc-opp-swift.dtb when the device tree is available
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-witherspoon.dtb"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
-# TODO Update once a Swift MRW is available
 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"