diff --git a/recipes-bsp/u-boot/u-boot-toradex-common.inc b/recipes-bsp/u-boot/u-boot-toradex-common.inc
deleted file mode 100644
index 656636d..0000000
--- a/recipes-bsp/u-boot/u-boot-toradex-common.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2015 Toradex AG
-# Based on u-boot-fslc.inc Copyright (C) 2012-2020 O.S. Systems Software LTDA
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "U-Boot bootloader with support for Toradex Computer on Modules"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
-
-DEPENDS += "flex-native bison-native"
-
-SRC_URI = "git://git.toradex.com/u-boot-toradex.git;branch=${SRCBRANCH}"
-
-SRCREV = "7c9c42e93b9fda8c0bc27d5b8c81c4c289921c4b"
-SRCBRANCH = "toradex_2020.07"
-
-S = "${WORKDIR}/git"
-
-PV = "2020.07+git${SRCPV}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "(mx6|mx7|vf|use-mainline-bsp)"
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 af11c3e..ed185aa 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
@@ -1,13 +1,29 @@
+SUMMARY = "U-Boot bootloader with support for Toradex Computer on Modules"
+HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
+SECTION = "bootloaders"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
 require recipes-bsp/u-boot/u-boot.inc
-require recipes-bsp/u-boot/u-boot-toradex-common.inc
 
-DEPENDS += "bc-native dtc-native"
+DEPENDS += "bc-native dtc-native flex-native bison-native"
 
-SRC_URI += "file://fw_env.config"
+PV = "2020.07+git${SRCPV}"
+SRC_URI = " \
+    git://git.toradex.com/u-boot-toradex.git;branch=${SRCBRANCH} \
+    file://fw_env.config \
+"
+SRCBRANCH = "toradex_2020.07"
+SRCREV = "7c9c42e93b9fda8c0bc27d5b8c81c4c289921c4b"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "(mx6|mx7|vf|use-mainline-bsp)"
 
 PROVIDES += "u-boot"
 
 B = "${WORKDIR}/build"
+S = "${WORKDIR}/git"
 do_configure[cleandirs] = "${B}"
 
 inherit fsl-u-boot-localversion