[meta-ti] [rocko/master][PATCH] u-boot-ti: don't override do_compile, pass PACKAGECONFIG_CONFARGS to EXTRA_OEMAKE

Denys Dmytriyenko denys at ti.com
Thu Jul 26 14:25:29 PDT 2018


Signed-off-by: Denys Dmytriyenko <denys at ti.com>
---
 recipes-bsp/u-boot/u-boot-ti.inc | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 4fd3529..61bf990 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -35,6 +35,8 @@ PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}/boot/bl32.bin,,optee-os"
 # optee-os is not a direct dependency, do not enable optee by default
 PACKAGECONFIG_append_k3 = " atf"
 
+EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
+
 PROVIDES += "u-boot"
 PKG_${PN} = "u-boot"
 PKG_${PN}-dev = "u-boot-dev"
@@ -107,25 +109,6 @@ UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND"
 UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}"
 UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}"
 
-do_compile_k3 () {
-	if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
-		sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-
-	if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-	then
-		echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
-		echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
-	fi
-
-	oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
-	oe_runmake -C ${S} O=${B} ${PACKAGECONFIG_CONFARGS} ${UBOOT_MAKE_TARGET}
-}
-
 do_install_append () {
 	if [ -n "${UBOOT_CONFIG}" ]
 	then
-- 
2.7.4



More information about the meta-ti mailing list