diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2013-09-19 17:48:38 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-20 12:27:56 +0100 |
| commit | d0bc7a53b1e61283fb155b4dcb67bc2ab3b1d7f0 (patch) | |
| tree | 5484a2e880d90a671a963e4db5bf9617eb9fd912 | |
| parent | 75bde3ee02262cb3c6b91279ca277e3e5324ee5e (diff) | |
| download | openembedded-core-d0bc7a53b1e61283fb155b4dcb67bc2ab3b1d7f0.tar.gz openembedded-core-d0bc7a53b1e61283fb155b4dcb67bc2ab3b1d7f0.tar.bz2 openembedded-core-d0bc7a53b1e61283fb155b4dcb67bc2ab3b1d7f0.zip | |
u-boot, u-boot-fw-utils, u-boot-fw-utils-cross: Use uboot-config class
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 <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb | 9 | ||||
| -rw-r--r-- | 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 7f649caac3..4b7fd24056 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 e711951405..be543431b3 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 6ec63df0e3..10a3cf82b4 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. |