From 1a04b621baf9585f0021eb939b4b2f560563c654 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 28 Jan 2020 17:12:44 +1030 Subject: 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 Signed-off-by: Andrew Geissler --- meta-aspeed/conf/machine/evb-ast2600.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-aspeed/conf') diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index 9c8c64963..9fb38e090 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -1,5 +1,6 @@ KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600a1-evb" require conf/machine/include/ast2600.inc -- cgit v1.2.3