From 381cf20edb7eb7ed833fd46cdcd10d27931ed53d Mon Sep 17 00:00:00 2001
From: Peter Bergin <peter@berginkonsult.se>
Date: Sun, 4 Jul 2021 16:02:06 +0200
Subject: u-boot-imx: align naming of u-boot-imx-common with u-boot-fslc

Follow the naming scheme of u-boot-fslc and add the version
number to the common file.

Signed-off-by: Peter Bergin <peter@berginkonsult.se>
---
 recipes-bsp/u-boot/u-boot-imx-common.inc         | 20 --------------------
 recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc | 20 ++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-imx_2020.04.bb         |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-imx-common.inc
 create mode 100644 recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc

diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common.inc
deleted file mode 100644
index f1edc92c..00000000
--- a/recipes-bsp/u-boot/u-boot-imx-common.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCBRANCH = "imx_v2020.04_5.4.70_2.3.0"
-SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "185bdaaaf5644319284566e5c340927d28954a1a"
-
-DEPENDS += "flex-native bison-native bc-native dtc-native"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit fsl-u-boot-localversion
-
-LOCALVERSION ?= "-imx_v2020.04_5.4.70_2.3.2"
-
-BOOT_TOOLS = "imx-boot-tools"
-
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc
new file mode 100644
index 00000000..f1edc92c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2020.04.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCBRANCH = "imx_v2020.04_5.4.70_2.3.0"
+SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "185bdaaaf5644319284566e5c340927d28954a1a"
+
+DEPENDS += "flex-native bison-native bc-native dtc-native"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-imx_v2020.04_5.4.70_2.3.2"
+
+BOOT_TOOLS = "imx-boot-tools"
+
diff --git a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
index 058229e2..40772e2b 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
@@ -3,7 +3,7 @@
 # Copyright (C) 2017-2021 NXP
 
 require recipes-bsp/u-boot/u-boot.inc
-require u-boot-imx-common.inc
+require u-boot-imx-common_${PV}.inc
 
 PROVIDES += "u-boot"
 
-- 
cgit v1.2.3-54-g00ecf