u-boot: Move recipes to the Aspeed BSP layer

Move the u-boot recipes out of the Phosphor layer to the Aspeed layer.
When a SOC requires a specific u-boot tree, convention dictates the
BSP layer supporting the SOC includes recipes for that tree.

Tested: Built image and verified in witherspoon qemu
Change-Id: I4d5bade05566ae4cbcf5a2c637a1ed275c63ab36
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

5 files changed, 7 insertions, 61 deletions

diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-common.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-common.inc
deleted file mode 100644
index 8e278bdff..000000000
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-common.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-HOMEPAGE = "https://github.com/openbmc/u-boot"
-SECTION = "bootloaders"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-PE = "1"
-
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "7fb88a88d08c19b0e6f88c0a484ab001a4476a27"
-
-UBRANCH = "v2016.07-aspeed-openbmc"
-SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
-
-S = "${WORKDIR}/git"
-
-PV = "v2016.07+git${SRCPV}"
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
deleted file mode 100644
index e5a90367f..000000000
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-DEPENDS = "mtd-utils"
-
-require u-boot-common.inc
-
-INSANE_SKIP_${PN} = "already-stripped"
-EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
-EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
-
-inherit uboot-config
-
-do_compile () {
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake env
-}
-
-do_install () {
-	install -d ${D}${base_sbindir}
-	install -d ${D}${sysconfdir}
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
-}
-
-do_install_class-cross () {
-	install -d ${D}${bindir_cross}
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
-}
-
-SYSROOT_DIRS_append_class-cross = " ${bindir_cross}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-BBCLASSEXTEND = "cross"
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc
deleted file mode 100644
index da7ca40e3..000000000
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require u-boot-aspeed.inc
-
-python do_configure () {
-    pass
-}
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_%.bbappend
new file mode 100644
index 000000000..f9a1e83fc
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+include u-boot-aspeed.inc
+
+python do_configure () {
+    pass
+}
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb
deleted file mode 100644
index 81da3c71b..000000000
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-common.inc
-require u-boot-phosphor.inc
-
-DEPENDS += "dtc-native"