u-boot: don't override u-boot configuration when building for other machines.

This commit is contained in:
Bartłomiej Burdukiewicz 2020-10-22 19:30:32 +02:00
parent eaf085f87f
commit 636b3b74d7
No known key found for this signature in database
GPG Key ID: 43E0E1849C2BD118

View File

@ -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 " DEPENDS_append_sun50i = " atf-sunxi "
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@ -11,19 +11,19 @@ DEFAULT_PREFERENCE_sun7i="1"
DEFAULT_PREFERENCE_sun8i="1" DEFAULT_PREFERENCE_sun8i="1"
DEFAULT_PREFERENCE_sun50i="1" DEFAULT_PREFERENCE_sun50i="1"
SRC_URI += " \ SRC_URI_append_sunxi = " \
file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://boot.cmd \ file://boot.cmd \
" "
UBOOT_ENV_SUFFIX = "scr" UBOOT_ENV_SUFFIX_sunxi = "scr"
UBOOT_ENV = "boot" 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 " EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin "
do_compile_sun50i[depends] += "atf-sunxi:do_deploy" 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} ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
} }