| commit | b598a9268e7a75c5e01ee7ff3543beee5d045762 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Feb 08 15:23:05 2018 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Feb 23 13:43:40 2018 -0500 |
| tree | 95fd8b47667765f0a19732820ae62d8f7c2a52cb | |
| parent | 273ec60e436cce9e6df6f44d1cd9392b420cd7ad [diff] |
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>
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-common.inc b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc similarity index 100% rename from meta-phosphor/common/recipes-bsp/u-boot/u-boot-common.inc rename to meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc
diff --git a/meta-phosphor/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_2016.07.bb similarity index 100% rename from meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb rename to meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot_2016.07.bb similarity index 75% rename from meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb rename to meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot_2016.07.bb index 81da3c7..0df7f2b 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot_2016.07.bb
@@ -1,5 +1,4 @@ require recipes-bsp/u-boot/u-boot.inc require u-boot-common.inc -require u-boot-phosphor.inc DEPENDS += "dtc-native"
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 da7ca40..0000000 --- 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 0000000..f9a1e83 --- /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 +}