From: Ronan Le Martret Date: Mon, 29 Jun 2020 08:33:08 +0000 (+0200) Subject: [RCAR] Remove meta-rcar-gen3-adas from machine conf X-Git-Tag: 9.99.1~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=ce40578be202dca5eb4955834f37969b93083d8f;p=AGL%2Fmeta-agl.git [RCAR] Remove meta-rcar-gen3-adas from machine conf * Machine h3-salvator-x, m3-salvator-x, ebisu do not need meta-rcar-gen3-adas. Only board allowing kingfisher extention need meta-rcar-gen3-adas. Bug-AGL: SPEC-3463 Change-Id: Id070f9d8ca797aa304a2fb1016ecc65f67f3c44f Signed-off-by: Ronan Le Martret Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24895 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account --- diff --git a/templates/machine/ebisu/50_local.conf.inc b/templates/machine/ebisu/50_local.conf.inc index e780501a5..c62dec4ae 100644 --- a/templates/machine/ebisu/50_local.conf.inc +++ b/templates/machine/ebisu/50_local.conf.inc @@ -1,6 +1,3 @@ MACHINE = "ebisu" #see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc require conf/include/agl_ebisu.inc - -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -#require conf/include/rcar-gen3-adas.inc diff --git a/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc b/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc index 5f410f0ff..7b0db440a 100644 --- a/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc +++ b/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ " diff --git a/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc b/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc index 32a8c9273..ba837ae1f 100644 --- a/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc +++ b/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc @@ -1,7 +1,3 @@ MACHINE = "salvator-x" #see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc require conf/include/agl_h3-salvator-x-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 diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc index 5f410f0ff..7b0db440a 100644 --- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc +++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ " diff --git a/templates/machine/h3-salvator-x/50_local.conf.inc b/templates/machine/h3-salvator-x/50_local.conf.inc index 5e44b183e..05cca9743 100644 --- a/templates/machine/h3-salvator-x/50_local.conf.inc +++ b/templates/machine/h3-salvator-x/50_local.conf.inc @@ -2,6 +2,3 @@ MACHINE = "salvator-x" #see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc require conf/include/agl_h3-salvator-x.inc -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc - 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 5f410f0ff..7b0db440a 100644 --- a/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc +++ b/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ " diff --git a/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc b/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc index 1c1180536..ac30a4849 100644 --- a/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc +++ b/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc @@ -1,7 +1,3 @@ MACHINE = "salvator-x" #see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc require conf/include/agl_m3-salvator-x-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 diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc index 5f410f0ff..7b0db440a 100644 --- a/templates/machine/m3-salvator-x/50_bblayers.conf.inc +++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ " diff --git a/templates/machine/m3-salvator-x/50_local.conf.inc b/templates/machine/m3-salvator-x/50_local.conf.inc index 8ede9ae01..82766fd5e 100644 --- a/templates/machine/m3-salvator-x/50_local.conf.inc +++ b/templates/machine/m3-salvator-x/50_local.conf.inc @@ -2,6 +2,3 @@ MACHINE = "salvator-x" #see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc require conf/include/agl_m3-salvator-x.inc -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc -