---
include/configs/mx6ullevk.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 00882f6..720603c 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -50,6 +50,7 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
#define CONFIG_EXTRA_ENV_SETTINGS \
+ "kernel_addr_r=0x80800000\0" \
"script=boot.scr\0" \
"image=zImage\0" \
"console=ttymxc0\0" \
--
2.7.4---
include/env_default.h | 3 +++
scripts/Makefile.autoconf | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/env_default.h b/include/env_default.h
index 54d8124..9cf272c 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -9,6 +9,8 @@
#include <env_callback.h>
+#include <env_mender.h>
+
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
env_t environment __UBOOT_ENV_SECTION__(environment) = {
ENV_CRC, /* CRC Sum */
@@ -21,6 +23,7 @@ static char default_environment[] = {
#else
const uchar default_environment[] = {
#endif
+ MENDER_ENV_SETTINGS
#ifndef CONFIG_USE_DEFAULT_ENV_FILE
#ifdef CONFIG_ENV_CALLBACK_LIST_DEFAULT
ENV_CALLBACK_VAR "=" CONFIG_ENV_CALLBACK_LIST_DEFAULT "\0"
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 00b8fb3..e312c80 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -109,7 +109,8 @@ define filechk_config_h
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
echo \#include \<linux/kconfig.h\>; \
- echo \#include \<config_fallbacks.h\>;)
+ echo \#include \<config_fallbacks.h\>; \
+ echo \#include \<config_mender.h\>;)
endef
include/config.h: scripts/Makefile.autoconf create_symlink FORCE
--
2.7.4FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-add-kernel_addr_r-required-by-mender.patch \
file://0003-patch3-for-thud.patch \
"
SRC_URI_remove = "file://0003-Integration-of-Mender-boot-code-into-U-Boot.patch \
file://0005-fw_env_main.c-Fix-incorrect-size-for-malloc-ed-strin.patch \
"
require recipes-bsp/u-boot/u-boot-mender.inc
PROVIDES += "u-boot"
RPROVIDES_${PN} += "u-boot"# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
# Released under the MIT license (see COPYING.MIT for the terms)
inherit fsl-u-boot-localversion
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
SRCREV = "1e13b91af7b492d97bdf613680e43605e562a562"
SRCBRANCH = "2018.07+fslc"
PV = "v2018.07+git${SRCPV}"
S = "${WORKDIR}/git"require u-boot-fslc-common_${PV}.inc
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
DEPENDS = "mtd-utils"
INSANE_SKIP_${PN} = "already-stripped"
EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
inherit uboot-config
do_compile () {
oe_runmake ${UBOOT_MACHINE}
oe_runmake envtools
}
do_install () {
install -d ${D}${base_sbindir}
install -d ${D}${sysconfdir}
install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
if [ -e ${WORKDIR}/fw_env.config ]; then
install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
else
install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
fi
}
do_install_class-cross () {
install -d ${D}${bindir_cross}
install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
}
SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
uboot_fw_utils_cross() {
sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
}
PROVIDES += "u-boot-fw-utils"
RPROVIDES_${PN} += "u-boot-fw-utils"
PACKAGE_ARCH = "${MACHINE_ARCH}"
BBCLASSEXTEND = "cross"
require recipes-bsp/u-boot/u-boot-fw-utils-mender.inc
PROVIDES += "u-boot-fw-utils"
RPROVIDES_${PN} += "u-boot-fw-utils"FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-add-kernel_addr_r-required-by-mender.patch \
file://0003-patch3-for-thud.patch \
"
SRC_URI_remove = "file://0003-Integration-of-Mender-boot-code-into-U-Boot.patch \
file://0005-fw_env_main.c-Fix-incorrect-size-for-malloc-ed-strin.patch \
"I sense that the automatic U-Boot patching is somehow interfering with your patches, so you might want to turn that off. Check out the manual U-Boot patching section, particularly the sections How to integrate with U-Boot and Disabling automatic patching. That'll disable the auto-patching and give you the patch as a manual patch instead, so you can play around and see if anything is wrong. It also disables all the build magic which causes old-src to appear.
----
You received this message because you are subscribed to the Google Groups "Mender List mender.io" group.
To unsubscribe from this group and stop receiving emails from it, send an email to mender+un...@lists.mender.io.
To post to this group, send email to men...@lists.mender.io.
Visit this group at https://groups.google.com/a/lists.mender.io/group/mender/.
Hi Kristian,I disabled auto patching and I generated the mender_auto_configured.patch.However also with MENDER_UBOOT_AUTO_CONFIGURE = "0", mender is trying to apply patches, because in work/..../u-boot-fslc/.../ there are some mender patch files: 0001, 0002, 0003, 0005, 0006.Why mender is still trying to apply its patches also with MENDER_UBOOT_AUTO_CONFIGURE = "0" added to both u-boot and fw-utils bbappend files?
Initialising tasks: 100% |#######################################| Time: 0:00:01
Sstate summary: Wanted 142 Found 47 Missed 95 Current 280 (33% match, 77% complete)
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
ERROR: u-boot-fslc-fw-utils-v2018.11+gitAUTOINC+6e25ce6f3c-r0 do_check_mender_defines: oe_runmake failed
ERROR: u-boot-fslc-fw-utils-v2018.11+gitAUTOINC+6e25ce6f3c-r0 do_check_mender_defines: Function failed: do_check_mender_defines (log file is located at /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/temp/log.do_check_mender_defines.124893)
ERROR: Logfile of failure stored in: /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/temp/log.do_check_mender_defines.124893
Log data follows:
| DEBUG: Executing shell function do_check_mender_defines
| NOTE: make CROSS_COMPILE=arm-poky-linux-gnueabi- CC=arm-poky-linux-gnueabi-gcc -march=armv7ve -mthumb -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a7 -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0=/usr/src/debug/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0 -fdebug-prefix-map=/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot= -fdebug-prefix-map=/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong -Wl,-z,relro,-z,now HOSTCC=gcc -isystem/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -L/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-rpath,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/home/ks89/git/patches-fslc-thud/poky/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 V=1 -C /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git O=/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git mx6ull_14x14_evk_defconfig
| make: Entering directory '/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git'
| make -C /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git KBUILD_SRC=/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git \
| -f /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git/Makefile mx6ull_14x14_evk_defconfig
| make[1]: Entering directory '/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git'
| make -f /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git/scripts/Makefile.build obj=scripts/basic
| gcc -isystem/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -L/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-rpath,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/home/ks89/git/patches-fslc-thud/poky/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 -Wp,-MD,scripts/basic/.fixdep.d -Iscripts/basic -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu11 -o scripts/basic/fixdep scripts/basic/fixdep.c
| rm -f .tmp_quiet_recordmcount
| ln -fsn /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git source
| /bin/bash /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git/scripts/mkmakefile \
| /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git . 2018 11
| make -f /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git/scripts/Makefile.build obj=scripts/kconfig mx6ull_14x14_evk_defconfig
| gcc -isystem/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -L/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-rpath,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/home/ks89/git/patches-fslc-thud/poky/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 -Wp,-MD,scripts/kconfig/.conf.o.d -Iscripts/kconfig -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu11 -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/conf.o scripts/kconfig/conf.c
| bison -oscripts/kconfig/zconf.tab.c -t -l scripts/kconfig/zconf.y
| /bin/sh: 1: bison: not found
| ERROR: oe_runmake failed
| scripts/Makefile.lib:228: recipe for target 'scripts/kconfig/zconf.tab.c' failed
| make[2]: *** [scripts/kconfig/zconf.tab.c] Error 127
| /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git/Makefile:496: recipe for target 'mx6ull_14x14_evk_defconfig' failed
| make[1]: *** [mx6ull_14x14_evk_defconfig] Error 2
| make[1]: Leaving directory '/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git'
| Makefile:148: recipe for target 'sub-make' failed
| make: *** [sub-make] Error 2
| make: Leaving directory '/home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/git'
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_check_mender_defines (log file is located at /home/ks89/git/patches-fslc-thud/poky/build/tmp/work/evk_fslc-poky-linux-gnueabi/u-boot-fslc-fw-utils/v2018.11+gitAUTOINC+6e25ce6f3c-r0/temp/log.do_check_mender_defines.124893)
ERROR: Task (/home/ks89/git/patches-fslc-thud/poky/meta-custom-layer/meta-custom-layer-core/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.11.bb:do_check_mender_defines) failed with exit code '1'
NOTE: Tasks Summary: Attempted 1608 tasks of which 1588 didn't need to be rerun and 1 failed.
Summary: 1 task failed:
/home/ks89/git/patches-fslc-thud/poky/meta-custom-layer/meta-custom-layer-core/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.11.bb:do_check_mender_defines
Summary: There were 2 ERROR messages shown, returning a non-zero exit code.
I tried also with fslc thud, but the situation is different.I disabled auto_patch like in sumo, but this time I'm receiving an error message about u-boot-fslc-fw-utils_2018.11 (not u-boot-fslc but fw-utils).I never saw this error and it isn't reported in troubleshooting page:
Ok thank you for the feedback.Yes I confirm that DEPENDS += "flex-native bison-native" is missing in fslc. I don't know why.Do you think that it's better to report this to u-boot community?