summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common.inc (renamed from meta-phosphor/common/recipes-bsp/u-boot/u-boot-common.inc)0
-rw-r--r--meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb (renamed from meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb)0
-rw-r--r--meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot_2016.07.bb (renamed from meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb)1
-rw-r--r--meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc5
-rw-r--r--meta-phosphor/common/recipes-bsp/u-boot/u-boot_%.bbappend7
5 files changed, 7 insertions, 6 deletions
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
index 8e278bdff..8e278bdff 100644
--- 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
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
index e5a90367f..e5a90367f 100644
--- 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
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
index 81da3c71b..0df7f2b0d 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 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
+}
OpenPOWER on IntegriCloud