The U-Boot configuration has been consolidates into a single class to
avoid code duplication. This is now done by uboot-config class, so we
now use it.
Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---
Changes in v2: None
meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb | 2 +-
meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb | 9 +--------
meta/recipes-bsp/u-boot/u-boot.inc | 11 +----------
3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
index 7f649ca..4b7fd24 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
@@ -15,7 +15,7 @@ SRC_URI =
"git://git.denx.de/u-boot.git;branch=master;protocol=git"
S = "${WORKDIR}/git"
-inherit cross
+inherit uboot-config cross
EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc
${TOOLCHAIN_OPTIONS}"'
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
index e711951..be54343 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
@@ -17,14 +17,7 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
-python () {
- if not d.getVar("UBOOT_MACHINE", True):
- PN = d.getVar("PN", True)
- FILE = os.path.basename(d.getVar("FILE", True))
- bb.debug(1, "To build %s, see %s for instructions on \
- setting up your machine config" % (PN, FILE))
- raise bb.parse.SkipPackage("UBOOT_MACHINE is not set in the %s
machine configuration." % d.getVar("MACHINE", True))
-}
+inherit uboot-config
do_compile () {
oe_runmake ${UBOOT_MACHINE}
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
b/meta/recipes-bsp/u-boot/u-boot.inc
index 6ec63df..10a3cf8 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -3,19 +3,10 @@ HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome";
SECTION = "bootloaders"
PROVIDES = "virtual/bootloader"
-inherit deploy
+inherit uboot-config deploy
EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc
${TOOLCHAIN_OPTIONS}"'
-python () {
- if not d.getVar("UBOOT_MACHINE", True):
- PN = d.getVar("PN", True)
- FILE = os.path.basename(d.getVar("FILE", True))
- bb.debug(1, "To build %s, see %s for instructions on \
- setting up your machine config" % (PN, FILE))
- raise bb.parse.SkipPackage("UBOOT_MACHINE is not set in the %s
machine configuration." % d.getVar("MACHINE", True))
-}
-
# Allow setting an additional version string that will be picked up by the
# u-boot build system and appended to the u-boot version. If the .scmversion
# file already exists it will not be overwritten.
--
1.8.4.rc3
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
