Temporary workarounds for h3ulcb and bbe

To allow the dunfell upgrade to be done early, these changes are necessary:
- h3ulcb : disable kingfisher support layer
- bbe : temporarily replace sancloud bbe machine template with plain beaglebone

Both boards need updated BSPs for dunfell.

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: Id481b693022a2276c4d5f835e4a23d436681a2cd

8 files changed, 11 insertions, 4 deletions

diff --git a/templates/machine/bbe b/templates/machine/bbe
new file mode 120000
index 000000000..985856b9d
--- /dev/null
+++ b/templates/machine/bbe
@@ -0,0 +1 @@
+beaglebone
\ No newline at end of file
diff --git a/templates/machine/bbe/50_bblayers.conf.inc b/templates/machine/bbe-sancloud/50_bblayers.conf.inc
index b2fffb9dd..b2fffb9dd 100644
--- a/templates/machine/bbe/50_bblayers.conf.inc
+++ b/templates/machine/bbe-sancloud/50_bblayers.conf.inc
diff --git a/templates/machine/bbe/50_local.conf.inc b/templates/machine/bbe-sancloud/50_local.conf.inc
index 7f378e5cb..7f378e5cb 100644
--- a/templates/machine/bbe/50_local.conf.inc
+++ b/templates/machine/bbe-sancloud/50_local.conf.inc
diff --git a/templates/machine/bbe/README_machine_bbe.md b/templates/machine/bbe-sancloud/README_machine_bbe.md
index c32f23d4f..c32f23d4f 100644
--- a/templates/machine/bbe/README_machine_bbe.md
+++ b/templates/machine/bbe-sancloud/README_machine_bbe.md
diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 5f410f0ff..794f66cc6 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,7 @@
 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 4403e6ea9..1f3c72521 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 5f410f0ff..794f66cc6 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,7 @@
 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 43e117372..6377a1e82 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