u-boot-sdk: Use OpenBMC fork
This is a fork that is based on ASPEED's 2019.04 SDK fork. The goal is
to move to a mainline based tree, but while that work is underway, this
allows ast2600 support to move forward.
This gains support for NC-SI, and uses kconfig for the default
boot command allowing us to drop the patch to aspeed-common.h.
Machines will need to indicate which device tree to use. If possible we
should look to having a few common device trees, but for now they are
machine specific. The AST2600 is configured to use the ast2600a1-evb
device tree, which will also work on the a0 variant.
(From meta-aspeed rev: 22ccf4648a776c458300c97a6d001a843b2b5c9b)
Change-Id: Ib21dc9962761aac3f3148fe4908439b975545e1e
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
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 31dc5f2..176981f 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,16 +8,9 @@
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "4d29b04c7aca4121d542b759575fbb93e52aef47"
+SRCREV = "0a1334330ffe43d13eef58efdcf59a2c10c13e20"
-UBRANCH = "aspeed-dev-v2019.04"
-SRC_URI = "git://github.com/AspeedTech-BMC/u-boot;branch=${UBRANCH};protocol=https"
-SRC_URI += "file://0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch"
-
-# There are different BOOTCOMMANDS for differently sized raw flash modules.
-ASPEED_IMAGE_SIZE_KB ?= "32768"
-MACHINEOVERRIDES .= ":flash-${ASPEED_IMAGE_SIZE_KB}"
-SRC_URI_append_flash-131072 = " file://bootcmd.cfg"
+SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https"
S = "${WORKDIR}/git"