6 files changed, 8 insertions, 8 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
index 05b1c8976..b3a41a28a 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot_2016.07.bb
+++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
@@ -1,4 +1,5 @@
-require u-boot-common_${PV}.inc
+require u-boot-common-aspeed_${PV}.inc
 require recipes-bsp/u-boot/u-boot.inc
 
+PROVIDES += "u-boot"
 DEPENDS += "dtc-native"
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common_2016.07.inc b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
index 054933057..054933057 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common_2016.07.inc
+++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
index 2b2b62c9e..713133ceb 100644
--- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
+++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
@@ -1,4 +1,4 @@
-require u-boot-common_${PV}.inc
+require u-boot-common-aspeed_${PV}.inc
 
 SRC_URI += "file://default-gcc.patch"
 SRC_URI += "file://fw_env.config"
@@ -7,6 +7,8 @@ SRC_URI += "file://alt_fw_env.config"
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
 DEPENDS = "mtd-utils"
 
+PROVIDES += "u-boot-fw-utils"
+
 INSANE_SKIP_${PN} = "already-stripped"
 EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
 EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
index 4990e1ae3..ff6c83e42 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
@@ -1,9 +1,6 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
-
-ASPEED_UBOOT_VERSION ?= "v2016.07+git%"
-
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-PREFERRED_VERSION_u-boot ?= "${ASPEED_UBOOT_VERSION}"
-PREFERRED_VERSION_u-boot-fw-utils ?= "${ASPEED_UBOOT_VERSION}"
+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"
 
 MACHINEOVERRIDES .= ":aspeed"
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 6c6849436..6c6849436 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
index 6c6849436..6c6849436 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend