diff --git a/meta-arm-bsp/documentation/corstone1000/images/CorstoneA320Subsystems.png b/meta-arm-bsp/documentation/corstone1000/images/CorstoneA320Subsystems.png deleted file mode 100644 index d3022a16..00000000 Binary files a/meta-arm-bsp/documentation/corstone1000/images/CorstoneA320Subsystems.png and /dev/null differ diff --git a/meta-arm-bsp/documentation/corstone1000/software-architecture.rst b/meta-arm-bsp/documentation/corstone1000/software-architecture.rst index 25ac8f93..eb87b4cf 100644 --- a/meta-arm-bsp/documentation/corstone1000/software-architecture.rst +++ b/meta-arm-bsp/documentation/corstone1000/software-architecture.rst @@ -116,19 +116,6 @@ The Corstone-1000 architecture is designed to cover a range of `Power, Performance, and Area (PPA) `__ applications, and enable extension for use-case specific applications, for example, sensors, cloud connectivity, and edge computing. -************************************** -Corstone-1000 with Cortex-A320 Variant -************************************** - -This variant of the Corstone-1000 platform replaces the Host System's Cortex-A35 processor -with a Cortex-A320. In this configuration, the optional External System (previously a Cortex-M3) -is replaced by an Arm Ethos-U85 Neural Processing Unit (NPU). -The Ethos-U85 runs in the direct drive configuration, where the Host System is responsible for managing the NPU directly. - -.. image:: images/CorstoneA320Subsystems.png - :width: 720 - :alt: CorstoneA320Subsystems - ***************** Secure Boot Chain ***************** diff --git a/meta-arm-bsp/documentation/corstone1000/user-guide.rst b/meta-arm-bsp/documentation/corstone1000/user-guide.rst index 42bab873..6e4a43a6 100644 --- a/meta-arm-bsp/documentation/corstone1000/user-guide.rst +++ b/meta-arm-bsp/documentation/corstone1000/user-guide.rst @@ -253,8 +253,6 @@ Build .. warning:: - **The External System Processor is not available on the Corstone-1000 with Cortex-A320 FVP.** - Access to the External System Processor is disabled by default on **Corstone-1000 with Cortex-A35**. To build the Corstone-1000 image with External System Processor enabled, run: @@ -263,18 +261,6 @@ Build kas build meta-arm/kas/corstone1000-${TARGET}.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-extsys.yml - .. warning:: - - **The Ethos-U85 Neural Processing Unit (NPU) is only available on - the Corstone-1000 with Cortex-A320 FVP.** - - To build the Corstone-1000 image with the Ethos-U85 NPU enabled, run: - - .. code-block:: console - - kas build meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-a320.yml - - A clean build takes a significant amount of time given that all of the development machine utilities are also built along with the target images. Those development machine utilities include executables (Python, CMake, etc.) and the required toolchains. @@ -493,14 +479,9 @@ Corstone-1000 FVP software image. A Yocto recipe is provided to download the latest supported FVP version. The recipe is located at ``${WORKSPACE}/meta-arm/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb``. -This recipe supports selecting different Corstone‑1000 FVP models via MACHINE_FEATURES: -- ``cortexa320`` use the Cortex-A320 Host Processor with Ethos U85 enabled FVP build -- (default) use the Cortex-A35 Host Processor with Cortex-M3 External System FVP build - -The latest FVP version is ``11.23.25`` for Corstone-1000 with Cortex-A35 and ``11.30.27`` for -Corstone-1000 with Cortex-A320, and each model is automatically downloaded and installed when using -the ``runfvp`` command as detailed below. +The latest FVP version is ``11.23.25`` and is automatically +downloaded and installed when using the ``runfvp`` command as detailed below. .. note:: @@ -2168,42 +2149,21 @@ Symmetric Multiprocessing .. warning:: - Symmetric multiprocessing (SMP) mode is supported on Corstone-1000 - with Cortex-A35 FVP and Corstone-1000 with Cortex-A320 FVP, but is disabled by default. + Symmetric multiprocessing (SMP) mode is supported on FVP but is disabled by default. +#. Build the software stack with SMP mode enabled: -#. Build the software stack with SMP mode enabled. - - For Corstone-1000 with Cortex-A35 FVP: - - .. code-block:: console + .. code-block:: console kas build meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-multicore.yml - For Corstone-1000 with Cortex-A320 FVP: - - .. code-block:: console - - kas build meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-a320.yml:\ - meta-arm/kas/corstone1000-multicore.yml - #. Run the Corstone-1000 FVP. - For Corstone-1000 with Cortex-A35 FVP: - .. code-block:: console kas shell meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-multicore.yml \ -c "../meta-arm/scripts/runfvp" - For Corstone-1000 with Cortex-A320 FVP: - - .. code-block:: console - - kas shell meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-a320.yml:\ - meta-arm/kas/corstone1000-multicore.yml \ - -c "../meta-arm/scripts/runfvp" - #. Verify that the FVP is running the Host Processor with more than one CPU core: .. code-block:: console @@ -2211,78 +2171,6 @@ Symmetric Multiprocessing nproc 4 # number of processing units -Ethos-U85 NPU -------------- - -.. warning:: - - The Ethos-U85 NPU is only supported on Corstone-1000 with Cortex-A320 FVP. - - -#. Clone the `iot-platform-assets` repository to your ``${WORKSPACE}``. - - .. code-block:: console - - cd ${WORKSPACE} - git clone https://git.gitlab.arm.com/arm-reference-solutions/iot-platform-assets.git \ - -b CORSTONE1000-2025.12 - -#. Copy the additional kas configuration file to: - - .. code-block:: console - - cp ${WORKSPACE}/iot-platform-assets/corstone1000/ethos-u85_test/ethos-u85-test.yml \ - ${WORKSPACE}/meta-arm/kas/ - -#. Copy the mesa package Git patch file to your copy of meta-arm. - - .. code-block:: console - - cp -f ${WORKSPACE}/iot-platform-assets/corstone1000/ethos-u85_test/0001-arm-bsp-mesa-Package-Teflon-test-runner-and-models.patch \ - ${WORKSPACE}/meta-arm/ - -#. Apply the Git patch to meta-arm. - - .. code-block:: console - - cd ${WORKSPACE}/meta-arm/ - git apply 0001-arm-bsp-mesa-Package-Teflon-test-runner-and-models.patch - cd ${WORKSPACE} - -#. Re-Build the Corstone-1000 with Cortex-A320 FVP software stack as follows: - - .. code-block:: console - - kas build meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-a320.yml:\ - meta-arm/kas/ethos-u85-test.yml - -#. Run the Corstone-1000 with Cortex-320 FVP: - - .. code-block:: console - - kas shell meta-arm/kas/corstone1000-fvp.yml:meta-arm/ci/debug.yml:meta-arm/kas/corstone1000-a320.yml:\ - meta-arm/kas/ethos-u85-test.yml \ - -c "../meta-arm/scripts/runfvp" - -#. To verify you are running the Corstone-1000 with Cortex-A320, build and run the FVP and inspect the CPU model - reported in ``/proc/cpuinfo`` as shown below. Inside the FVP shell, confirm the core type: - - - .. code-block:: console - - grep -E 'CPU part|model name' /proc/cpuinfo - # Expect: CPU part : 0xd8f (which corresponds to Cortex-A320) - -#. Run the `test_teflon` test application inside the FVP shell as follows: - - .. code-block:: console - - export TEFLON_TEST_DELEGATE=/usr/lib/libteflon.so - export TEFLON_TEST_DATA=/usr/share/teflon/tests - test_teflon --gtest_filter='Models.*' - - The test completes in approximately one minute. - Secure Debug ------------