From 636b3b74d7719f225bb649644d9c6d321f4b34a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Thu, 22 Oct 2020 19:30:32 +0200 Subject: [PATCH] u-boot: don't override u-boot configuration when building for other machines. --- recipes-bsp/u-boot/u-boot_%.bbappend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 9305d77..979dfe8 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS_prepend_sunxi := "${THISDIR}/files:" -DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native " +DEPENDS_append_sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS_append_sun50i = " atf-sunxi " COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" @@ -11,19 +11,19 @@ DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun8i="1" DEFAULT_PREFERENCE_sun50i="1" -SRC_URI += " \ +SRC_URI_append_sunxi = " \ file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://boot.cmd \ " -UBOOT_ENV_SUFFIX = "scr" -UBOOT_ENV = "boot" +UBOOT_ENV_SUFFIX_sunxi = "scr" +UBOOT_ENV_sunxi = "boot" -EXTRA_OEMAKE += ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" ' +EXTRA_OEMAKE_append_sunxi = ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" ' EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin " do_compile_sun50i[depends] += "atf-sunxi:do_deploy" -do_compile_append() { +do_compile_append_sunxi() { ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY} }