2 files changed, 27 insertions, 28 deletions

diff --git a/recipes-bsp/u-boot/u-boot-qoriq-common_2019.10.inc b/recipes-bsp/u-boot/u-boot-qoriq-common_2019.10.inc
deleted file mode 100644
index bc2eaa4d..00000000
--- a/recipes-bsp/u-boot/u-boot-qoriq-common_2019.10.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-inherit fsl-u-boot-localversion
-
-LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
-LIC_FILES_CHKSUM = " \
-    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
-    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
-"
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \
-    file://0001-patman-Drop-binary-parameter.patch \
-    file://0001-patman-Update-command.Run-to-handle-failure-better.patch \
-    file://0001-patman-Adjust-command-to-return-strings-instead-of-b.patch \
-    file://0001-pylibfdt-Convert-to-Python-3.patch \
-    file://0001-binman-Convert-a-few-tests-to-Python-3.patch \
-    file://0001-binman-Move-to-use-Python-3.patch \
-    file://0001-buildman-Convert-to-Python-3.patch \
-"
-SRCREV= "3cd9bc39934825200822855574fc91d8276e6584"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-PV_append = "+fslgit"
-LOCALVERSION = "+fsl"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb
index 8d79e17a..e0d71ebb 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb
@@ -1,9 +1,35 @@
 require recipes-bsp/u-boot/u-boot.inc
-require u-boot-qoriq-common_${PV}.inc
 
 DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
 PROVIDES += "u-boot"
 
+inherit fsl-u-boot-localversion
+
+LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \
+    file://0001-patman-Drop-binary-parameter.patch \
+    file://0001-patman-Update-command.Run-to-handle-failure-better.patch \
+    file://0001-patman-Adjust-command-to-return-strings-instead-of-b.patch \
+    file://0001-pylibfdt-Convert-to-Python-3.patch \
+    file://0001-binman-Convert-a-few-tests-to-Python-3.patch \
+    file://0001-binman-Move-to-use-Python-3.patch \
+    file://0001-buildman-Convert-to-Python-3.patch \
+"
+SRCREV= "3cd9bc39934825200822855574fc91d8276e6584"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+PV_append = "+fslgit"
+LOCALVERSION = "+fsl"
+
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native"
 DEPENDS_append_qoriq-arm64 = " dtc-native"