1 files changed, 4 insertions, 5 deletions
diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass
index c5001491..565b3712 100644
--- a/meta-xilinx-standalone/classes/esw.bbclass
+++ b/meta-xilinx-standalone/classes/esw.bbclass
@@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://${S}/${LICFILENAME};md5=39ab6ab638f4d1836ba994ec6852d
 # We should move to an actual SRCREV eventually
 include conf/xilinx/esw-srcrev.inc
-EMBEDDEDSW_SRCREV ?= "${AUTOREV}"
+SRCREV ?= "${AUTOREV}"
-SRCREV = "${EMBEDDEDSW_SRCREV}"
 PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
-EMBEDDEDSW_REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
+REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
-EMBEDDEDSW_BRANCH ?= "master"
+BRANCH ?= "master"
-SRC_URI = "${EMBEDDEDSW_REPO};branch=${EMBEDDEDSW_BRANCH}"
+SRC_URI = "${REPO};branch=${BRANCH}"
 SRCREV_FORMAT = "src_decouple"

diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass index c5001491..565b3712 100644 --- a/meta-xilinx-standalone/classes/esw.bbclass +++ b/meta-xilinx-standalone/classes/esw.bbclass
@@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://${S}/${LICFILENAME};md5=39ab6ab638f4d1836ba994ec6852d
7	# We should move to an actual SRCREV eventually	7	# We should move to an actual SRCREV eventually
8	include conf/xilinx/esw-srcrev.inc	8	include conf/xilinx/esw-srcrev.inc
9		9
10	EMBEDDEDSW_SRCREV ?= "${AUTOREV}"	10	SRCREV ?= "${AUTOREV}"
11	SRCREV = "${EMBEDDEDSW_SRCREV}"
12	PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"	11	PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
13	EMBEDDEDSW_REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"	12	REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
14	EMBEDDEDSW_BRANCH ?= "master"	13	BRANCH ?= "master"
15	SRC_URI = "${EMBEDDEDSW_REPO};branch=${EMBEDDEDSW_BRANCH}"	14	SRC_URI = "${REPO};branch=${BRANCH}"
16		15
17	SRCREV_FORMAT = "src_decouple"	16	SRCREV_FORMAT = "src_decouple"
18		17