summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2020-06-12 09:41:00 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-24 08:49:56 +0000
commit00d805d0c3be0e59c04f5bf682c6124bba6b051c (patch)
tree3e6d441779077cba4ce483c58ad679c60c2d9845
parent0adfa9a2ed1a9838c4170de3ef2fc6356b6dde65 (diff)
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>
-rw-r--r--templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc5
-rw-r--r--templates/machine/h3ulcb-nogfx/50_local.conf.inc2
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc5
-rw-r--r--templates/machine/h3ulcb/50_local.conf.inc2
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc5
-rw-r--r--templates/machine/m3ulcb-nogfx/50_local.conf.inc2
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc5
-rw-r--r--templates/machine/m3ulcb/50_local.conf.inc2
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 794f66c..5f410f0 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 1f3c725..4403e6e 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 794f66c..5f410f0 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 6377a1e..43e1173 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 794f66c..5f410f0 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 865b52f..3fd5d6e 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 794f66c..5f410f0 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 a516e94..e2fe41a 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