Revert "Fix m3ulcb/m3ulcb-nogfx h3ulcb/h3ulcb-nogfx builds"

This reverts commit 207b42d00d129aeb7768dadb0965a5ef6cd86ca0.
This reverts commit c24cdffea9dfa3904fc3ea9da0bc80e5515b078d.

Bug-AGL: SPEC-3380

Change-Id: I2e29c1bc862d29d61a4529ee722b758fca6a42e0
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24759
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

8 files changed, 8 insertions, 20 deletions

diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 794f66cc6..5f410f0ff 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,7 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
-
-# disable kingfisher until fixed
-#  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
-#  "
diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
index 1f3c72521..4403e6ea9 100644
--- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
@@ -4,4 +4,4 @@ require conf/include/agl_h3ulcb-nogfx.inc
 
 # custom inclusion of cogent layer
 #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-#require conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 794f66cc6..5f410f0ff 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,7 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
-
-# disable kingfisher until fixed
-#  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
-#  "
diff --git a/templates/machine/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/50_local.conf.inc
index 6377a1e82..43e117372 100644
--- a/templates/machine/h3ulcb/50_local.conf.inc
+++ b/templates/machine/h3ulcb/50_local.conf.inc
@@ -3,5 +3,5 @@ MACHINE = "h3ulcb"
 require conf/include/agl_h3ulcb.inc
 
 #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-#require conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
 
diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 794f66cc6..5f410f0ff 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,7 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
-
-# disable kingfisher until fixed
-#  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
-#  "
diff --git a/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/templates/machine/m3ulcb-nogfx/50_local.conf.inc
index 865b52f36..3fd5d6eec 100644
--- a/templates/machine/m3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_local.conf.inc
@@ -3,4 +3,4 @@ MACHINE = "m3ulcb"
 require conf/include/agl_m3ulcb-nogfx.inc
 
 #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-#require conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 794f66cc6..5f410f0ff 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,7 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
-
-# disable kingfisher until fixed
-#  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
-#  "
diff --git a/templates/machine/m3ulcb/50_local.conf.inc b/templates/machine/m3ulcb/50_local.conf.inc
index a516e943f..e2fe41a8a 100644
--- a/templates/machine/m3ulcb/50_local.conf.inc
+++ b/templates/machine/m3ulcb/50_local.conf.inc
@@ -3,4 +3,4 @@ MACHINE = "m3ulcb"
 require conf/include/agl_m3ulcb.inc
 
 #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-#require conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc