meta-ibm: Configure rainier machine for new u-boot

This selects the ast2600 openbmc u-boot configuration and the rainier
device tree.

(From meta-ibm rev: d3ed8678c77cd88a1953721b053f4fc6c1918fd1)

Change-Id: Id97193d6f19e5e6b7e796880d13976417e79f92c
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
index 78ffbbc..1f8c21e 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
@@ -1,5 +1,6 @@
 KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb"
-UBOOT_MACHINE = "evb-ast2600_defconfig"
+UBOOT_MACHINE = "ast2600_openbmc_defconfig"
+UBOOT_DEVICETREE = "ast2600-rainier"
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"