commit 743f9b4616cedb0ace8277f18efd4ba9a0c61cb0
author Joel Stanley <joel@jms.id.au> Mon Jan 17 21:42:27 2022 +1030
committer Joel Stanley <joel@jms.id.au> Thu Jan 20 02:26:45 2022 +0000
tree f68d8b3af5a28113a45b9aa4c6f19d10237573a1
parent b47a431a0b12ab4a47f205356c406028f78de3eb

u-boot: Make u-boot-aspeed-sdk the default

This makes the v2019.04-aspeed-openbmc branch the default for all aspeed
machines.

Existing machines have all modified their u-boot package to use the
older branch, so this patch should result in no change.

Change-Id: Ic4dd0bb973a16d3d658c340e7caf6a05128327bc
Signed-off-by: Joel Stanley <joel@jms.id.au>

meta-aspeed/conf/machine/include/aspeed.inc

diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 628a73b..fdc60fd 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -1,11 +1,8 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-aspeed"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
-PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
 
-PREFERRED_PROVIDER_virtual/bootloader:aspeed-g6 ?= "u-boot-aspeed-sdk"
-PREFERRED_PROVIDER_u-boot:aspeed-g6 ?= "u-boot-aspeed-sdk"
-PREFERRED_PROVIDER_u-boot-fw-utils:aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed-sdk"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed-sdk"
+PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed-sdk"
 
 # Build a FIT image and stuff core-image-minimal in it by default.
 KERNEL_IMAGETYPE ?= "fitImage"