From 361160ecad6970ceda1ebda94df5755ebf2b64b5 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 21 Apr 2020 21:20:22 +0000 Subject: meta-agl-bsp: dra7xx-evm/beaglebone updates for dunfell Changes: - Rename weston bbappend for weston 8.0.0 in dunfell. - meta-ti now requires the meta-arm layer as the upstream source of the optee recipe, so add it to bblayers.conf in the machine templates. This is dependent on a manifest update to add meta-arm. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray Change-Id: Ib6b40d3aa1d2b04239b6e5343eb818f3f49af8ef --- templates/machine/bbe/50_bblayers.conf.inc | 1 + templates/machine/beaglebone/50_bblayers.conf.inc | 5 ++++- templates/machine/dra7xx-evm/50_bblayers.conf.inc | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/machine/bbe/50_bblayers.conf.inc b/templates/machine/bbe/50_bblayers.conf.inc index 0b42c9bff..b2fffb9dd 100644 --- a/templates/machine/bbe/50_bblayers.conf.inc +++ b/templates/machine/bbe/50_bblayers.conf.inc @@ -1,4 +1,5 @@ BBLAYERS =+ " \ + ${METADIR}/bsp/meta-arm/meta-arm \ ${METADIR}/bsp/meta-ti \ ${METADIR}/bsp/meta-sancloud \ ${METADIR}/bsp/meta-rtlwifi \ diff --git a/templates/machine/beaglebone/50_bblayers.conf.inc b/templates/machine/beaglebone/50_bblayers.conf.inc index f116ca28b..6b9323262 100644 --- a/templates/machine/beaglebone/50_bblayers.conf.inc +++ b/templates/machine/beaglebone/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-ti" +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + " diff --git a/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/templates/machine/dra7xx-evm/50_bblayers.conf.inc index f116ca28b..6b9323262 100644 --- a/templates/machine/dra7xx-evm/50_bblayers.conf.inc +++ b/templates/machine/dra7xx-evm/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-ti" +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + " -- cgit 1.2.3-korg From c24cdffea9dfa3904fc3ea9da0bc80e5515b078d Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sun, 26 Apr 2020 16:59:33 +0200 Subject: Temporary workarounds for h3ulcb and bbe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: Id481b693022a2276c4d5f835e4a23d436681a2cd --- templates/machine/bbe | 1 + templates/machine/bbe-sancloud/50_bblayers.conf.inc | 6 ++++++ templates/machine/bbe-sancloud/50_local.conf.inc | 2 ++ templates/machine/bbe-sancloud/README_machine_bbe.md | 9 +++++++++ templates/machine/bbe/50_bblayers.conf.inc | 6 ------ templates/machine/bbe/50_local.conf.inc | 2 -- templates/machine/bbe/README_machine_bbe.md | 9 --------- templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc | 5 ++++- templates/machine/h3ulcb-nogfx/50_local.conf.inc | 2 +- templates/machine/h3ulcb/50_bblayers.conf.inc | 5 ++++- templates/machine/h3ulcb/50_local.conf.inc | 2 +- 11 files changed, 28 insertions(+), 21 deletions(-) create mode 120000 templates/machine/bbe create mode 100644 templates/machine/bbe-sancloud/50_bblayers.conf.inc create mode 100644 templates/machine/bbe-sancloud/50_local.conf.inc create mode 100644 templates/machine/bbe-sancloud/README_machine_bbe.md delete mode 100644 templates/machine/bbe/50_bblayers.conf.inc delete mode 100644 templates/machine/bbe/50_local.conf.inc delete mode 100644 templates/machine/bbe/README_machine_bbe.md (limited to 'templates') 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-sancloud/50_bblayers.conf.inc b/templates/machine/bbe-sancloud/50_bblayers.conf.inc new file mode 100644 index 000000000..b2fffb9dd --- /dev/null +++ b/templates/machine/bbe-sancloud/50_bblayers.conf.inc @@ -0,0 +1,6 @@ +BBLAYERS =+ " \ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + ${METADIR}/bsp/meta-sancloud \ + ${METADIR}/bsp/meta-rtlwifi \ + " diff --git a/templates/machine/bbe-sancloud/50_local.conf.inc b/templates/machine/bbe-sancloud/50_local.conf.inc new file mode 100644 index 000000000..7f378e5cb --- /dev/null +++ b/templates/machine/bbe-sancloud/50_local.conf.inc @@ -0,0 +1,2 @@ +MACHINE = "bbe" +require conf/include/agl_bbe.inc diff --git a/templates/machine/bbe-sancloud/README_machine_bbe.md b/templates/machine/bbe-sancloud/README_machine_bbe.md new file mode 100644 index 000000000..c32f23d4f --- /dev/null +++ b/templates/machine/bbe-sancloud/README_machine_bbe.md @@ -0,0 +1,9 @@ +--- +description: Machine bbe +authors: Paul Barker +--- + +### Machine bbe + +*Description is missing - please complete file meta-agl/templates/machine/bbe/README_machine_bbe.md* + diff --git a/templates/machine/bbe/50_bblayers.conf.inc b/templates/machine/bbe/50_bblayers.conf.inc deleted file mode 100644 index b2fffb9dd..000000000 --- a/templates/machine/bbe/50_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/bsp/meta-arm/meta-arm \ - ${METADIR}/bsp/meta-ti \ - ${METADIR}/bsp/meta-sancloud \ - ${METADIR}/bsp/meta-rtlwifi \ - " diff --git a/templates/machine/bbe/50_local.conf.inc b/templates/machine/bbe/50_local.conf.inc deleted file mode 100644 index 7f378e5cb..000000000 --- a/templates/machine/bbe/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "bbe" -require conf/include/agl_bbe.inc diff --git a/templates/machine/bbe/README_machine_bbe.md b/templates/machine/bbe/README_machine_bbe.md deleted file mode 100644 index c32f23d4f..000000000 --- a/templates/machine/bbe/README_machine_bbe.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine bbe -authors: Paul Barker ---- - -### Machine bbe - -*Description is missing - please complete file meta-agl/templates/machine/bbe/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 -- cgit 1.2.3-korg