dtb-embeddedsw.inc: Unify the approach to overriding

Add an 'experimental' configuration, and default to this when using
any of the experimental esw based recipes.

The class must be inherited first, and THEN the override processed.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

3 files changed, 15 insertions, 5 deletions

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index 42a5980f..a7bc7e2d 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -1,8 +1,8 @@
-# We should move to an actual SRCREV eventually
-include conf/xilinx/esw-srcrev.inc
-
 inherit xlnx-embeddedsw pkgconfig cmake
 
+# Override xlnx-embeddedsw with out version
+require conf/dtb-embeddedsw.inc
+
 SRCREV_FORMAT = "src_decouple"
 
 S = "${WORKDIR}/git"
diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
new file mode 100644
index 00000000..673455d0
--- /dev/null
+++ b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
@@ -0,0 +1,9 @@
+# The format of this file must be compatible with
+# meta-xilinx/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+
+# Make it clear decoupling is 'experimental' in the version
+ESW_VER = "experimental"
+
+REPO = "git://gitenterprise.xilinx.com/decoupling/embeddedsw.git;protocol=https"
+
+ESW_BRANCH[experimental] = "master"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb
index 0b1aa111..629b6f73 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb
@@ -1,8 +1,9 @@
-include conf/xilinx/esw-srcrev.inc
-
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw nativesdk
 
+# We need to override the inherit
+require conf/dtb-embeddedsw.inc
+
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"