aboutsummaryrefslogtreecommitdiffstats
path: root/templates/machine
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-30 19:19:19 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-07-07 18:22:48 +0000
commitf3b2aec86747e1ea57089ba475f54bed4c280aaa (patch)
tree5469d90631ca12ae8217c04ec3e2608dd378ab30 /templates/machine
parent3ed6b01506b9876ef8b5d8110b4dc32d488ef41c (diff)
Use upstream meta-renesas from github and update meta-rcar-gen3-adas integration
Thanks to the work done by Renesas and members of our community, we can now directly use meta-renesas from upstream github. A shout-out to everyone involved (Kurokawa-san, Ronan, Stephane). It turned-out it is simpler to create a symlink-based slim version of meta-rcar-gen3-adas layer instead of BBMASK'ing what should not be in there. See the comments in meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES as to why. Remaining work is to include the packages outside of the layer.conf in a follow-up. Bug-AGL: SPEC-3380 Change-Id: I2be1b44049d74146546380e2eb866f0558a26822 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24796 Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Diffstat (limited to 'templates/machine')
-rw-r--r--templates/machine/ebisu/50_bblayers.conf.inc2
-rw-r--r--templates/machine/ebisu/50_setup.sh4
-rw-r--r--templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc2
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3-salvator-x/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc2
8 files changed, 9 insertions, 9 deletions
diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc
index 7b0db440a..16397c2eb 100644
--- a/templates/machine/ebisu/50_bblayers.conf.inc
+++ b/templates/machine/ebisu/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/templates/machine/ebisu/50_setup.sh b/templates/machine/ebisu/50_setup.sh
index 502c22755..b51d10a2a 100644
--- a/templates/machine/ebisu/50_setup.sh
+++ b/templates/machine/ebisu/50_setup.sh
@@ -1,7 +1,7 @@
# setup proprietary gfx drivers and multimedia packages
pushd $METADIR 2>/dev/null
-COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_proprietary_softwares.sh"
+COPY_SCRIPT="$METADIR/bsp/meta-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_proprietary_softwares.sh"
EXTRACT_DIR=$METADIR/binary-tmp
#EBISU_BIN_PATH should contain the path where the .zip archive of E3 binaries is.
#CUSTOM_RENESAS_CONFIG_SCRIPT should contain the custom script needed for setup. If not filled, do not failed, just warn.
@@ -24,7 +24,7 @@ if [ -f $COPY_SCRIPT ]; then
unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR
done
- cd $METADIR/bsp/meta-renesas-rcar-gen3/
+ cd $METADIR/bsp/meta-rcar-gen3/
$COPY_SCRIPT $EXTRACT_DIR
cd ..
diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 5f410f0ff..61d472ab1 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 5f410f0ff..61d472ab1 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc b/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc
index 7b0db440a..16397c2eb 100644
--- a/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
index 7b0db440a..16397c2eb 100644
--- a/templates/machine/m3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 5f410f0ff..61d472ab1 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 5f410f0ff..61d472ab1 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"