summaryrefslogtreecommitdiff
path: root/meta-aspeed
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2022-01-17 14:12:27 +0300
committerJoel Stanley <joel@jms.id.au>2022-01-20 05:26:45 +0300
commit743f9b4616cedb0ace8277f18efd4ba9a0c61cb0 (patch)
treef68d8b3af5a28113a45b9aa4c6f19d10237573a1 /meta-aspeed
parentb47a431a0b12ab4a47f205356c406028f78de3eb (diff)
downloadopenbmc-743f9b4616cedb0ace8277f18efd4ba9a0c61cb0.tar.xz
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>
Diffstat (limited to 'meta-aspeed')
-rw-r--r--meta-aspeed/conf/machine/include/aspeed.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 628a73b1d8..fdc60fd4b4 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"