ARM-software
diff --git a/‎SystemReady-band/README.md‎
Lines changed: 9 additions & 11 deletions b/‎SystemReady-band/README.md‎
Lines changed: 9 additions & 11 deletions
diff --git a/‎SystemReady-band/build-scripts/build-all.sh‎
Lines changed: 2 additions & 1 deletion b/‎SystemReady-band/build-scripts/build-all.sh‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎SystemReady-band/build-scripts/build-buildroot.sh‎
Lines changed: 6 additions & 0 deletions b/‎SystemReady-band/build-scripts/build-buildroot.sh‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎SystemReady-band/build-scripts/build-linux.sh‎
Lines changed: 1 addition & 1 deletion b/‎SystemReady-band/build-scripts/build-linux.sh‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎SystemReady-band/build-scripts/build-parser-app.sh‎
Lines changed: 101 additions & 0 deletions b/‎SystemReady-band/build-scripts/build-parser-app.sh‎
Lines changed: 101 additions & 0 deletions
diff --git a/‎SystemReady-band/build-scripts/build-uefi.sh‎
Lines changed: 2 additions & 1 deletion b/‎SystemReady-band/build-scripts/build-uefi.sh‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎SystemReady-band/build-scripts/get_source.sh‎
Lines changed: 38 additions & 21 deletions b/‎SystemReady-band/build-scripts/get_source.sh‎
Lines changed: 38 additions & 21 deletions
diff --git a/‎SystemReady-band/build-scripts/make_image.sh‎
Lines changed: 7 additions & 3 deletions b/‎SystemReady-band/build-scripts/make_image.sh‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎SystemReady-band/parser/Parser.efi‎
-48 KB b/‎SystemReady-band/parser/Parser.efi‎
-48 KB
@@ -8,7 +8,7 @@
 - [Steps to Manually Build Image](#steps-to-manually-build-image)
 - [Image Directory Structure](#image-directory-structure)
 - [Details and Functionalities of the Image](#details-and-functionalities-of-the-image)
-  - [Grub Menu & Complaince Run](#grub-menu--complaince-run)
+  - [Grub Menu & Compliance Run](#grub-menu--compliance-run)
   - [ACS configs file](#acs-configs-file)
   - [Log Parser scripts](#log-parser-scripts)
     - [Standard Formatted Result](#standard-formatted-result)
@@ -143,8 +143,8 @@ This image comprise of single FAT file system partition recognized by UEFI: <br
   - app directory contains CapsuleApp.efi
   - bbr directory contains SCT related bianries and sequence files
   - bbsr-keys contains cryptographic keys for secure boot and testing secure firmware updates
-  - bsa directory contains bsa uefi executable for bsa complaince
-  - bsa/sbsa directory contains sbsa uefi executable for bsa complaince
+  - bsa directory contains bsa uefi executable for bsa compliance
+  - bsa/sbsa directory contains sbsa uefi executable for bsa compliance
   - config directory contains system, acs related config files
   - debug directory contains script to gather debug information
   - parser directory contains uefi parser executable to parse acs_config file
@@ -164,22 +164,20 @@ This image comprise of single FAT file system partition recognized by UEFI: <br
 
 ## Details and Functionalities of the Image
 
-### Grub Menu & Complaince Run
+### Grub Menu & Compliance Run
 ```
  │ Linux Boot                                    │
  │*SystemReady band ACS (Automation)             │
- │ SCT for BBSR (optional)                       │
- │ Linux Boot for BBSR (optional)                │
+ │ BBSR Compliance (Automation)                  │
  │ Linux Boot with SetVirtualAddressMap enabled  |
 ```
  - **Linux Boot** : This option will boot the ACS Linux kernel and run the default Linux tool (linux debug dump, fwts, linux bsa, linux sbsa (if selected))
    - noacs command line parameter: Edit the Linux Boot grub menu option and add **noacs** at the end of Linux Boot grub menu option, to boot into ACS Linux kernel without running the default Linux test suites.
    - initcall_blacklist=psci_checker command line parameter: Edit the Linux Boot grub menu option and add **initcall_blacklist=psci_checker** to skip default linux psci_checker tool.
- - **SystemReady band ACS (Automation)** : This is **default** option and will run the automated complaince
-   - UEFI complaince run - SCT, BSA UEFI, SBSA UEFI (if selected)
-   - Boots to Linux and run Linux complaince run - FWTS, BSA Linux, SBSA Linux (if selected)
- - **SCT for BBSR (optional)** : This option will run the SCT tests required for BBSR complaince. For the verification steps of BBSR ACS, refer to the [BBSR ACS Verification](../common/docs/BBSR_ACS_Verification.md).
- - **Linux Boot for BBSR (optional)** : This option will run the SCT tests required for BBSR complaince. For the verification steps of BBSR ACS, refer to the [BBSR ACS Verification](../common/docs/BBSR_ACS_Verification.md).
+ - **SystemReady band ACS (Automation)** : This is **default** option and will run the automated compliance
+   - UEFI compliance run - SCT, BSA UEFI, SBSA UEFI (if selected)
+   - Boots to Linux and run Linux compliance run - FWTS, BSA Linux, SBSA Linux (if selected)
+ - **BBSR Compliance (Automation)** : This option will run the SCT and FWTS tests required for BBSR compliance, perform a Linux secure boot, and, if a TPM is present, evaluate the measured boot log. For the verification steps of BBSR ACS, refer to the [BBSR ACS Verification](../common/docs/BBSR_ACS_Verification.md).
  - **Linux Boot with SetVirtualAddressMap enabled** : This option is for debug purpose, to boot ACS Linux with SetVAMap on.
 
 ### ACS configs file
 
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # @file
-# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2021-2025, Arm Limited or its affiliates. All rights reserved.
 # SPDX-License-Identifier : Apache-2.0
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +28,7 @@ PACKAGE=$2
 
 source ./build-scripts/build-efitools.sh
 source ./build-scripts/build-bbsr-keys.sh
+source ./build-scripts/build-parser-app.sh
 source ./build-scripts/build-uefi.sh $@
 source ./build-scripts/build-bsaefi.sh $@
 source ./build-scripts/build-sbsaefi.sh $@
 
@@ -69,6 +69,12 @@ do_build ()
     chmod +x root_fs_overlay/usr/bin/secure_init.sh
     cp  $TOP_DIR/ramdisk/device_driver.sh root_fs_overlay/usr/bin/
     chmod +x root_fs_overlay/usr/bin/device_driver.sh
+    cp  $TOP_DIR/ramdisk/bsa.sh root_fs_overlay/bin/
+    chmod +x root_fs_overlay/bin/bsa.sh
+    cp  $TOP_DIR/ramdisk/sbsa.sh root_fs_overlay/bin/
+    chmod +x root_fs_overlay/bin/sbsa.sh
+    cp  $TOP_DIR/ramdisk/fwts.sh root_fs_overlay/bin/
+    chmod +x root_fs_overlay/bin/fwts.sh
     cp  $TOP_DIR/bbr-acs/bbsr/config/bbsr_fwts_tests.ini root_fs_overlay/bin/
     cp  $TOP_DIR/ramdisk/verify_tpm_measurements.py root_fs_overlay/bin/
 
 
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2021-2025, Arm Limited or its affiliates. All rights reserved.
 # SPDX-License-Identifier : Apache-2.0
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# @file
+# Copyright (c) 2021-2025, Arm Limited or its affiliates. All rights reserved.
+# SPDX-License-Identifier : Apache-2.0
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+TOP_DIR=`pwd`
+. $TOP_DIR/../common/config/systemready-band-source.cfg
+
+# === Configuration ===
+EDK2_TAG="$EDK2_SRC_VERSION"
+GCC_VERSION="13.2.rel1"
+APP_NAME="parser"
+GCC_PREFIX="aarch64-none-linux-gnu-"
+TOP_DIR=$(pwd)
+TOOLCHAIN_PATH="$TOP_DIR/tools/arm-gnu-toolchain-${GCC_VERSION}-x86_64-aarch64-none-linux-gnu/bin"
+GCC_BIN="$TOOLCHAIN_PATH/$GCC_PREFIX"
+EDK2_DIR="$TOP_DIR/edk2"
+LIBC_DIR="$EDK2_DIR/edk2-libc"
+APP_PATH="$EDK2_DIR/ShellPkg/Application/$APP_NAME"
+KEYS_DIR=$TOP_DIR/bbsr-keys
+CONFIG_PARSER_EFI=${TOP_DIR}/parser/Parser.efi
+
+do_build()
+{
+
+mkdir -p $TOP_DIR/$APP_NAME
+# === Prepare edk2 environment ===
+pushd "$EDK2_DIR"
+
+echo "Cleaning previous builds..."
+git reset --hard
+#git reset --hard
+rm -rf Build/*
+
+echo "Applying patches..."
+git apply "$TOP_DIR/../common/patches/0001-parser-app.patch"
+
+echo "Setting up parser_app source..."
+rm -rf "$APP_PATH"
+cp -r "$TOP_DIR/../common/parser" "$APP_PATH"
+
+echo "Setting environment variables..."
+export GCC49_AARCH64_PREFIX="$GCC_BIN"
+export PACKAGES_PATH="$EDK2_DIR:$LIBC_DIR"
+
+echo "packages path : $PACKAGES_PATH"
+# === Build ===
+echo "Configuring EDK2 build environment..."
+source ./edksetup.sh --reconfig
+make -C BaseTools/Source/C
+
+echo "Building Parser.efi..."
+build -a AARCH64 -t GCC49 -p ShellPkg/ShellPkg.dsc -m ShellPkg/Application/$APP_NAME/Parser.inf
+
+cp "$EDK2_DIR/Build/Shell/DEBUG_GCC49/AARCH64/Parser.efi" "$TOP_DIR/$APP_NAME/Parser.efi"
+git reset --hard
+
+popd
+echo "✅ Build complete: $TOP_DIR/$APP_NAME/Parser.efi"
+
+}
+
+do_package ()
+{
+    echo "Packaging uefi... $VARIANT";
+
+    echo "Signing Parser Application... "
+    pushd $TOP_DIR
+    # sign Parser.efi with db key
+    sbsign --key $KEYS_DIR/TestDB1.key --cert $KEYS_DIR/TestDB1.crt $CONFIG_PARSER_EFI --output $TOP_DIR/output/Parser.efi
+    
+    popd
+
+}
+
+do_clean()
+{
+    pushd $TOP_DIR/$UEFI_PATH
+    CROSS_COMPILE_DIR=$(dirname $CROSS_COMPILE)
+    PATH="$PATH:$CROSS_COMPILE_DIR"
+    source ./edksetup.sh
+    make -C BaseTools/Source/C clean
+    rm -rf Build/Shell/DEBUG_GCC49
+    popd
+}
+
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+source $DIR/framework.sh $@
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # @file
-# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2021-2025, Arm Limited or its affiliates. All rights reserved.
 # SPDX-License-Identifier : Apache-2.0
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -100,6 +100,7 @@ do_package ()
     pushd $TOP_DIR
     # sign Shell.efi with db key
     sbsign --key $KEYS_DIR/TestDB1.key --cert $KEYS_DIR/TestDB1.crt $TOP_DIR/$UEFI_SHELL_PATH/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi --output $TOP_DIR/$UEFI_SHELL_PATH/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi
+
     popd
 
 }
 
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # @file
-# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2021-2025, Arm Limited or its affiliates. All rights reserved.
 # SPDX-License-Identifier : Apache-2.0
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,17 +31,21 @@ get_linux_src()
 {
     echo "Downloading Linux source code. Version : $LINUX_KERNEL_VERSION"
     git clone --depth 1 --branch v$LINUX_KERNEL_VERSION https://github.com/torvalds/linux.git linux-${LINUX_KERNEL_VERSION}
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to download Linux source code"
+        exit 1
+    fi
 }
 
 get_uefi_src()
 {
     echo "Downloading EDK2 source code. TAG : $EDK2_SRC_VERSION"
-    git clone --depth 1 --single-branch \
-    --branch $EDK2_SRC_VERSION https://github.com/tianocore/edk2.git
+    git clone --depth 1 --single-branch --branch $EDK2_SRC_VERSION https://github.com/tianocore/edk2.git
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to download edk2 source code"
+        exit 1
+    fi
     pushd $TOP_DIR/edk2
-    git apply $TOP_DIR/../common/patches/edk2_subhook_patch
-    git add .gitmodules
-    git rm --cached UnitTestFrameworkPkg/Library/SubhookLib/subhook
     git submodule update --init
     popd
 }
@@ -50,6 +54,11 @@ get_bsa_src()
 {
     pushd $TOP_DIR/edk2
     git clone https://github.com/tianocore/edk2-libc
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to download edk2 libc source code"
+        exit 1
+    fi
+
     if [ -z $ARM_BSA_TAG ]; then
         #No TAG is provided. Download the latest code
         echo "Downloading Arm BSA source code."
@@ -94,6 +103,10 @@ get_cross_compiler()
         mkdir -p tools
         pushd $TOP_DIR/tools
         wget $CROSS_COMPILER_URL --no-check-certificate
+	if [ $? -ne 0 ]; then
+            echo "Error: Failed to dowload toolchain"
+            exit 1
+        fi
         tar -xf arm-gnu-toolchain-${GCC_TOOLS_VERSION}-x86_64-${TAG}.tar.xz
 	mv arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-linux-gnu arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-linux-gnu
         rm arm-gnu-toolchain-${GCC_TOOLS_VERSION}-x86_64-${TAG}.tar.xz
@@ -105,25 +118,23 @@ get_grub_src()
 {
     echo "Downloading grub source code,Version: ${GRUB_SRC_TAG}"
     git clone -b $GRUB_SRC_TAG https://github.com/rhboot/grub2.git grub
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to download Grub source code"
+        exit 1
+    fi
     pushd $TOP_DIR/grub
     git submodule update --init
     popd
 }
 
-get_fwts_src()
-{
-    echo "Downloading FWTS source code. TAG : ${FWTS_SRC_TAG}"
-    git clone --single-branch git://kernel.ubuntu.com/hwe/fwts.git
-    pushd $TOP_DIR/fwts
-    git checkout $FWTS_SRC_TAG
-    git submodule update --init
-    popd
-}
-
 get_sct_src()
 {
     echo "Downloading SCT (edk2-test) source code. TAG : ${SCT_SRC_TAG}"
     git clone --single-branch https://github.com/tianocore/edk2-test
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to download sct source code"
+        exit 1
+    fi
     pushd $TOP_DIR/edk2-test
     git checkout $SCT_SRC_TAG
     popd
@@ -157,7 +168,9 @@ get_linux-acs_src()
 get_bbr_acs_src()
 {
     echo "Downloading Arm BBR source code."
-    git clone https://github.com/ARM-software/bbr-acs.git bbr-acs
+    #git clone https://github.com/ARM-software/bbr-acs.git bbr-acs
+    ##TODO revert back to main branch
+    git clone --branch SR_execution_enviroment https://github.com/ARM-software/bbr-acs.git bbr-acs
     if [ -n "$ARM_BBR_TAG" ]; then
         # TAG provided.
         echo "Checking out Arm BBR TAG: $ARM_BBR_TAG"
@@ -168,13 +181,17 @@ get_bbr_acs_src()
 get_buildroot_src()
 {
     echo "Downloading Buildroot source code. TAG : $BUILDROOT_SRC_VERSION"
-    git clone -b $BUILDROOT_SRC_VERSION https://git.busybox.net/buildroot/
+    #git clone -b $BUILDROOT_SRC_VERSION https://git.busybox.net/buildroot/
+    #TODO  git clone was failing with busybox url, try gitlab
+    git clone -b $BUILDROOT_SRC_VERSION https://gitlab.com/buildroot.org/buildroot.git
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to download buildroot source code"
+        exit 1
+    fi
     pushd $TOP_DIR/buildroot/package/fwts
         echo "Applying Buildroot FWTS patch..."
         # patch buildroot config
-        git apply $TOP_DIR/../common/patches/build_fwts_version_24.09.00.patch
-        # copy patches for fwts source
-        cp $TOP_DIR/../common/patches/0008-acpi-iort-memory-access-flag-update.patch .
+        git apply $TOP_DIR/../common/patches/build_fwts_version_25.01.00.patch
     popd
 }
 
 
@@ -28,6 +28,7 @@ PLATDIR=${TOP_DIR}/output
 OUTDIR=${PLATDIR}
 GRUB_BUILDROOT_CONFIG_FILE=${TOP_DIR}/build-scripts/config/grub-buildroot.cfg
 EFI_CONFIG_FILE=${TOP_DIR}/uefi_scripts/startup.nsh
+EE_EFI_CONFIG_FILE=${TOP_DIR}/uefi_scripts/startup_ee.nsh
 BBSR_STARTUP_FILE=${TOP_DIR}/uefi_scripts/bbsr_startup.nsh
 BSA_CONFIG_FILE=${TOP_DIR}/uefi_scripts/bsa.nsh
 SBSA_CONFIG_FILE=${TOP_DIR}/uefi_scripts/sbsa.nsh
@@ -36,7 +37,8 @@ DEBUG_CONFIG_FILE=${TOP_DIR}/uefi_scripts/debug_dump.nsh
 ACS_CONFIG_FILE=${TOP_DIR}/build-scripts/config/acs_config.txt
 SYSTEM_CONFIG_FILE=${TOP_DIR}/build-scripts/config/system_config.txt
 ACS_RUN_CONFIG_FILE=${TOP_DIR}/build-scripts/config/acs_run_config.ini
-CONFIG_PARSER_EFI=${TOP_DIR}/parser/Parser.efi
+CONFIG_PARSER_FILE=${TOP_DIR}/uefi_scripts/parser.nsh
+CONFIG_PARSER_PYTHON_FILE=${TOP_DIR}/../common/parser/Parser.py
 BLOCK_SIZE=512
 SEC_PER_MB=$((1024*2))
 GRUB_PATH=grub
@@ -51,6 +53,7 @@ create_cfgfiles ()
     mcopy -i  $fatpart_name -o ${GRUB_BUILDROOT_CONFIG_FILE} ::/EFI/BOOT/grub.cfg
     mcopy -i  $fatpart_name -o ${BBSR_STARTUP_FILE}   ::/EFI/BOOT/
     mcopy -i  $fatpart_name -o ${EFI_CONFIG_FILE}     ::/EFI/BOOT/
+    mcopy -i  $fatpart_name -o ${EE_EFI_CONFIG_FILE}  ::/EFI/BOOT/
     mcopy -i  $fatpart_name -o ${BSA_CONFIG_FILE}     ::/acs_tests/bsa/
     mcopy -i  $fatpart_name -o ${SBSA_CONFIG_FILE}    ::/acs_tests/bsa/sbsa
     mcopy -i  $fatpart_name -o ${DEBUG_CONFIG_FILE}   ::/acs_tests/debug/
@@ -96,7 +99,9 @@ create_fatpart ()
     mcopy -i $fatpart_name ${TOP_DIR}/bbsr-keys/*.auth ::/acs_tests/bbsr-keys
 
     mcopy -i $fatpart_name ${UEFI_APPS_PATH}/CapsuleApp.efi ::/acs_tests/app
-    mcopy -i $fatpart_name $CONFIG_PARSER_EFI  ::/acs_tests/parser
+    mcopy -i $fatpart_name $OUTDIR/Parser.efi  ::/acs_tests/parser
+    mcopy -i $fatpart_name $CONFIG_PARSER_FILE  ::/acs_tests/parser
+    mcopy -i $fatpart_name $CONFIG_PARSER_PYTHON_FILE  ::/acs_tests/parser
 
     echo "FAT partition image created"
 }
@@ -176,4 +181,3 @@ exit_fun() {
 
 #prepare the disk image
 prepare_disk_image
-