u-boot-aspeed: Rename Rainier device tree to P10 BMC
Joel Stanley (2):
ARM: dts: Rename Rainier to P10 BMC
ARM: dts: ast2600: Fix indentation
Change-Id: I732324d89b7c0f731160d69942051e4d4cadc778
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
index 58ce5fa..0e33338 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
@@ -8,7 +8,7 @@
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "627c95b300bc20ec225cfb320a28676e43a36f7d"
+SRCREV = "804e42b010d91eaed155aca8620ff5f905996302"
SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 4127267..ed43942 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -2,7 +2,7 @@
KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb aspeed-bmc-ibm-everest.dtb"
UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
-UBOOT_DEVICETREE = "ast2600-rainier"
+UBOOT_DEVICETREE = "ast2600-p10bmc"
SPL_BINARY = "spl/u-boot-spl.bin"
OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"