Compulab CL-SOM-iMX7

I took a step back, left do_patch[depends] as it was and added this to local.conf since I saw that the file
mender-u-boot-src.tar.gz requires some conditions to be made.

MENDER_FEATURES_ENABLE_append = " mender-uboot mender-image-sd"
MENDER_FEATURES_ENABLE_append = " mender-uboot"
MENDER_FEATURES_DISABLE_append = " mender-grub mender-image-uefi"

That leads to an error in this patch:

ERROR: u-boot-compulab-2017.07-r0 do_patch: Command Error: 'quilt --quiltrc /home/manuel/imx7-warrior/build-fb-imx7/tmp/work/cl_som_imx7-poky-linux-gnueabi/u-boot-compulab/2017.07-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
Applying patch 0003-Integration-of-Mender-boot-code-into-U-Boot.patch
patching file include/env_default.h
Hunk #1 succeeded at 10 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 23.
1 out of 2 hunks FAILED -- rejects in file include/env_default.h
patching file scripts/Makefile.autoconf
Hunk #1 succeeded at 111 (offset 2 lines).
Patch 0003-Integration-of-Mender-boot-code-into-U-Boot.patch does not apply (enforce with -f)
ERROR: u-boot-compulab-2017.07-r0 do_patch: 
ERROR: u-boot-compulab-2017.07-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/manuel/imx7-warrior/build-fb-imx7/tmp/work/cl_som_imx7-poky-linux-gnueabi/u-boot-compulab/2017.07-r0/temp/log.do_patch.4592
ERROR: Task (/home/manuel/imx7-warrior/sources/meta-bsp-imx7/recipes-bsp/u-boot/u-boot-compulab_2017.07.bb:do_patch) failed with exit code '1'

I don’t want to spam more.
For the moment, it would be great to hear if I am moving in the right direction or not.
Regards