From d11f5df392fbdc2ef5ebb4cc0da04e56bf1b50d9 Mon Sep 17 00:00:00 2001
From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Date: Thu, 6 Aug 2020 12:12:24 +0800
Subject: u-boot: move common variables into u-boot-socfpga-common.inc

This should provide more flexibility in controlling the u-boot
build for SoCFPGA products. We would like to adopt the similar
approach as the linux-altera.inc to gain control on some variables
when building u-boot recipe. The versioned recipes will then be much
simpler to maintain.

Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
---
 recipes-bsp/u-boot/u-boot-socfpga-common.inc  | 15 ++++++++++++++-
 recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb |  6 ++----
 recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb |  6 ++----
 recipes-bsp/u-boot/u-boot-socfpga_v2020.04.bb |  6 ++----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-socfpga-common.inc b/recipes-bsp/u-boot/u-boot-socfpga-common.inc
index def29fa..80b4752 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga-common.inc
+++ b/recipes-bsp/u-boot/u-boot-socfpga-common.inc
@@ -1,17 +1,30 @@
 HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
 SECTION = "bootloaders"
-DEPENDS += "flex-native bison-native"
+DEPENDS += "flex-native bison-native dtc-native bc-native u-boot-mkimage-native"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"
 
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+
+UBOOT_REPO ?= "git://github.com/altera-opensource/u-boot-socfpga.git"
+UBOOT_PROT ?= "https"
+
+UBOOT_VERSION_PREFIX ?= "socfpga_"
+UBOOT_VERSION ?= "v2019.10"
+UBOOT_BRANCH ?= "${UBOOT_VERSION_PREFIX}${UBOOT_VERSION}"
+
+SRCREV ?= "${AUTOREV}"
 PV_append = "+git${SRCPV}"
 
 S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
 
 RPROVIDES_${PN} += "u-boot"
 
+SRC_URI = "${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH}"
+
 UBOOT_CONFIG[agilex-socdk] = "socfpga_agilex_defconfig"
 UBOOT_CONFIG[agilex-socdk-qspi] = "socfpga_agilex_qspi_defconfig"
 UBOOT_CONFIG[stratix10-socdk] = "socfpga_stratix10_defconfig"
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb
index 790eca1..01f3fa4 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb
@@ -1,7 +1,5 @@
 require u-boot-socfpga-common.inc
-require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
-SRC_URI = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2019.04"
-SRCREV = "6296fdb7da9e205bc34416f38631715fb6d74e71"
+UBOOT_VERSION = "v2019.04"
 
-DEPENDS += "dtc-native bc-native u-boot-mkimage-native"
+SRCREV = "6296fdb7da9e205bc34416f38631715fb6d74e71"
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb
index a42659a..7b8af58 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2019.10.bb
@@ -1,7 +1,5 @@
 require u-boot-socfpga-common.inc
-require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
-SRC_URI = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2019.10"
-SRCREV = "34638cc921269665e43340a50552302bd358f793"
+UBOOT_VERSION = "v2019.10"
 
-DEPENDS += "dtc-native bc-native u-boot-mkimage-native"
+SRCREV = "34638cc921269665e43340a50552302bd358f793"
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2020.04.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2020.04.bb
index 5e3d99b..fac30e4 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_v2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2020.04.bb
@@ -1,7 +1,5 @@
 require u-boot-socfpga-common.inc
-require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
-SRC_URI = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2020.04"
-SRCREV = "2cbc36afbb31bee6e245291c51c283dbde0e3b89"
+UBOOT_VERSION = "v2020.04"
 
-DEPENDS += "dtc-native bc-native u-boot-mkimage-native"
+SRCREV = "2cbc36afbb31bee6e245291c51c283dbde0e3b89"
-- 
cgit v1.2.3-54-g00ecf