Add override for aspeed bsp machine.
Upstream yocto is organized such that there is only bblayer for all
builds and overrides are used to customize recipes for any specific
platform.
It's possible for a group to use openbmc/openbmc as part of their
distro and run into issues with recipes that are comingled.
Change-Id: I5dc6e8c1448d95da1b5ee64b220e2955466cdf4e
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/meta-ast2400/conf/machine/include/ast2400.inc b/meta-ast2400/conf/machine/include/ast2400.inc
index 54a2ad6..0215a0d 100644
--- a/meta-ast2400/conf/machine/include/ast2400.inc
+++ b/meta-ast2400/conf/machine/include/ast2400.inc
@@ -14,4 +14,6 @@
SERIAL_CONSOLES = "115200;ttyS4"
+MACHINEOVERRIDES .= ":ast2400"
+
require conf/machine/include/tune-arm926ejs.inc
diff --git a/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
index 070f389..375359e 100644
--- a/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
+++ b/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/files:"
-SRC_URI += "file://fw_env.config"
+SRC_URI_append_ast2400 = " file://fw_env.config"
-do_install_append() {
+do_install_append_ast2400() {
if [ -e ${WORKDIR}/fw_env.config ] ; then
install -d ${D}${sysconfdir}
install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
diff --git a/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend
index ef6a709..e3cc9e2 100644
--- a/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/files:"
-SRC_URI += "file://fw_env.config"
+SRC_URI_append_ast2400 = " file://fw_env.config"
diff --git a/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
index 6d7ae27..7b49ba1 100644
--- a/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
+++ b/meta-ast2400/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://defconfig"
+FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/${PN}:"
+SRC_URI_append_ast2400 = " file://defconfig"
diff --git a/meta-ast2500/conf/machine/include/ast2500.inc b/meta-ast2500/conf/machine/include/ast2500.inc
index 94e9a59..01f299c 100644
--- a/meta-ast2500/conf/machine/include/ast2500.inc
+++ b/meta-ast2500/conf/machine/include/ast2500.inc
@@ -14,4 +14,6 @@
SERIAL_CONSOLES = "115200;ttyS4"
+MACHINEOVERRIDES .= ":ast2500"
+
require conf/machine/include/arm/arch-armv6.inc
diff --git a/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
index 070f389..ece33b0 100644
--- a/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
+++ b/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/files:"
-SRC_URI += "file://fw_env.config"
+SRC_URI_append_ast2500 = " file://fw_env.config"
-do_install_append() {
+do_install_append_ast2500() {
if [ -e ${WORKDIR}/fw_env.config ] ; then
install -d ${D}${sysconfdir}
install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
diff --git a/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend
index ef6a709..f214b22 100644
--- a/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/files:"
-SRC_URI += "file://fw_env.config"
+SRC_URI_append_ast2500 = " file://fw_env.config"
diff --git a/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend
index 6d7ae27..ee9a010 100644
--- a/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend
+++ b/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://defconfig"
+FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/${PN}:"
+SRC_URI_append_ast2500 = " file://defconfig"