diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
index ed185aa..79528d3 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 
 require recipes-bsp/u-boot/u-boot.inc
 
-DEPENDS += "bc-native dtc-native flex-native bison-native"
+DEPENDS += "bc-native dtc-native bison-native"
 
 PV = "2020.07+git${SRCPV}"
 SRC_URI = " \
@@ -14,11 +14,9 @@ SRC_URI = " \
     file://fw_env.config \
 "
 SRCBRANCH = "toradex_2020.07"
-SRCREV = "7c9c42e93b9fda8c0bc27d5b8c81c4c289921c4b"
+SRCREV = "ab862daf5d5a2eebf305c5c125f0463b0ff34161"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "(mx6|mx7|vf|use-mainline-bsp)"
+UBOOT_INITIAL_ENV = "u-boot-initial-env"
 
 PROVIDES += "u-boot"
 
@@ -28,10 +26,18 @@ do_configure[cleandirs] = "${B}"
 
 inherit fsl-u-boot-localversion
 
-# U-Boot is flashed 1k into a NAND block, create a binary which prepends
-# U-boot with 1k of zeros to ease flashing
 nand_padding () {
-    dd bs=1024 count=1 if=/dev/zero | cat - u-boot.imx > u-boot-nand.imx
+    # pad the end of U-Boot with 0x00 up to the the end of the CSF area
+    #PAD_END=$(echo -n "0x"; od -X  -j 0x24 -N 4 u-boot.imx | sed -e '/................/!d' -e 's/........\(.*\)/\1/')
+    #PAD_END=$(( $PAD_END - 0x400 ))
+    #objcopy -I binary -O binary --pad-to $PAD_END u-boot.imx u-boot.imx.zero-padded
+    # assume that the above never need more than 10k of padding and skip the
+    # shell magic to get a correct size.
+    dd bs=10k count=1 if=/dev/zero | cat u-boot.imx - > u-boot.imx.zero-padded
+
+    # U-Boot is flashed 1k into a NAND block, create a binary which prepends
+    # U-boot with 1k of zeros to ease flashing
+    dd bs=1024 count=1 if=/dev/zero | cat - u-boot.imx.zero-padded > u-boot-nand.imx
 }
 
 do_compile:append:colibri-imx6ull () {
@@ -45,3 +51,7 @@ do_compile:append:colibri-imx7 () {
 do_compile:append:colibri-vf () {
     nand_padding
 }
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "(mx6|mx7|vf|use-mainline-bsp)"