From 6df28b9cd9157d4697b6ec2050d628c45dcc7cde Mon Sep 17 00:00:00 2001 From: Michael Safwat Date: Mon, 30 Mar 2026 11:43:15 +0100 Subject: [PATCH] arm-bsp/corstone1000-a320: Drop meta-ethos dependency Corstone1000 with Cortex A320 now uses the in-tree ethosu driver, so the external meta-ethos layer (and its meta-sca dependency) is no longer needed. Remove meta-ethos and meta-sca from the Corstone-1000 A320 kas config, drop the layer dependency on meta-ethos, and stop installing arm-npu-ethosu. Update the Corstone-1000 change log to reflect the removed layers. Signed-off-by: Michael Safwat Signed-off-by: Jon Mason --- kas/corstone1000-a320.yml | 8 -------- meta-arm-bsp/conf/layer.conf | 1 - meta-arm-bsp/conf/machine/include/corstone1000-a320.inc | 2 -- meta-arm-bsp/documentation/corstone1000/change-log.rst | 4 ---- 4 files changed, 15 deletions(-) diff --git a/kas/corstone1000-a320.yml b/kas/corstone1000-a320.yml index 8a7739af..b11af510 100644 --- a/kas/corstone1000-a320.yml +++ b/kas/corstone1000-a320.yml @@ -7,11 +7,3 @@ local_conf_header: a320: | MACHINE_FEATURES += "cortexa320" OVERRIDES .= ":cortexa320" - -repos: - meta-ethos: - url: https://gitlab.arm.com/iot/meta-ethos.git - branch: whinlatter - meta-sca: - url: https://github.com/priv-kweihmann/meta-sca.git - branch: master diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf index 0e54e3f4..eb795f23 100644 --- a/meta-arm-bsp/conf/layer.conf +++ b/meta-arm-bsp/conf/layer.conf @@ -14,7 +14,6 @@ LAYERSERIES_COMPAT_meta-arm-bsp = "wrynose" LAYERDEPENDS_meta-arm-bsp = "core meta-arm" # This won't be used by layerindex-fetch, but works everywhere else LAYERDEPENDS_meta-arm-bsp:append:corstone1000 = " meta-python openembedded-layer efi-secure-boot" -LAYERDEPENDS_meta-arm-bsp:append:corstone1000:cortexa320 = " meta-ethos" LAYERDEPENDS_meta-arm-bsp:append:musca-b1 = " meta-python" LAYERDEPENDS_meta-arm-bsp:append:musca-s1 = " meta-python" diff --git a/meta-arm-bsp/conf/machine/include/corstone1000-a320.inc b/meta-arm-bsp/conf/machine/include/corstone1000-a320.inc index c7ff2df7..69813000 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000-a320.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000-a320.inc @@ -1,5 +1,3 @@ ETHOSU_NUM_MACS ?= "256" FVP_CONFIG[host.ethosu.num_macs] = "${ETHOSU_NUM_MACS}" - -IMAGE_INSTALL:append = " arm-npu-ethosu" diff --git a/meta-arm-bsp/documentation/corstone1000/change-log.rst b/meta-arm-bsp/documentation/corstone1000/change-log.rst index e42c5a41..7bab9e21 100644 --- a/meta-arm-bsp/documentation/corstone1000/change-log.rst +++ b/meta-arm-bsp/documentation/corstone1000/change-log.rst @@ -66,10 +66,6 @@ Yocto distribution components versions +-------------------------------------------+----------------+ | meta-secure-core | 63209fb150 | +-------------------------------------------+----------------+ -| meta-ethos | aa2504a32f | -+-------------------------------------------+----------------+ -| meta-sca | e68f1a9d17 | -+-------------------------------------------+----------------+ | busybox | 1.37.0 | +-------------------------------------------+----------------+ | musl | 1.2.5 |