diff --git a/README.md b/README.md index 1161581..d2fda69 100755 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ To run SCT manually, follow these steps: 1. `Shell>FS(X):` -- `FS(X):>cd EFI\BOOT\bbr\SCT` +- `FS(X):>cd acs_tests\bbr\SCT` - To run EBBR or SBBR tests - `FS(X):EFI\BOOT\bbr\SCT>SCT -s ` + `FS(X):acs_tests\bbr\SCT>SCT -s ` - To run all tests - `FS(X):EFI\BOOT\bbr\SCT>SCT -a -v` + `FS(X):acs_tests\bbr\SCT>SCT -a -v` You can also select and run tests individually. For more information on running the tests, see the [SCT User Guide](http://www.uefi.org/testtools). @@ -60,7 +60,7 @@ To run the tests, follow these steps. 2. Run manual tests. - - `FS(X):EFI\BOOT\bbr\SCT>SCT -s ` + - `FS(X):acs_tests\bbr\SCT>SCT -s ` 3. While the system runs the reset tests, you may have to manually reset the system if it hangs. diff --git a/bbsr/config/BBSRStartup.nsh b/bbsr/config/BBSRStartup.nsh new file mode 100644 index 0000000..9103607 --- /dev/null +++ b/bbsr/config/BBSRStartup.nsh @@ -0,0 +1,98 @@ +#!/usr/bin/env bash + +# Copyright (c) 2021-2024, 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. +## + +echo -off + +for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F + if exist FS%i:\acs_tests\bbr\SCT then + # + # Found EFI SCT harness + # + FS%i: + cd FS%i:\acs_tests\bbr\SCT + echo "Press any key to stop the BBSR SCT running" + stallforkey.efi 5 + if %lasterror% == 0 then + goto Done + endif + for %j in 0 1 2 3 4 5 6 7 8 9 A B C D E F then + if exists FS%j:\acs_results\ then + if exists FS%j:\acs_results\BBSR\sct_results then + + #Check if SCT run has already completed + if exist FS%j:\acs_results\BBSR\sct_results\Overall\Summary.log then + echo "BBSR SCT has completed run." + echo "Press any key to start BBSR SCT execution from the beginning." + echo "WARNING: Ensure you have backed up the existing logs." + stallforkey.efi 5 + if %lasterror% == 0 then + #Backup the existing logs + rm -q FS%j:\acs_results\BBSR\sct_results_previous_run + mkdir FS%j:\acs_results\BBSR\sct_results_previous_run + cp -r FS%j:\acs_results\BBSR\sct_results FS%j:\acs_results\sct_results_previous_run + rm -q FS%j:\acs_results\BBSR\sct_results + goto StartSCT + else + goto Done + endif + endif + + if exist FS%i:\acs_tests\bbr\SCT\.passive.mode then + if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then + Sct -c -p mnp -v + else + Sct -c -p mnp + endif + else + if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then + Sct -c -v + else + Sct -c + endif + + #SCT execution has finished. Copy the logs to acs_results + if exist FS%j:\acs_results\sct_results\ then + if exist FS%i:\acs_tests\bbr\SCT\Overall then + cp -r FS%i:\acs_tests\bbr\SCT\Overall FS%j:\acs_results\BBSR\sct_results\ + endif + if exist FS%i:\acs_tests\bbr\SCT\Sequence then + cp -r FS%i:\acs_tests\bbr\SCT\Sequence\BBSR.seq FS%j:\acs_results\BBSR\sct_results\ + endif + #Restart to avoid an impact of running SCT tests on rest of the suites + echo "Reset the system ..." + reset + endif + endif + else +:StartSCT + FS%j: + cd FS%j:\acs_results + mkdir BBSR + cd FS%j:\acs_results\BBSR + mkdir sct_results + FS%i: + cd FS%i:\acs_tests\bbr\SCT + Sct -s BBSR.seq + goto Done + endif + endif + endfor + endif +endfor + +:Done diff --git a/bbsr/config/sie_SctStartup.nsh b/bbsr/config/sie_SctStartup.nsh deleted file mode 100644 index 92f5121..0000000 --- a/bbsr/config/sie_SctStartup.nsh +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -echo -off - -for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F - if exist FS%i:\EFI\BOOT\bbr\SCT then - # - # Found EFI SCT harness - # - FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT - echo Press any key to stop the SIE SCT running - stallforkey.efi 5 - if %lasterror% == 0 then - goto Done - endif - for %j in 0 1 2 3 4 5 6 7 8 9 A B C D E F then - if exists FS%j:\acs_results\ then - if exists FS%j:\acs_results\SIE\sct_results then - - #Check if SCT run has already completed - if exist FS%j:\acs_results\SIE\sct_results\Overall\Summary.log then - echo SIE SCT has completed run. Press any key to start SIE SCT execution from the beginning. WARNING: Ensure you have backed up the existing logs. - stallforkey.efi 5 - if %lasterror% == 0 then - #Backup the existing logs - rm -q FS%j:\acs_results\SIE\sct_results_previous_run - mkdir FS%j:\acs_results\SIE\sct_results_previous_run - cp -r FS%j:\acs_results\SIE\sct_results FS%j:\acs_results\sct_results_previous_run - rm -q FS%j:\acs_results\SIE\sct_results - goto StartSCT - else - goto Done - endif - endif - - if exist FS%i:\EFI\BOOT\bbr\SCT\.passive.mode then - if exist FS%i:\EFI\BOOT\bbr\SCT\.verbose.mode then - Sct -c -p mnp -v - else - Sct -c -p mnp - endif - else - if exist FS%i:\EFI\BOOT\bbr\SCT\.verbose.mode then - Sct -c -v - else - Sct -c - endif - - #SCT execution has finished. Copy the logs to acs_results - if exist FS%j:\acs_results\sct_results\ then - if exist FS%i:\EFI\BOOT\bbr\SCT\Overall then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Overall FS%j:\acs_results\SIE\sct_results\ - endif - if exist FS%i:\EFI\BOOT\bbr\SCT\Sequence then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Sequence\BBSR.seq FS%j:\acs_results\SIE\sct_results\ - endif - #Restart to avoid an impact of running SCT tests on rest of the suites - echo Reset the system ... - reset - endif - endif - else -:StartSCT - FS%j: - cd FS%j:\acs_results - mkdir SIE - cd FS%j:\acs_results\SIE - mkdir sct_results - FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT - Sct -s BBSR.seq - goto Done - endif - endif - endfor - endif -endfor - -:Done diff --git a/bbsr/patches/0001-SIE-Patch-for-UEFI-SCT-Build.patch b/bbsr/patches/0001-BBSR-Patch-for-UEFI-SCT-Build.patch similarity index 100% rename from bbsr/patches/0001-SIE-Patch-for-UEFI-SCT-Build.patch rename to bbsr/patches/0001-BBSR-Patch-for-UEFI-SCT-Build.patch diff --git a/common/config/ScrtStartup.nsh b/common/config/ScrtStartup.nsh index 35503e7..9b2ac52 100644 --- a/common/config/ScrtStartup.nsh +++ b/common/config/ScrtStartup.nsh @@ -1,40 +1,31 @@ -# Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +#!/usr/bin/env bash + +# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved. +# SPDX-License-Identifier : Apache-2.0 # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# 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 # -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# 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. +## + echo -off for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F - if exist FS%i:\EFI\BOOT\bbr\SCT\SCRT then + if exist FS%i:\acs_tests\bbr\SCT\SCRT then # # Found EFI SCRT harness # FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT\SCRT + cd FS%i:\acs_tests\bbr\SCT\SCRT #Check if SCRT run is already in progress if exist SCRT_run_progress.flag then @@ -47,10 +38,10 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F #Save the logs in acs_results for %j in 0 1 2 3 4 5 6 7 8 9 A B C D E F then if exists FS%j:\acs_results\ then - mkdir FS%j:\acs_results\sct_results - mkdir FS%j:\acs_results\sct_results\SCRT - cp SCRT.log FS%j:\acs_results\sct_results\SCRT\SCRT.log - cp SCRT.conf FS%j:\acs_results\sct_results\SCRT\SCRT.conf + mkdir FS%j:\acs_results\scrt_results + mkdir FS%j:\acs_results\scrt_results + cp SCRT.log FS%j:\acs_results\scrt_results\SCRT.log + cp SCRT.conf FS%j:\acs_results\scrt_results\SCRT.conf endif endfor @@ -58,7 +49,7 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F endif echo SCRT run. Press any key to stop the EFI SCRT running - FS%i:\EFI\BOOT\bbr\SCT\stallforkey.efi 5 + FS%i:\acs_tests\bbr\SCT\stallforkey.efi 5 if %lasterror% == 0 then goto Done endif @@ -66,8 +57,10 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F echo "Note: The System will automatically reset as part of SCRT testing" if exist SCRT.log then - echo SCRT is already run. Press any key to run SCRT again. WARNING: Ensure you have backed up the existing logs. - FS%i:\EFI\BOOT\bbr\SCT\stallforkey.efi 5 + echo "SCRT is already run." + echo "Press any key to run SCRT again." + echo "WARNING: Ensure you have backed up the existing logs." + FS%i:\acs_tests\bbr\SCT\stallforkey.efi 5 if %lasterror% == 0 then #Backup the existing logs cp SCRT.log SCRT.log_previous_run diff --git a/common/config/bbr_common_config.cfg b/common/config/bbr_source.cfg similarity index 98% rename from common/config/bbr_common_config.cfg rename to common/config/bbr_source.cfg index 0f7bef4..797e668 100644 --- a/common/config/bbr_common_config.cfg +++ b/common/config/bbr_source.cfg @@ -41,4 +41,4 @@ SCT_SRC_TAG=abb54c667fe6ae2a41144c010871569ef519c459 FWTS_SRC_TAG=V23.01.00 # EDK2 source tag from https://github.com/tianocore/edk2.git -EDK2_SRC_VERSION=edk2-stable202208 \ No newline at end of file +EDK2_SRC_VERSION=edk2-stable202208 diff --git a/common/fwts_build_dep-arm/include/bsd/string.h b/common/fwts_build_dep-arm/include/bsd/string.h deleted file mode 100644 index 3ce28a1..0000000 --- a/common/fwts_build_dep-arm/include/bsd/string.h +++ /dev/null @@ -1,107 +0,0 @@ -#ifndef LIBBSD_STRING_H -#define LIBBSD_STRING_H - -#include -#include -/* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */ - -/* - * Copyright (c) 1998, 2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * Copy string src to buffer dst of size dsize. At most dsize-1 - * chars will be copied. Always NUL terminates (unless dsize == 0). - * Returns strnlen(src); if retval >= dsize, truncation occurred. - */ -static inline size_t -strlcpy(char *dst, const char *src, size_t dsize) -{ - const char *osrc = src; - size_t nleft = dsize; - - /* Copy as many bytes as will fit. */ - if (nleft != 0) { - while (--nleft != 0) { - if ((*dst++ = *src++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src. */ - if (nleft == 0) { - if (dsize != 0) - *dst = '\0'; /* NUL-terminate dst */ - while (*src++) - ; - } - - return(src - osrc - 1); /* count does not include NUL */ -} - -/* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */ - -/* - * Copyright (c) 1998, 2015 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * Appends src to string dst of size dsize (unlike strncat, dsize is the - * full size of dst, not space left). At most dsize-1 characters - * will be copied. Always NUL terminates (unless dsize <= strnlen(dst)). - * Returns strnlen(src) + MIN(dsize, strnlen(initial dst)). - * If retval >= dsize, truncation occurred. - */ -static inline size_t -strlcat(char *dst, const char *src, size_t dsize) -{ - const char *odst = dst; - const char *osrc = src; - size_t n = dsize; - size_t dlen; - - /* Find the end of dst and adjust bytes left but don't go past end. */ - while (n-- != 0 && *dst != '\0') - dst++; - dlen = dst - odst; - n = dsize - dlen; - - if (n-- == 0) - return(dlen + strnlen(src,dsize-1)); - while (*src != '\0') { - if (n != 0) { - *dst++ = *src; - n--; - } - src++; - } - *dst = '\0'; - - return(dlen + (src - osrc)); /* count does not include NUL */ -} - -#endif diff --git a/common/patches/0001-Build-only-what-we-use-to-test-EBBR-on-32b-arm.patch b/common/patches/0001-Build-only-what-we-use-to-test-EBBR-on-32b-arm.patch deleted file mode 100644 index cf6e0b9..0000000 --- a/common/patches/0001-Build-only-what-we-use-to-test-EBBR-on-32b-arm.patch +++ /dev/null @@ -1,1587 +0,0 @@ -From 1541f83e0215d574b1c2e3b872febb4b20280d63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= -Date: Mon, 3 Oct 2022 15:35:30 +0200 -Subject: [PATCH] Build only what we use to test EBBR on 32b arm -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Simplify the build and reduce the dependencies to build for 32b arm, to -test for EBBR. -We remove all ACPI related and all the other features necessitating -external dependencies. We do still depend on BSD strlcpy() and strlcat(), -though. -Also, we enable UEFI support for arm 32b where necessary and we fix the EFI -status width to be in sync with the architecture instead of hardcoding to -64b. - -Signed-off-by: Vincent Stehlé ---- - configure.ac | 2 - - src/Makefile.am | 177 +---------------------- - src/lib/include/fwts.h | 6 + - src/lib/include/fwts_efi_runtime.h | 22 +-- - src/lib/include/fwts_uefi.h | 6 +- - src/lib/src/Makefile.am | 35 +---- - src/lib/src/fwts_fileio.c | 38 ----- - src/lib/src/fwts_framework.c | 1 - - src/lib/src/fwts_uefi.c | 10 +- - src/uefi/securebootcert/securebootcert.c | 2 +- - src/uefi/uefirtauthvar/uefirtauthvar.c | 34 ++--- - src/uefi/uefirtmisc/uefirtmisc.c | 16 +- - src/uefi/uefirttime/uefirttime.c | 58 ++++---- - src/uefi/uefirtvariable/uefirtvariable.c | 90 ++++++------ - src/uefi/uefivarinfo/uefivarinfo.c | 14 +- - 15 files changed, 143 insertions(+), 368 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f40c3678..8e0d5b49 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,8 +98,6 @@ - AC_CONFIG_FILES([ - Makefile - src/Makefile -- src/libfwtsiasl/Makefile -- src/libfwtsacpica/Makefile - src/lib/Makefile - src/lib/src/Makefile - src/utilities/Makefile -diff --git a/src/Makefile.am b/src/Makefile.am -index 9a26af86..71549d34 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,18 +1,10 @@ --# Must build in this order: --# 1. acpica/source/compiler --# 2. lib --# 3. acpica --# ... because the libs in this bundled acpica/ depend on lib/ (libfwts.so), --# but libfwts.so depends on libraries produced by acpica/source/compiler. --SUBDIRS = libfwtsiasl lib libfwtsacpica -+SUBDIRS = lib - - AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib/include \ -- -I$(top_srcdir)/src/acpica/source/include \ -- -I$(top_srcdir)/src/acpica/source/compiler \ - -I$(top_srcdir)/efi_runtime \ - -I$(top_srcdir)/smccc_test \ -- -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ -+ -pthread \ - -Wall -Werror -Wextra \ - -Wno-address-of-packed-member \ - -Wfloat-equal -Wmissing-declarations \ -@@ -23,173 +15,22 @@ AM_CPPFLAGS = \ - - bin_PROGRAMS = fwts - --fwts_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT -+fwts_CPPFLAGS = $(AM_CPPFLAGS) - - if HAVE_LIBFDT - dt_tests = \ - devicetree/dt_base/dt_base.c \ - devicetree/dt_sysinfo/dt_sysinfo.c --mem_tests = \ -- opal/mem_info.c \ -- opal/reserv_mem.c --cpu_tests = \ -- opal/cpu_info.c --power_mgmt_tests = \ -- opal/power_mgmt_info.c --endif -- --if HAVE_LIBFDT --if HAVE_LIBPCI --pci_tests = \ -- opal/pci_info.c --endif - endif - - # - # fwts main + tests - # - fwts_SOURCES = main.c \ -- acpi/ac_adapter/ac_adapter.c \ -- acpi/acpidump/acpidump.c \ -- acpi/acpiinfo/acpiinfo.c \ -- acpi/acpitables/acpitables.c \ -- sbbr/acpitables/acpitables.c \ -- acpi/apicinstance/apicinstance.c \ -- acpi/asf/asf.c \ -- acpi/aspt/aspt.c \ -- acpi/battery/battery.c \ -- acpi/bert/bert.c \ -- acpi/bgrt/bgrt.c \ -- acpi/boot/boot.c \ -- acpi/brightness/brightness-helper.c \ -- acpi/brightness/brightness.c \ -- acpi/brightness/autobrightness.c \ -- acpi/checksum/checksum.c \ -- acpi/cpep/cpep.c \ -- acpi/crsdump/crsdump.c \ -- acpi/crsdump/prsdump.c \ -- acpi/csrt/csrt.c \ -- acpi/cstates/cstates.c \ -- acpi/dbgp/dbgp.c \ -- acpi/dbg2/dbg2.c \ -- acpi/devices/ac_adapter/ac.c \ -- acpi/devices/battery/battery.c \ -- acpi/devices/battery/smart_battery.c \ -- acpi/devices/ec/ec.c \ -- acpi/devices/buttons/power_button.c \ -- acpi/devices/buttons/sleep_button.c \ -- acpi/devices/lid/lid.c \ -- acpi/devices/nvdimm/nvdimm.c \ -- acpi/devices/sensor/als.c \ -- acpi/devices/time/time.c \ -- acpi/devices/wpc/wpc.c \ -- acpi/dmar/dmar.c \ -- acpi/dppt/dppt.c \ -- acpi/drtm/drtm.c \ -- acpi/dsddump/dsddump.c \ -- acpi/ecdt/ecdt.c \ -- acpi/einj/einj.c \ -- acpi/erst/erst.c \ -- acpi/facs/facs.c \ -- acpi/fadt/fadt.c \ -- sbbr/fadt/fadt.c \ -- acpi/fan/fan.c \ -- acpi/fpdt/fpdt.c \ -- acpi/gpedump/gpedump.c \ -- acpi/gtdt/gtdt.c \ -- acpi/hest/hest.c \ -- acpi/hpet/hpet.c \ -- acpi/hmat/hmat.c \ -- acpi/iort/iort.c \ -- acpi/lid/lid.c \ -- acpi/lpit/lpit.c \ -- acpi/madt/madt.c \ -- acpi/mcfg/mcfg.c \ -- acpi/mchi/mchi.c \ -- acpi/mpst/mpst.c \ -- acpi/msct/msct.c \ -- acpi/msdm/msdm.c \ -- acpi/method/method.c \ -- acpi/nfit/nfit.c \ -- acpi/osilinux/osilinux.c \ -- acpi/pcc/pcc.c \ -- acpi/pcct/pcct.c \ -- acpi/pdtt/pdtt.c \ -- acpi/powerbutton/powerbutton.c \ -- acpi/plddump/plddump.c \ -- acpi/phat/phat.c \ -- acpi/pmtt/pmtt.c \ -- acpi/pptt/pptt.c \ -- acpi/rasf/rasf.c \ -- acpi/rsdp/rsdp.c \ -- sbbr/rsdp/rsdp.c \ -- acpi/rsdt/rsdt.c \ -- acpi/s3/s3.c \ -- acpi/s3power/s3power.c \ -- acpi/s4/s4.c \ -- acpi/sbst/sbst.c \ -- acpi/sdei/sdei.c \ -- acpi/sdev/sdev.c \ -- acpi/slic/slic.c \ -- acpi/slit/slit.c \ -- acpi/spcr/spcr.c \ -- acpi/spmi/spmi.c \ -- acpi/srat/srat.c \ -- acpi/stao/stao.c \ -- acpi/syntaxcheck/syntaxcheck.c \ -- acpi/tcpa/tcpa.c \ -- acpi/tpm2/tpm2.c \ -- acpi/uefi/uefi.c \ -- acpi/uniqueid/uniqueid.c \ -- acpi/waet/waet.c \ -- acpi/wakealarm/wakealarm.c \ -- acpi/wdat/wdat.c \ -- acpi/wmi/wmi.c \ -- acpi/wpbt/wpbt.c \ -- acpi/wsmt/wsmt.c \ -- acpi/xsdt/xsdt.c \ -- acpi/xenv/xenv.c \ -- apic/apicedge/apicedge.c \ -- bios/bios_info/bios_info.c \ -- bios/bios32/bios32.c \ -- bios/ebda_region/ebda_region.c \ -- bios/ebdadump/ebdadump.c \ -- bios/hdaaudio/hdaaudio.c \ -- bios/interrupt/interrupt.c \ -- bios/memmapdump/memmapdump.c \ -- bios/mtrr/mtrr.c \ -- bios/multiproc/mpcheck.c \ -- bios/multiproc/mpdump.c \ -- bios/pciirq/pciirq.c \ -- bios/pnp/pnp.c \ -- bios/romdump/romdump.c \ -- bios/s0idle/s0idle.c \ -- bios/smm/smm.c \ -- cmos/cmosdump/cmosdump.c \ -- coreboot/clog/clog.c \ -- cpu/virt/virt.c \ -- cpu/virt/virt_svm.c \ -- cpu/virt/virt_vmx.c \ -- cpu/maxfreq/maxfreq.c \ -- cpu/cpufreq/cpufreq.c \ -- cpu/nx/nx.c \ -- cpu/msr/msr.c \ -- cpu/microcode/microcode.c \ -- dmi/dmicheck/dmicheck.c \ -- hotkey/hotkey/hotkey.c \ -- ipmi/bmc/bmc_info.c \ - kernel/klog/klog.c \ - kernel/olog/olog.c \ - kernel/oops/oops.c \ - kernel/version/version.c \ -- opal/mtd_info.c \ -- opal/prd_info.c \ -- pci/aspm/aspm.c \ -- pci/crs/crs.c \ -- pci/maxreadreq/maxreadreq.c \ -- pci/smccc/smccc.c \ -- tpm/tpmevlog/tpmevlog.c \ -- tpm/tpmevlogdump/tpmevlogdump.c \ - uefi/csm/csm.c \ - uefi/uefidump/uefidump.c \ - uefi/uefirttime/uefirttime.c \ -@@ -201,22 +42,14 @@ fwts_SOURCES = main.c \ - uefi/uefirtauthvar/uefirtauthvar.c \ - uefi/esrtdump/esrtdump.c \ - uefi/esrt/esrt.c \ -- $(pci_tests) \ -- $(mem_tests) \ -- $(cpu_tests) \ -- $(power_mgmt_tests) \ - $(dt_tests) - --fwts_LDFLAGS = -lm -lbsd `pkg-config --libs glib-2.0 gio-2.0` -+fwts_LDFLAGS = -lm - - fwts_LDADD = \ - -lfwts \ - -L$(top_builddir)/src \ -- -L$(top_builddir)/src/acpica \ -- -L$(top_builddir)/src/libfwtsiasl \ -- -L$(top_builddir)/src/libfwtsacpica \ -- -L$(top_builddir)/src/lib/src \ -- -lfwtsacpica -+ -L$(top_builddir)/src/lib/src - - man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1 - -diff --git a/src/lib/include/fwts.h b/src/lib/include/fwts.h -index f34d4859..33486b30 100644 ---- a/src/lib/include/fwts.h -+++ b/src/lib/include/fwts.h -@@ -127,6 +127,12 @@ - #define FWTS_USE_DEVMEM 1 - #endif - -+#if defined(__arm__) -+#define FWTS_ARCH_ARM 1 -+#define FWTS_HAS_UEFI 1 -+#define FWTS_USE_DEVMEM 1 -+#endif -+ - /* verision 3-tuple into integer */ - #define _VER_(major, minor, patchlevel) \ - ((major * 10000) + (minor * 100) + patchlevel) -diff --git a/src/lib/include/fwts_efi_runtime.h b/src/lib/include/fwts_efi_runtime.h -index 196d1735..15afd087 100644 ---- a/src/lib/include/fwts_efi_runtime.h -+++ b/src/lib/include/fwts_efi_runtime.h -@@ -19,6 +19,8 @@ - #ifndef _FWTS_EFI_RUNTIME_H_ - #define _FWTS_EFI_RUNTIME_H_ - -+typedef unsigned long efi_status_t; -+ - typedef enum { - EfiResetCold, - EfiResetWarm, -@@ -66,7 +68,7 @@ struct efi_getvariable { - uint32_t *Attributes; - uint64_t *DataSize; - void *Data; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_setvariable { -@@ -75,14 +77,14 @@ struct efi_setvariable { - uint32_t Attributes; - uint64_t DataSize; - void *Data; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_getnextvariablename { - uint64_t *VariableNameSize; - uint16_t *VariableName; - EFI_GUID *VendorGuid; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_queryvariableinfo { -@@ -90,36 +92,36 @@ struct efi_queryvariableinfo { - uint64_t *MaximumVariableStorageSize; - uint64_t *RemainingVariableStorageSize; - uint64_t *MaximumVariableSize; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_gettime { - EFI_TIME *Time; - EFI_TIME_CAPABILITIES *Capabilities; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_settime { - EFI_TIME *Time; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_getwakeuptime { - uint8_t *Enabled; - uint8_t *Pending; - EFI_TIME *Time; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_setwakeuptime { - uint8_t Enabled; - EFI_TIME *Time; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_getnexthighmonotoniccount { - uint32_t *HighCount; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - struct efi_querycapsulecapabilities { -@@ -127,7 +129,7 @@ struct efi_querycapsulecapabilities { - uint64_t CapsuleCount; - uint64_t *MaximumCapsuleSize; - EFI_RESET_TYPE *ResetType; -- uint64_t *status; -+ efi_status_t *status; - } __attribute__ ((packed)); - - /* ioctl calls that are permitted to the /dev/efi_runtime interface. */ -diff --git a/src/lib/include/fwts_uefi.h b/src/lib/include/fwts_uefi.h -index cf9df519..4e348217 100644 ---- a/src/lib/include/fwts_uefi.h -+++ b/src/lib/include/fwts_uefi.h -@@ -32,12 +32,14 @@ PRAGMA_PACK_WARN_OFF - 0xE0, 0x98, 0x03, 0x2B, 0x8C} \ - } - -+typedef unsigned long efi_status_t; -+ - typedef struct { - uint16_t *varname; - uint8_t guid[16]; - size_t datalen; - uint8_t *data; -- uint64_t status; -+ efi_status_t status; - uint32_t attributes; - } fwts_uefi_var; - -@@ -677,7 +679,7 @@ void fwts_uefi_free_variable(fwts_uefi_var *var); - void fwts_uefi_free_variable_names(fwts_list *list); - int fwts_uefi_get_variable_names(fwts_list *list); - --void fwts_uefi_print_status_info(fwts_framework *fw, const uint64_t status); -+void fwts_uefi_print_status_info(fwts_framework *fw, const efi_status_t status); - char *fwts_uefi_attribute_info(uint32_t attr); - - bool fwts_uefi_efivars_iface_exist(void); -diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index a4fd23e9..d72d87a4 100644 ---- a/src/lib/src/Makefile.am -+++ b/src/lib/src/Makefile.am -@@ -18,25 +18,19 @@ - - AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib/include \ -- -I$(top_srcdir)/src/libfwtsiasl \ -- -I$(top_srcdir)/src/acpica/source/include \ -- -I$(top_srcdir)/src/acpica/source/compiler \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ -- `pkg-config --cflags glib-2.0 gio-2.0` \ - -DDATAROOTDIR=\"$(datarootdir)\" \ -- -Wall -Werror -Wextra \ -+ -Wall -Wextra \ - -Wno-address-of-packed-member - - pkglib_LTLIBRARIES = libfwts.la - - libfwts_la_LDFLAGS = \ -- -lm -lpthread -lbsd \ -- -version-info 1:0:0 \ -- -L$(top_builddir)/src/libfwtsiasl \ -- -lfwtsiasl `pkg-config --libs glib-2.0 gio-2.0` -+ -lm -lpthread \ -+ -version-info 1:0:0 - --libfwts_la_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT -+libfwts_la_CPPFLAGS = $(AM_CPPFLAGS) - - if HAVE_LIBFDT - dt_sources = \ -@@ -47,24 +41,13 @@ endif - # Components of the fwts core helper library libfwts - # - libfwts_la_SOURCES = \ -- fwts_ac_adapter.c \ -- fwts_acpi_object_eval.c \ -- fwts_acpi_tables.c \ -- fwts_acpi.c \ -- fwts_acpid.c \ - fwts_alloc.c \ - fwts_arch.c \ - fwts_args.c \ - fwts_backtrace.c \ -- fwts_battery.c \ - fwts_binpaths.c \ -- fwts_button.c \ - fwts_checkeuid.c \ - fwts_checksum.c \ -- fwts_clog.c \ -- fwts_cmos.c \ -- fwts_coreboot.c \ -- fwts_coreboot_cbmem.c \ - fwts_cpu.c \ - fwts_dump.c \ - fwts_dump_data.c \ -@@ -77,13 +60,9 @@ libfwts_la_SOURCES = \ - fwts_get.c \ - fwts_gpe.c \ - fwts_guid.c \ -- fwts_hwinfo.c \ -- fwts_iasl.c \ - fwts_interactive.c \ - fwts_ioport.c \ -- fwts_ipmi.c \ - fwts_json.c \ -- fwts_kernel.c \ - fwts_keymap.c \ - fwts_klog.c \ - fwts_olog.c \ -@@ -99,22 +78,16 @@ libfwts_la_SOURCES = \ - fwts_modprobe.c \ - fwts_multiproc.c \ - fwts_oops.c \ -- fwts_pci.c \ - fwts_pipeio.c \ - fwts_release.c \ - fwts_scan_efi_systab.c \ - fwts_set.c \ -- fwts_smbios.c \ - fwts_stringextras.c \ - fwts_summary.c \ - fwts_text_list.c \ -- fwts_tpm.c \ - fwts_tty.c \ - fwts_uefi.c \ -- fwts_wakealarm.c \ -- fwts_pm_method.c \ - fwts_safe_mem.c \ -- fwts_pm_debug.c \ - $(dt_sources) - - -include $(top_srcdir)/git.mk -diff --git a/src/lib/src/fwts_fileio.c b/src/lib/src/fwts_fileio.c -index 83a62bc4..eac7fdec 100644 ---- a/src/lib/src/fwts_fileio.c -+++ b/src/lib/src/fwts_fileio.c -@@ -62,41 +62,3 @@ fwts_list* fwts_file_open_and_read(const char *file) - - return list; - } -- --/* -- * fwts_gzfile_read() -- * read given gz file and return contents as a list of lines -- */ --fwts_list *fwts_gzfile_read(gzFile *fp) --{ -- fwts_list *list; -- char buffer[8192]; -- -- if ((list = fwts_list_new()) == NULL) -- return NULL; -- -- while (gzgets(*fp, buffer, sizeof(buffer)) != NULL) { -- buffer[strlen(buffer) - 1] = '\0'; /* Chop off "\n" */ -- fwts_text_list_append(list, buffer); -- } -- -- return list; --} -- --/* -- * fwts_gzfile_open_and_read() -- * open and read gz file and return contents as a list of lines -- */ --fwts_list* fwts_gzfile_open_and_read(const char *file) --{ -- gzFile fp; -- fwts_list *list; -- -- if ((fp = gzopen(file, "r")) == Z_NULL) -- return NULL; -- -- list = fwts_gzfile_read(&fp); -- (void)gzclose(fp); -- -- return list; --} -diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c -index 725a7e0b..1ed17432 100644 ---- a/src/lib/src/fwts_framework.c -+++ b/src/lib/src/fwts_framework.c -@@ -31,7 +31,6 @@ - #include - - #include "fwts.h" --#include "fwts_pm_method.h" - - - #define ACS_VERSION "v1.0" -diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c -index 2dd1727e..61aa7b9d 100644 ---- a/src/lib/src/fwts_uefi.c -+++ b/src/lib/src/fwts_uefi.c -@@ -41,7 +41,7 @@ typedef struct { - uint8_t guid[16]; - uint64_t datalen; - uint8_t data[1024]; -- uint64_t status; -+ efi_status_t status; - uint32_t attributes; - } __attribute__((packed)) fwts_uefi_sys_fs_var; - -@@ -52,7 +52,7 @@ typedef struct { - } __attribute__((packed)) fwts_uefi_efivars_fs_var; - - typedef struct { -- const uint64_t statusvalue; -+ const efi_status_t statusvalue; - const char *mnemonic ; - const char *description; - } uefistatus_info; -@@ -467,12 +467,12 @@ static const uefistatus_info uefistatus_info_table[] = { - { ~0, NULL, NULL } - }; - --void fwts_uefi_print_status_info(fwts_framework *fw, const uint64_t status) -+void fwts_uefi_print_status_info(fwts_framework *fw, const efi_status_t status) - { - - const uefistatus_info *info; - -- if (status == ~0ULL) { -+ if (status == ~0UL) { - fwts_log_info(fw, "fwts test ioctl() failed, errno=%d (%s)", errno, strerror(errno)); - return; - } -@@ -483,7 +483,7 @@ void fwts_uefi_print_status_info(fwts_framework *fw, const uint64_t status) - return; - } - } -- fwts_log_info(fw, "Cannot find the return status information, value = 0x%" PRIx64 ".", status); -+ fwts_log_info(fw, "Cannot find the return status information, value = 0x%lx.", status); - - } - -diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c -index 0fcc771c..21a7935a 100644 ---- a/src/uefi/securebootcert/securebootcert.c -+++ b/src/uefi/securebootcert/securebootcert.c -@@ -518,7 +518,7 @@ static int securebootcert_setvar( - long ioret; - struct efi_setvariable setvariable; - -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint64_t datasize = 1; - - setvariable.VariableName = varname; -diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c -index 99918125..97c3a7ed 100644 ---- a/src/uefi/uefirtauthvar/uefirtauthvar.c -+++ b/src/uefi/uefirtauthvar/uefirtauthvar.c -@@ -61,7 +61,7 @@ static long setvar( - uint32_t var_attributes, - uint64_t datasize, - void *data, -- uint64_t *status) -+ efi_status_t *status) - { - long ioret; - struct efi_setvariable setvariable; -@@ -72,7 +72,7 @@ static long setvar( - setvariable.DataSize = datasize; - setvariable.Data = data; - setvariable.status = status; -- *status = ~0ULL; -+ *status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - - return ioret; -@@ -83,7 +83,7 @@ static long getvar( - uint32_t *attributestest, - uint64_t *getdatasize, - void *data, -- uint64_t *status) -+ efi_status_t *status) - { - long ioret; - struct efi_getvariable getvariable; -@@ -94,7 +94,7 @@ static long getvar( - getvariable.DataSize = getdatasize; - getvariable.Data = data; - getvariable.status = status; -- *status = ~0ULL; -+ *status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_GET_VARIABLE, &getvariable); - - return ioret; -@@ -102,7 +102,7 @@ static long getvar( - - static void uefirtvariable_env_cleanup(void) - { -- uint64_t status; -+ efi_status_t status; - uint8_t data[GETVAR_BUF_SIZE]; - uint64_t getdatasize = sizeof(data); - uint32_t attributestest; -@@ -145,7 +145,7 @@ static int uefirtauthvar_deinit(fwts_framework *fw) - return FWTS_OK; - } - --static int check_fw_support(fwts_framework *fw, uint64_t status) -+static int check_fw_support(fwts_framework *fw, efi_status_t status) - { - if ((status == EFI_INVALID_PARAMETER) && - ((bool)(attributes & FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) || -@@ -186,7 +186,7 @@ static int uefirtauthvar_test1(fwts_framework *fw) - - uint8_t data[GETVAR_BUF_SIZE]; - uint64_t getdatasize = sizeof(data); -- uint64_t status; -+ efi_status_t status; - uint32_t attributestest; - size_t i; - -@@ -248,7 +248,7 @@ static int uefirtauthvar_test1(fwts_framework *fw) - static int uefirtauthvar_test2(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - - if (!(data_exist & E_AUTHVARCREATE)) { - fwts_skipped(fw,"The test variable, AuthVarCreate, doesn't exist, skip the test."); -@@ -288,7 +288,7 @@ static int uefirtauthvar_test2(fwts_framework *fw) - static int uefirtauthvar_test3(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - - if (!(data_exist & E_AUTHVARCREATE)) { - fwts_skipped(fw,"The test variable, AuthVarCreate, doesn't exist, skip the test."); -@@ -330,7 +330,7 @@ static int uefirtauthvar_test4(fwts_framework *fw) - - uint8_t data[GETVAR_BUF_SIZE]; - uint64_t getdatasize = sizeof(data); -- uint64_t status; -+ efi_status_t status; - uint32_t attributestest; - size_t i; - uint32_t attribappend = attributes | FWTS_UEFI_VARIABLE_APPEND_WRITE; -@@ -412,7 +412,7 @@ static int uefirtauthvar_test5(fwts_framework *fw) - - uint8_t data[GETVAR_BUF_SIZE]; - uint64_t getdatasize = sizeof(data); -- uint64_t status; -+ efi_status_t status; - uint32_t attributestest; - size_t i; - -@@ -480,7 +480,7 @@ static int uefirtauthvar_test5(fwts_framework *fw) - static int uefirtauthvar_test6(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - - if (!(data_exist & E_AUTHVARUPDATE)) { - fwts_skipped(fw,"The test variable, AuthVarUpdate, doesn't exist, skip the test."); -@@ -522,7 +522,7 @@ static int uefirtauthvar_test7(fwts_framework *fw) - - uint8_t data[GETVAR_BUF_SIZE]; - uint64_t getdatasize = sizeof(data); -- uint64_t status; -+ efi_status_t status; - uint32_t attributestest; - - if (!(data_exist & E_AUTHVARCREATE)) { -@@ -576,7 +576,7 @@ static int uefirtauthvar_test7(fwts_framework *fw) - static int uefirtauthvar_test8(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - - ioret = setvar(>estguid, attributes, sizeof(AuthVarModData), AuthVarModData, &status); - -@@ -611,7 +611,7 @@ static int uefirtauthvar_test8(fwts_framework *fw) - static int uefirtauthvar_test9(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - - ioret = setvar(>estguid, attributes, sizeof(AuthVarModTime), AuthVarModTime, &status); - -@@ -646,7 +646,7 @@ static int uefirtauthvar_test9(fwts_framework *fw) - static int uefirtauthvar_test10(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - EFI_GUID gtestguiddiff = TEST_GUID1; - - ioret = setvar(>estguiddiff, attributes, sizeof(AuthVarCreate), AuthVarCreate, &status); -@@ -685,7 +685,7 @@ static int uefirtauthvar_test11(fwts_framework *fw) - - uint8_t data[GETVAR_BUF_SIZE]; - uint64_t getdatasize = sizeof(data); -- uint64_t status; -+ efi_status_t status; - uint32_t attributestest; - size_t i; - -diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c -index 28939fb0..ab54929f 100644 ---- a/src/uefi/uefirtmisc/uefirtmisc.c -+++ b/src/uefi/uefirtmisc/uefirtmisc.c -@@ -70,7 +70,7 @@ static int uefirtmisc_deinit(fwts_framework *fw) - - static int getnexthighmonotoniccount_test(fwts_framework *fw, uint32_t multitesttime) - { -- uint64_t status; -+ efi_status_t status; - struct efi_getnexthighmonotoniccount getnexthighmonotoniccount; - uint32_t highcount; - uint32_t i; -@@ -85,7 +85,7 @@ static int getnexthighmonotoniccount_test(fwts_framework *fw, uint32_t multitest - getnexthighmonotoniccount.status = &status; - - for (i = 0; i < multitesttime; i++) { -- status = ~0ULL; -+ status = ~0UL; - long ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTHIGHMONOTONICCOUNT, &getnexthighmonotoniccount); - - if (ioret == -1) { -@@ -111,7 +111,7 @@ static int getnexthighmonotoniccount_test(fwts_framework *fw, uint32_t multitest - - static int querycapsulecapabilities_test(fwts_framework *fw, uint32_t multitesttime, uint32_t flag) - { -- uint64_t status; -+ efi_status_t status; - uint32_t i; - - struct efi_querycapsulecapabilities querycapsulecapabilities; -@@ -143,7 +143,7 @@ static int querycapsulecapabilities_test(fwts_framework *fw, uint32_t multitestt - querycapsulecapabilities.ResetType = &resettype; - - for (i = 0; i < multitesttime; i++) { -- status = ~0ULL; -+ status = ~0UL; - long ioret = ioctl(fd, EFI_RUNTIME_QUERY_CAPSULECAPABILITIES, &querycapsulecapabilities); - if (ioret == -1) { - if (status == EFI_UNSUPPORTED) { -@@ -254,7 +254,7 @@ static int uefirtmisc_test2(fwts_framework *fw) - - static int uefirtmisc_test3(fwts_framework *fw) - { -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - long ioret; - struct efi_getnexthighmonotoniccount getnexthighmonotoniccount; - -@@ -294,13 +294,13 @@ static int uefirtmisc_test4(fwts_framework *fw) - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_GET_NEXT_HIGH_MONOTONIC_COUNT)) { - long ioret; -- uint64_t status; -+ efi_status_t status; - struct efi_getnexthighmonotoniccount getnexthighmonotoniccount; - uint32_t highcount; - - getnexthighmonotoniccount.HighCount = &highcount; - getnexthighmonotoniccount.status = &status; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTHIGHMONOTONICCOUNT, &getnexthighmonotoniccount); - if (ioret == -1) { -@@ -308,7 +308,7 @@ static int uefirtmisc_test4(fwts_framework *fw) - fwts_passed(fw, "UEFI GetNextHighMonotonicCount runtime " - "service unsupported status test passed."); - else { -- if (status == ~0ULL) { -+ if (status == ~0UL) { - fwts_skipped(fw, "Unknown error occurred, skip test."); - return FWTS_SKIP; - } else { -diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c -index 0cb50e8b..3c63953d 100644 ---- a/src/uefi/uefirttime/uefirttime.c -+++ b/src/uefi/uefirttime/uefirttime.c -@@ -198,7 +198,7 @@ static int uefirttime_test1(fwts_framework *fw) - EFI_TIME efi_time; - - EFI_TIME_CAPABILITIES efi_time_cap; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_GET_TIME)) { - fwts_skipped(fw, "Skipping test, GetTime runtime " -@@ -239,7 +239,7 @@ static int uefirttime_test_gettime_invalid( - { - long ioret; - struct efi_gettime gettime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_GET_TIME)) { - fwts_skipped(fw, "Skipping test, GetTime runtime " -@@ -291,7 +291,7 @@ static int uefirttime_test4(fwts_framework *fw) - - long ioret; - struct efi_settime settime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - struct efi_gettime gettime; - - EFI_TIME oldtime; -@@ -356,7 +356,7 @@ static int uefirttime_test4(fwts_framework *fw) - } - - settime.Time = &time; -- status = ~0ULL; -+ status = ~0UL; - settime.status = &status; - - ioret = ioctl(fd, EFI_RUNTIME_SET_TIME, &settime); -@@ -375,7 +375,7 @@ static int uefirttime_test4(fwts_framework *fw) - sleep(1); - - gettime.Time = &newtime; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_TIME, &gettime); - -@@ -428,7 +428,7 @@ static int uefirttime_test4(fwts_framework *fw) - - /* restore the previous time. */ - settime.Time = &oldtime; -- status = ~0ULL; -+ status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_SET_TIME, &settime); - if (ioret == -1) { - if (status == EFI_UNSUPPORTED) { -@@ -452,7 +452,7 @@ static int uefirttime_test_settime_invalid( - struct efi_settime *settime) - { - long ioret; -- static uint64_t status; -+ static efi_status_t status; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_SET_TIME)) { - fwts_skipped(fw, "Skipping test, SetTime runtime " -@@ -460,7 +460,7 @@ static int uefirttime_test_settime_invalid( - return FWTS_SKIP; - } - -- status = ~0ULL; -+ status = ~0UL; - settime->status = &status; - - ioret = ioctl(fd, EFI_RUNTIME_SET_TIME, settime); -@@ -493,7 +493,7 @@ static int uefirttime_test_settime_invalid_time( - struct efi_gettime gettime; - struct efi_settime settime; - EFI_TIME oldtime, newtime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - int ret, ioret; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_GET_TIME)) { -@@ -547,7 +547,7 @@ static int uefirttime_test_settime_invalid_time( - - /* Restore original time */ - settime.Time = &oldtime; -- status = ~0ULL; -+ status = ~0UL; - settime.status = &status; - ioret = ioctl(fd, EFI_RUNTIME_SET_TIME, &settime); - if (ioret == -1) { -@@ -695,7 +695,7 @@ static int uefirttime_test18(fwts_framework *fw) - { - long ioret; - struct efi_getwakeuptime getwakeuptime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint8_t enabled, pending; - EFI_TIME efi_time; - -@@ -736,7 +736,7 @@ static int uefirttime_test_getwaketime_invalid( - struct efi_getwakeuptime *getwakeuptime) - { - long ioret; -- static uint64_t status; -+ static efi_status_t status; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_GET_WAKEUP_TIME)) { - fwts_skipped(fw, "Skipping test, GetWakeupTime runtime " -@@ -744,7 +744,7 @@ static int uefirttime_test_getwaketime_invalid( - return FWTS_SKIP; - } - -- status = ~0ULL; -+ status = ~0UL; - getwakeuptime->status = &status; - - ioret = ioctl(fd, EFI_RUNTIME_GET_WAKETIME, getwakeuptime); -@@ -824,7 +824,7 @@ static int uefirttime_test23(fwts_framework *fw) - { - long ioret; - struct efi_setwakeuptime setwakeuptime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - EFI_TIME oldtime; - EFI_TIME newtime; - -@@ -868,7 +868,7 @@ static int uefirttime_test23(fwts_framework *fw) - addonehour(&oldtime); - - setwakeuptime.Time = &oldtime; -- status = ~0ULL; -+ status = ~0UL; - setwakeuptime.status = &status; - setwakeuptime.Enabled = true; - -@@ -896,7 +896,7 @@ static int uefirttime_test23(fwts_framework *fw) - getwakeuptime.Enabled = &enabled; - getwakeuptime.Pending = &pending; - getwakeuptime.Time = &newtime; -- status = ~0ULL; -+ status = ~0UL; - getwakeuptime.status = &status; - - ioret = ioctl(fd, EFI_RUNTIME_GET_WAKETIME, &getwakeuptime); -@@ -932,7 +932,7 @@ static int uefirttime_test23(fwts_framework *fw) - } - - setwakeuptime.Enabled = false; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_WAKETIME, &setwakeuptime); - if (ioret == -1) { -@@ -948,7 +948,7 @@ static int uefirttime_test23(fwts_framework *fw) - } - - sleep(1); -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_WAKETIME, &getwakeuptime); - if (ioret == -1) { -@@ -980,7 +980,7 @@ static int uefirttime_test_setwakeuptime_invalid( - ) - { - long ioret; -- static uint64_t status; -+ static efi_status_t status; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_SET_WAKEUP_TIME)) { - fwts_skipped(fw, "Skipping test, SetWakeupTime runtime " -@@ -988,7 +988,7 @@ static int uefirttime_test_setwakeuptime_invalid( - return FWTS_SKIP; - } - -- status = ~0ULL; -+ status = ~0UL; - setwakeuptime->status = &status; - - ioret = ioctl(fd, EFI_RUNTIME_SET_WAKETIME, setwakeuptime); -@@ -1031,7 +1031,7 @@ static int uefirttime_test_setwakeuptime_invalid_time( - struct efi_getwakeuptime getwakeuptime; - struct efi_setwakeuptime setwakeuptime; - EFI_TIME oldtime, newtime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint8_t pending, enabled; - int ret, ioret; - -@@ -1088,7 +1088,7 @@ static int uefirttime_test_setwakeuptime_invalid_time( - - /* Restore original time */ - setwakeuptime.Time = &oldtime; -- status = ~0ULL; -+ status = ~0UL; - setwakeuptime.status = &status; - setwakeuptime.Enabled = true; - ioret = ioctl(fd, EFI_RUNTIME_SET_WAKETIME, &setwakeuptime); -@@ -1238,7 +1238,7 @@ static int uefirttime_test38(fwts_framework *fw) - long ioret; - - struct efi_settime settime; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - struct efi_gettime gettime; - struct efi_getwakeuptime getwakeuptime; - uint8_t enabled, pending; -@@ -1258,7 +1258,7 @@ static int uefirttime_test38(fwts_framework *fw) - fwts_passed(fw, "UEFI GetTime runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeGetTime", -@@ -1286,7 +1286,7 @@ static int uefirttime_test38(fwts_framework *fw) - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_SET_TIME)) { - settime.Time = &efi_time; -- status = ~0ULL; -+ status = ~0UL; - settime.status = &status; - - ioret = ioctl(fd, EFI_RUNTIME_SET_TIME, &settime); -@@ -1295,7 +1295,7 @@ static int uefirttime_test38(fwts_framework *fw) - fwts_passed(fw, "UEFI SetTime runtime service " - "unsupported status test passed."); - } else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeSetTime", -@@ -1317,7 +1317,7 @@ static int uefirttime_test38(fwts_framework *fw) - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_SET_WAKEUP_TIME)) { - setwakeuptime.Time = &efi_time; -- status = ~0ULL; -+ status = ~0UL; - setwakeuptime.status = &status; - setwakeuptime.Enabled = false; - -@@ -1327,7 +1327,7 @@ static int uefirttime_test38(fwts_framework *fw) - fwts_passed(fw, "UEFI SetWakeupTime runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeSetWakeupTime", -@@ -1360,7 +1360,7 @@ static int uefirttime_test38(fwts_framework *fw) - fwts_passed(fw, "UEFI GetWakeupTime runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeGetWakeupTime", -diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c -index bf6f5e89..7c6bb772 100644 ---- a/src/uefi/uefirtvariable/uefirtvariable.c -+++ b/src/uefi/uefirtvariable/uefirtvariable.c -@@ -69,7 +69,7 @@ static uint32_t runtimeservicessupported; - static void uefirtvariable_env_cleanup(void) - { - struct efi_setvariable setvariable; -- uint64_t status; -+ efi_status_t status; - uint8_t data = 0; - - setvariable.VariableName = variablenametest; -@@ -77,19 +77,19 @@ static void uefirtvariable_env_cleanup(void) - setvariable.Attributes = 0; - setvariable.DataSize = 0; - setvariable.Data = &data; -- status = ~0ULL; -+ status = ~0UL; - setvariable.status = &status; - (void)ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -- status = ~0ULL; -+ status = ~0UL; - setvariable.VariableName = variablenametest2; - (void)ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -- status = ~0ULL; -+ status = ~0UL; - setvariable.VariableName = variablenametest3; - (void)ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -- status = ~0ULL; -+ status = ~0UL; - setvariable.VariableName = variablenametest; - setvariable.VendorGuid = >estguid2; - (void)ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); -@@ -125,7 +125,7 @@ static int getvariable_test( - struct efi_getvariable getvariable; - struct efi_setvariable setvariable; - -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint8_t testdata[MAX_DATA_LENGTH]; - uint64_t dataindex; - uint64_t getdatasize = sizeof(testdata); -@@ -189,7 +189,7 @@ static int getvariable_test( - getvariable.status = &status; - - for (i = 0; i < multitesttime; i++) { -- status = ~0ULL; -+ status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_GET_VARIABLE, &getvariable); - if (ioret == -1) { - if (status == EFI_UNSUPPORTED) { -@@ -239,7 +239,7 @@ static int getvariable_test( - - /* delete the variable */ - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -@@ -255,7 +255,7 @@ static int getvariable_test( - err_restore_env: - - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -@@ -308,7 +308,7 @@ static bool compare_name(const uint16_t *name1, const uint16_t *name2) - static int getnextvariable_test1(fwts_framework *fw) - { - long ioret; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - - struct efi_setvariable setvariable; - -@@ -388,7 +388,7 @@ static int getnextvariable_test1(fwts_framework *fw) - variablename[0] = '\0'; - while (true) { - variablenamesize = maxvariablenamesize; -- status = ~0ULL; -+ status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - - if (ioret == -1) { -@@ -458,7 +458,7 @@ static int getnextvariable_test1(fwts_framework *fw) - - /* delete the variable */ - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -@@ -474,7 +474,7 @@ static int getnextvariable_test1(fwts_framework *fw) - err_restore_env: - - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - if (ioret == -1) { -@@ -512,7 +512,7 @@ static bool strlen_valid(const uint16_t *variablename, const uint64_t variablena - - static int getnextvariable_test2(fwts_framework *fw) - { -- uint64_t status; -+ efi_status_t status; - - struct efi_getnextvariablename getnextvariablename; - uint64_t variablenamesize = MAX_DATA_LENGTH; -@@ -546,7 +546,7 @@ static int getnextvariable_test2(fwts_framework *fw) - while (true) { - long ioret; - -- status = ~0ULL; -+ status = ~0UL; - variablenamesize = maxvariablenamesize; - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - -@@ -683,7 +683,7 @@ static void bucket_destroy(void) - static int getnextvariable_test3(fwts_framework *fw) - { - long ioret; -- uint64_t status; -+ efi_status_t status; - - struct efi_getnextvariablename getnextvariablename; - uint64_t variablenamesize = MAX_DATA_LENGTH; -@@ -717,7 +717,7 @@ static int getnextvariable_test3(fwts_framework *fw) - while (true) { - struct efi_var_item *item; - -- status = ~0ULL; -+ status = ~0UL; - variablenamesize = maxvariablenamesize; - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - -@@ -823,7 +823,7 @@ err: - static int getnextvariable_test4(fwts_framework *fw) - { - long ioret; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint64_t i; - - struct efi_getnextvariablename getnextvariablename; -@@ -866,7 +866,7 @@ static int getnextvariable_test4(fwts_framework *fw) - - getnextvariablename.VariableName = variablename; - getnextvariablename.VendorGuid = NULL; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - -@@ -880,7 +880,7 @@ static int getnextvariable_test4(fwts_framework *fw) - - getnextvariablename.VendorGuid = &vendorguid; - getnextvariablename.VariableNameSize = NULL; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - -@@ -902,7 +902,7 @@ static int getnextvariable_test4(fwts_framework *fw) - * string in VariableName - */ - variablename[0] = '\0'; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - -@@ -949,7 +949,7 @@ static int setvariable_insertvariable( - long ioret; - struct efi_setvariable setvariable; - -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint64_t dataindex; - - uint8_t data[datasize + 1]; -@@ -1029,7 +1029,7 @@ static int setvariable_checkvariable( - long ioret; - struct efi_getvariable getvariable; - -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint8_t testdata[datasize]; - uint64_t dataindex; - uint64_t getdatasize = sizeof(testdata); -@@ -1096,7 +1096,7 @@ static int setvariable_checkvariable_notfound( - long ioret; - struct efi_getvariable getvariable; - -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint8_t testdata[MAX_DATA_LENGTH]; - uint64_t getdatasize = sizeof(testdata); - uint32_t attributestest; -@@ -1142,7 +1142,7 @@ static int setvariable_invalidattr( - { - long ioret; - struct efi_setvariable setvariable; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint64_t dataindex; - uint8_t data[datasize]; - -@@ -1502,7 +1502,7 @@ static int setvariable_test8(fwts_framework *fw) - uint32_t attr = attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS; - uint64_t datasize = 1; - uint8_t data = 1; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - - if (!(runtimeservicessupported & EFI_RT_SUPPORTED_SET_VARIABLE)) { - fwts_skipped(fw, "Skipping test, SetVariable runtime service " -@@ -1532,7 +1532,7 @@ static int setvariable_test8(fwts_framework *fw) - } - - static int do_queryvariableinfo( -- uint64_t *status, -+ efi_status_t *status, - uint64_t *remvarstoragesize, - uint64_t *maxvariablesize) - { -@@ -1545,7 +1545,7 @@ static int do_queryvariableinfo( - queryvariableinfo.RemainingVariableStorageSize = remvarstoragesize; - queryvariableinfo.MaximumVariableSize = maxvariablesize; - queryvariableinfo.status = status; -- *status = ~0ULL; -+ *status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_QUERY_VARIABLEINFO, &queryvariableinfo); - -@@ -1560,7 +1560,7 @@ static int getnextvariable_multitest( - const uint32_t multitesttime) - { - long ioret; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint32_t i; - - struct efi_setvariable setvariable; -@@ -1627,7 +1627,7 @@ static int getnextvariable_multitest( - for (i = 0; i < multitesttime; i++) { - variablename[0] = '\0'; - variablenamesize = MAX_DATA_LENGTH; -- status = ~0ULL; -+ status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - - if (ioret == -1) { -@@ -1645,7 +1645,7 @@ static int getnextvariable_multitest( - }; - - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -@@ -1660,7 +1660,7 @@ static int getnextvariable_multitest( - err_restore_env: - - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - -@@ -1778,7 +1778,7 @@ static int uefirtvariable_test3(fwts_framework *fw) - - static int uefirtvariable_test4(fwts_framework *fw) - { -- uint64_t status; -+ efi_status_t status; - uint64_t remvarstoragesize; - uint64_t maxvariablesize; - -@@ -1929,7 +1929,7 @@ static int uefirtvariable_test6(fwts_framework *fw) - static int uefirtvariable_test7(fwts_framework *fw) - { - uint32_t multitesttime = uefi_query_variable_multiple; -- uint64_t status; -+ efi_status_t status; - uint64_t remvarstoragesize; - uint64_t maxvariablesize; - uint32_t i; -@@ -1994,7 +1994,7 @@ static void getvariable_test_invalid( - } - - fwts_log_info(fw, "Testing GetVariable with %s.", test); -- *(getvariable->status) = ~0ULL; -+ *(getvariable->status) = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_VARIABLE, getvariable); - -@@ -2030,7 +2030,7 @@ static int uefirtvariable_test8(fwts_framework *fw) - struct efi_getvariable getvariable; - struct efi_setvariable setvariable; - uint8_t data[16]; -- uint64_t status= ~0ULL; -+ efi_status_t status= ~0UL; - uint64_t dataindex; - uint64_t getdatasize = sizeof(data); - uint32_t attr; -@@ -2118,7 +2118,7 @@ static int uefirtvariable_test8(fwts_framework *fw) - - /* delete the variable */ - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - ioret = ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - if (ioret == -1) { - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeSetVariable", -@@ -2139,7 +2139,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - struct efi_queryvariableinfo queryvariableinfo; - - EFI_GUID guid; -- uint64_t status = ~0ULL; -+ efi_status_t status = ~0UL; - uint8_t data = 1; - uint64_t datasize = 1; - uint64_t variablenamesize = MAX_DATA_LENGTH; -@@ -2165,7 +2165,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - fwts_passed(fw, "UEFI SetVariable runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeSetVariable", -@@ -2200,7 +2200,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - fwts_passed(fw, "UEFI GetVariable runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeGetVariable", -@@ -2222,7 +2222,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - - /* delete the variable which was set */ - setvariable.DataSize = 0; -- status = ~0ULL; -+ status = ~0UL; - (void)ioctl(fd, EFI_RUNTIME_SET_VARIABLE, &setvariable); - - variablename = malloc(sizeof(uint16_t) * variablenamesize); -@@ -2237,7 +2237,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - getnextvariablename.VendorGuid = &guid; - getnextvariablename.status = &status; - variablename[0] = '\0'; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); - if (ioret == -1) { -@@ -2245,7 +2245,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - fwts_passed(fw, "UEFI GetNextVarName runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeGetNextVarName", -@@ -2271,7 +2271,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - queryvariableinfo.RemainingVariableStorageSize = &remvarstoragesize; - queryvariableinfo.MaximumVariableSize = &maxvariablesize; - queryvariableinfo.status = &status; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_QUERY_VARIABLEINFO, &queryvariableinfo); - if (ioret == -1) { -@@ -2279,7 +2279,7 @@ static int uefirtvariable_test9(fwts_framework *fw) - fwts_passed(fw, "UEFI QueryVarInfo runtime service " - "unsupported status test passed."); - else { -- if (status == ~0ULL) -+ if (status == ~0UL) - fwts_skipped(fw, "Unknown error occurred, skip test."); - else - fwts_failed(fw, LOG_LEVEL_HIGH, "UEFIRuntimeQueryVarInfo", -diff --git a/src/uefi/uefivarinfo/uefivarinfo.c b/src/uefi/uefivarinfo/uefivarinfo.c -index 1386d17a..f31e2649 100644 ---- a/src/uefi/uefivarinfo/uefivarinfo.c -+++ b/src/uefi/uefivarinfo/uefivarinfo.c -@@ -55,7 +55,7 @@ static int do_checkvariables( - uint64_t *usedvarssize, - const uint64_t maxvarsize) - { -- uint64_t status; -+ efi_status_t status; - - struct efi_getnextvariablename getnextvariablename; - uint64_t variablenamesize = MAX_VARNAME_LENGTH; -@@ -85,7 +85,7 @@ static int do_checkvariables( - variablename[0] = '\0'; - while (true) { - long ioret; -- status = ~0ULL; -+ status = ~0UL; - - variablenamesize = MAX_VARNAME_LENGTH; - ioret = ioctl(fd, EFI_RUNTIME_GET_NEXTVARIABLENAME, &getnextvariablename); -@@ -114,7 +114,7 @@ static int do_checkvariables( - getvariable.VendorGuid = &vendorguid; - getvariable.DataSize = &getdatasize; - getvariable.Data = data; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_VARIABLE, &getvariable); - if (ioret == -1) { -@@ -139,7 +139,7 @@ static int do_checkvariables( - } - - getvariable.Data = data; -- status = ~0ULL; -+ status = ~0UL; - - ioret = ioctl(fd, EFI_RUNTIME_GET_VARIABLE, &getvariable); - if (ioret == -1) { -@@ -161,7 +161,7 @@ static int do_checkvariables( - } - - static int do_queryvariableinfo( -- uint64_t *status, -+ efi_status_t *status, - uint64_t *maxvarstoragesize, - uint64_t *remvarstoragesize, - uint64_t *maxvariablesize) -@@ -175,7 +175,7 @@ static int do_queryvariableinfo( - queryvariableinfo.MaximumVariableStorageSize = maxvarstoragesize; - queryvariableinfo.RemainingVariableStorageSize = remvarstoragesize; - queryvariableinfo.MaximumVariableSize = maxvariablesize; -- *status = ~0ULL; -+ *status = ~0UL; - queryvariableinfo.status = status; - - ioret = ioctl(fd, EFI_RUNTIME_QUERY_VARIABLEINFO, &queryvariableinfo); -@@ -188,7 +188,7 @@ static int do_queryvariableinfo( - - static int uefivarinfo_test1(fwts_framework *fw) - { -- uint64_t status; -+ efi_status_t status; - uint64_t remvarstoragesize; - uint64_t maxvariablesize; - uint64_t maxvarstoragesize; --- -2.35.1 - diff --git a/common/scripts/build-fwts-arm.sh b/common/scripts/build-fwts-arm.sh deleted file mode 100755 index c9f770a..0000000 --- a/common/scripts/build-fwts-arm.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021-2022, ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# -# This script uses the following environment variables from the variant -# -# VARIANT - build variant name -# TOP_DIR - workspace root directory -# CROSS_COMPILE - PATH to GCC including CROSS-COMPILE prefix -# PARALLELISM - number of cores to build across - -TOP_DIR=`pwd` -FWTS_PATH=fwts -FWTS_BINARY=fwts_output -RAMDISK_PATH=ramdisk -FWTS_DEP=$RAMDISK_PATH/fwts_build_dep-arm - -. $TOP_DIR/../../common/config/common_config.cfg -. $TOP_DIR/../../common/scripts/cross_toolchain-arm.sh - -# Only build Full SystemReady IR -BUILD_PLAT=IR -BUILD_TYPE=F - -BBR_DIR=$TOP_DIR/bbr-acs - -init() -{ - if [[ $BUILD_TYPE = S ]]; then - mkdir -p $TOP_DIR/$RAMDISK_PATH - fi - cp -r $BBR_DIR/common/fwts_build_dep-arm $RAMDISK_PATH - - # Copy the libraries fwts needs at runtime. - mkdir -pv $RAMDISK_PATH/fwts_build_dep-arm/cross_libs - - for f in libc.so.6 ld-linux-armhf.so.3 libpthread.so.0 libm.so.6; do - cp -v "$CROSS_COMPILE_DIR/../arm-linux-gnueabihf/libc/lib/$f" "$RAMDISK_PATH/fwts_build_dep-arm/cross_libs/" - done -} - -do_build() -{ - pushd $TOP_DIR/$FWTS_PATH - DEF_PATH=$PATH - PATH=$(getconf PATH) #Reset path to avoid cross compiler mismatch - PATH="$PATH:$CROSS_COMPILE_DIR" - - echo $BBR_DIR - - if ! patch -R -s -f --dry-run -p1 < $BBR_DIR/ebbr/config/IR_VER.patch ; then - echo "Applying FWTS Patch ..." - patch -p1 < $BBR_DIR/ebbr/config/IR_VER.patch - fi - - #The below patch is temporary and shall be removed once a permanent solution - #in FWTS codebase is found - if ! patch -R -s -f --dry-run -p1 < $BBR_DIR/common/patches/0001-Fix-for-FWTS-build-issue.patch; then - echo "Applying FWTS build patch ..." - patch -p1 < $BBR_DIR/common/patches/0001-Fix-for-FWTS-build-issue.patch - fi - - if ! patch -R -s -f --dry-run -p1 < $BBR_DIR/common/patches/0001-Build-only-what-we-use-to-test-EBBR-on-32b-arm.patch; then - echo "Applying FWTS EBBR on 32b arm patch ..." - patch -p1 < $BBR_DIR/common/patches/0001-Build-only-what-we-use-to-test-EBBR-on-32b-arm.patch - fi - - mkdir -p $FWTS_BINARY - mkdir -p $FWTS_BINARY/bash - autoreconf -ivf - export ac_cv_func_malloc_0_nonnull=yes - export ac_cv_func_realloc_0_nonnull=yes - ./configure --host=arm-linux-gnueabihf \ - --enable-static=yes CPPFLAGS="-I$TOP_DIR/$FWTS_DEP/include" CFLAGS="-g -O2" \ - --prefix=$TOP_DIR/$FWTS_PATH/$FWTS_BINARY \ - --exec-prefix=$TOP_DIR/$FWTS_PATH/$FWTS_BINARY \ - --datarootdir=$TOP_DIR/$FWTS_PATH/$FWTS_BINARY \ - --with-bashcompletiondir=$TOP_DIR/$FWTS_PATH/$FWTS_BINARY/bash - - make install - PATH=$DEF_PATH #Restore def path - popd -} - -do_clean() -{ - pushd $TOP_DIR/$FWTS_PATH - - if [ -f "$TOP_DIR/$FWTS_PATH/Makefile" ]; then - make clean - fi - if [ -f "$TOP_DIR/$FWTS_PATH/$FWTS_BINARY/bin/fwts" ]; then - make uninstall - fi - rm -rf $TOP_DIR/$RAMDISK_PATH/$FWTS_BINARY - popd -} - -do_package () -{ - echo "Packaging FWTS... $VARIANT"; - if [[ $BUILD_TYPE = F ]]; then - sed -i '/ir_bbr_fwts_tests.ini/d' $TOP_DIR/ramdisk/files-arm.txt - #Add the entry in file-arm.txt of ramdisk - echo "file /bin/ir_bbr_fwts_tests.ini ./fwts_output/bin/ir_bbr_fwts_tests.ini 766 0 0" >> $TOP_DIR/ramdisk/files-arm.txt - cp $BBR_DIR/ebbr/config/ir_bbr_fwts_tests.ini $TOP_DIR/$FWTS_PATH/$FWTS_BINARY/bin - fi - cp -R $TOP_DIR/$FWTS_PATH/$FWTS_BINARY ramdisk - chmod 777 -R $TOP_DIR/$RAMDISK_PATH/$FWTS_BINARY -} - -DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -init -source $DIR/framework.sh $BUILD_PLAT $BUILD_TYPE diff --git a/common/scripts/build-fwts.sh b/common/scripts/build-fwts.sh index 3acdfea..96f8381 100755 --- a/common/scripts/build-fwts.sh +++ b/common/scripts/build-fwts.sh @@ -1,32 +1,20 @@ #!/usr/bin/env bash -# Copyright (c) 2021-2023, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved. +# SPDX-License-Identifier : Apache-2.0 # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# 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 # -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# 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. +## # # This script uses the following environment variables from the variant @@ -49,10 +37,6 @@ fi BUILD_PLAT=$1 BUILD_TYPE=$2 -if [ $BUILD_PLAT = SR ]; then - BUILD_PLAT=ES -fi - if ! [[ $BUILD_TYPE = S ]] && ! [[ $BUILD_TYPE = F ]] ; then echo "Please provide a Build type." echo "Usage build-fwts.sh " @@ -86,24 +70,30 @@ do_build() echo $BBR_DIR - if [ "$BUILD_PLAT" = "IR" ]; then - if ! patch -R -s -f --dry-run -p1 < $BBR_DIR/ebbr/config/IR_VER.patch ; then - echo "Applying FWTS Patch ..." - patch -p1 < $BBR_DIR/ebbr/config/IR_VER.patch + if [ "$BUILD_PLAT" = "EBBR" ]; then + if ! git apply --check $BBR_DIR/ebbr/patches/ACS_VER_fwts.patch ; then + echo "FWTS Version patch apply failed" + exit 1 + else + git apply $BBR_DIR/ebbr/patches/ACS_VER_fwts.patch fi fi - if [ "$BUILD_PLAT" = "ES" ]; then - if ! patch -R -s -f --dry-run -p1 < $BBR_DIR/sbbr/config/ES_VER.patch ; then - echo "Applying FWTS Patch ..." - patch -p1 < $BBR_DIR/sbbr/config/ES_VER.patch + + if [ "$BUILD_PLAT" = "SBBR" ]; then + if ! git apply --check $BBR_DIR/sbbr/patches/ACS_VER_fwts.patch ; then + echo "FWTS Version patch apply failed" + exit 1 + else + git apply $BBR_DIR/sbbr/patches/ACS_VER_fwts.patch fi fi - #The below patch is temporary and shall be removed once a permanent solution #in FWTS codebase is found - if ! patch -R -s -f --dry-run -p1 < $BBR_DIR/common/patches/0001-Fix-for-FWTS-build-issue.patch; then - echo "Applying FWTS build patch ..." - patch -p1 < $BBR_DIR/common/patches/0001-Fix-for-FWTS-build-issue.patch + if ! git apply --check $BBR_DIR/common/patches/0001-Fix-for-FWTS-build-issue.patch; then + echo "FWTS build patch apply failed" + exit 1 + else + git apply $BBR_DIR/common/patches/0001-Fix-for-FWTS-build-issue.patch fi mkdir -p $FWTS_BINARY @@ -158,7 +148,7 @@ do_package () echo "Packaging FWTS... $VARIANT"; if [[ $BUILD_TYPE = F ]]; then sed -i '/ir_bbr_fwts_tests.ini/d' $TOP_DIR/ramdisk/files.txt - if [ "$BUILD_PLAT" = "IR" ]; then + if [ "$BUILD_PLAT" = "EBBR" ]; then #Add the entry in file.txt of ramdisk echo "file /bin/ir_bbr_fwts_tests.ini ./fwts_output/bin/ir_bbr_fwts_tests.ini 766 0 0" >> $TOP_DIR/ramdisk/files.txt cp $BBR_DIR/ebbr/config/ir_bbr_fwts_tests.ini $TOP_DIR/$FWTS_PATH/$FWTS_BINARY/bin diff --git a/common/scripts/build-sct.sh b/common/scripts/build-sct.sh index 8aabe64..9402929 100755 --- a/common/scripts/build-sct.sh +++ b/common/scripts/build-sct.sh @@ -42,7 +42,7 @@ SCT_PATH=edk2-test UEFI_TOOLCHAIN=GCC5 UEFI_BUILD_MODE=DEBUG TARGET_ARCH=AARCH64 -KEYS_DIR=$TOP_DIR/security-interface-extension-keys +KEYS_DIR=$TOP_DIR/bbsr-keys TEST_DB1_KEY=$KEYS_DIR/TestDB1.key TEST_DB1_CRT=$KEYS_DIR/TestDB1.crt SCT_FRAMEWORK=$TOP_DIR/$SCT_PATH/uefi-sct/Build/bbrSct/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/SctPackage${TARGET_ARCH}/${TARGET_ARCH} @@ -52,10 +52,10 @@ BUILD_TYPE=$2 # if BBR standalone build if [[ $BUILD_TYPE = S ]]; then - . $TOP_DIR/../../common/config/bbr_common_config.cfg + . $TOP_DIR/../../common/config/bbr_source.cfg else # source common config if arm-systemready ACS build - . $TOP_DIR/../../common/config/sr_es_common_config.cfg + . $TOP_DIR/../common/config/systemready-band-source.cfg fi if [[ $arch != "aarch64" ]]; then @@ -63,13 +63,9 @@ if [[ $arch != "aarch64" ]]; then fi -if [ $BUILD_PLAT = SR ]; then - BUILD_PLAT=ES -fi - -if ! [[ $BUILD_PLAT = IR ]] && ! [[ $BUILD_PLAT = ES ]] ; then +if ! [[ $BUILD_PLAT = EBBR ]] && ! [[ $BUILD_PLAT = SBBR ]] ; then echo "Please provide a target." - echo "Usage build-sct.sh " + echo "Usage build-sct.sh " exit fi @@ -104,10 +100,10 @@ fi do_build() { pushd $TOP_DIR/$SCT_PATH - export KEYS_DIR=$TOP_DIR/security-interface-extension-keys + export KEYS_DIR=$TOP_DIR/bbsr-keys export EDK2_TOOLCHAIN=$UEFI_TOOLCHAIN - # required for SIE keys generation + # required for BBSR keys generation export PATH="$PATH:$TOP_DIR/efitools" # export EDK2 enviromnent variables @@ -126,7 +122,7 @@ do_build() cp $SBBR_TEST_DIR/BBR_SCT.dsc uefi-sct/SctPkg/UEFI/ cp $SBBR_TEST_DIR/build_bbr.sh uefi-sct/SctPkg/ - # copy SIE SCT tests to edk2-test + # copy BBSR SCT tests to edk2-test if [[ $BUILD_TYPE != S ]]; then cp -r $BBSR_TEST_DIR/BBSRVariableSizeTest uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices cp -r $BBSR_TEST_DIR/SecureBoot uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices @@ -136,29 +132,58 @@ do_build() #Startup/runtime files. mkdir -p uefi-sct/SctPkg/BBR - if [ $BUILD_PLAT = IR ]; then - #EBBR - cp $BBR_DIR/ebbr/config/EBBRStartup.nsh uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/ebbr/config/EBBR.seq uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/ebbr/config/EBBR_manual.seq uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/ebbr/config/EBBR_extd_run.seq uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/ebbr/config/EfiCompliant_EBBR.ini uefi-sct/SctPkg/BBR/ - elif [ $BUILD_PLAT = ES ]; then + # undo any previously applied patches on edk2-test + git checkout . + + if [ $BUILD_PLAT = EBBR ]; then + #EBBR + cp $BBR_DIR/ebbr/config/EBBRStartup.nsh uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/ebbr/config/EBBR.seq uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/ebbr/config/EBBR_manual.seq uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/ebbr/config/EBBR_extd_run.seq uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/ebbr/config/EfiCompliant_EBBR.ini uefi-sct/SctPkg/BBR/ + elif [ $BUILD_PLAT = SBBR ]; then #SBBR - cp $BBR_DIR/sbbr/config/SBBRStartup.nsh uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/sbbr/config/SBBR.seq uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/sbbr/config/SBBR_manual.seq uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/sbbr/config/SBBR_extd_run.seq uefi-sct/SctPkg/BBR/ - cp $BBR_DIR/sbbr/config/EfiCompliant_SBBR.ini uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/sbbr/config/SBBRStartup.nsh uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/sbbr/config/SBBR.seq uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/sbbr/config/SBBR_manual.seq uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/sbbr/config/SBBR_extd_run.seq uefi-sct/SctPkg/BBR/ + cp $BBR_DIR/sbbr/config/EfiCompliant_SBBR.ini uefi-sct/SctPkg/BBR/ + if [[ $BUILD_TYPE != S ]]; then + if git apply --check $TOP_DIR/patches/sctversion.patch; then + echo "Applying edk2-test BBR sctversion patch..." + git apply --ignore-whitespace --ignore-space-change $TOP_DIR/patches/sctversion.patch + else + echo "Error while applying edk2-test BBR sctversion patch..." + exit + fi + fi fi - #Common #SCRT cp $BBR_DIR/common/config/ScrtStartup.nsh uefi-sct/SctPkg/BBR/ cp $BBR_DIR/common/config/SCRT.conf uefi-sct/SctPkg/BBR/ - # undo any previously applied patches on edk2-test - git checkout . + # apply version patches for standalone BBR builds + if [[ $BUILD_TYPE = S ]]; then + if [ $BUILD_PLAT = EBBR ]; then + if git apply --check $BBR_DIR/ebbr/patches/standalone_ebbr_ver.patch; then + echo "Applying EBBR SCT version patch..." + git apply --ignore-whitespace --ignore-space-change $BBR_DIR/ebbr/patches/standalone_ebbr_ver.patch + else + echo "Error while applying EBBR SCT version patch..." + exit + fi + elif [ $BUILD_PLAT = SBBR ]; then + if git apply --check $BBR_DIR/sbbr/patches/standalone_sbbr_ver.patch; then + echo "Applying SBBR SCT version patch..." + git apply --ignore-whitespace --ignore-space-change $BBR_DIR/sbbr/patches/standalone_sbbr_ver.patch + else + echo "Error while applying SBBR SCT version patch..." + exit + fi + fi + fi if git apply --check $BBR_DIR/common/patches/edk2-test-bbr-build.patch; then echo "Applying edk2-test BBR build patch..." @@ -175,11 +200,11 @@ do_build() exit fi if [[ $BUILD_TYPE != S ]]; then - if git apply --check $BBR_DIR/bbsr/patches/0001-SIE-Patch-for-UEFI-SCT-Build.patch; then - echo "Applying SIE SCT patch..." - git apply --ignore-whitespace --ignore-space-change $BBR_DIR/bbsr/patches/0001-SIE-Patch-for-UEFI-SCT-Build.patch + if git apply --check $BBR_DIR/bbsr/patches/0001-BBSR-Patch-for-UEFI-SCT-Build.patch; then + echo "Applying BBSR SCT patch..." + git apply --ignore-whitespace --ignore-space-change $BBR_DIR/bbsr/patches/0001-BBSR-Patch-for-UEFI-SCT-Build.patch else - echo "Error while applying SIE SCT patch..." + echo "Error while applying BBSR SCT patch..." exit fi fi @@ -233,14 +258,14 @@ do_package () mkdir -p ${TARGET_ARCH}_SCT/SCT/SCRT mkdir -p ${TARGET_ARCH}_SCT/SCT/Sequence - if [ $BUILD_PLAT = IR ]; then + if [ $BUILD_PLAT = EBBR ]; then #EBBR cp -r Build/bbrSct/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/SctPackage${TARGET_ARCH}/${TARGET_ARCH}/* ${TARGET_ARCH}_SCT/SCT/ cp Build/bbrSct/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/SctPackage${TARGET_ARCH}/EBBRStartup.nsh ${TARGET_ARCH}_SCT/SctStartup.nsh cp SctPkg/BBR/EfiCompliant_EBBR.ini ${TARGET_ARCH}_SCT/SCT/Dependency/EfiCompliantBBTest/EfiCompliant.ini cp SctPkg/BBR/EBBR_manual.seq ${TARGET_ARCH}_SCT/SCT/Sequence/EBBR_manual.seq - elif [ $BUILD_PLAT = ES ]; then + elif [ $BUILD_PLAT = SBBR ]; then # Sign the SCT binaries if [ $BUILD_TYPE != S ]; then SecureBootSign $SCT_FRAMEWORK @@ -256,7 +281,7 @@ do_package () SecureBootSignDependency ConfigKeywordHandler SecureBootSignDependency PciIo #BBSR - cp $BBR_DIR/bbsr/config/sie_SctStartup.nsh ${TARGET_ARCH}_SCT/sie_SctStartup.nsh + cp $BBR_DIR/bbsr/config/BBSRStartup.nsh ${TARGET_ARCH}_SCT/bbsr_SctStartup.nsh cp $BBR_DIR/bbsr/config/BBSR.seq ${TARGET_ARCH}_SCT/SCT/Sequence/ fi #SBBR diff --git a/common/scripts/build-uefi-apps-arm.sh b/common/scripts/build-uefi-apps-arm.sh deleted file mode 100755 index 124078e..0000000 --- a/common/scripts/build-uefi-apps-arm.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021, ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# -# This script uses the following environment variables from the variant -# -# VARIANT - build variant name -# TOP_DIR - workspace root directory -# CROSS_COMPILE - PATH to GCC including CROSS-COMPILE prefix -# PARALLELISM - number of cores to build across -# UEFI_BUILD_ENABLED - Flag to enable building UEFI -# UEFI_PATH - sub-directory containing UEFI code -# UEFI_BUILD_MODE - DEBUG or RELEASE -# UEFI_TOOLCHAIN - Toolchain supported by Linaro uefi-tools: GCC49, GCC48 or GCC47 -# UEFI_PLATFORMS - List of platforms to build -# UEFI_PLAT_{platform name} - array of platform parameters: -# - platname - the name of the platform used by the build -# - makefile - the makefile to execute for this platform -# - output - where to store the files in packaging phase -# - defines - extra platform defines during the build -# - binary - what to call the final output binary - -TOP_DIR=`pwd` -UEFI_PATH=edk2 -UEFI_TOOLCHAIN=GCC5 -UEFI_BUILD_MODE=DEBUG -TARGET_ARCH=ARM - -. $TOP_DIR/../../common/config/common_config.cfg -. $TOP_DIR/../../common/scripts/cross_toolchain-arm.sh - -# Onlt build Full SystemReady IR -BUILD_PLAT=IR -BUILD_TYPE=F - -echo "Target: $BUILD_PLAT" -echo "Build type: $BUILD_TYPE" - -if [[ $BUILD_TYPE = S ]]; then - BBR_DIR=$TOP_DIR/../../ -else - BBR_DIR=$TOP_DIR/bbr-acs -fi - -do_build() -{ - pushd $TOP_DIR/$UEFI_PATH - - export EDK2_TOOLCHAIN=$UEFI_TOOLCHAIN - export ${UEFI_TOOLCHAIN}_ARM_PREFIX=$CROSS_COMPILE - local vars= - export PACKAGES_PATH=$TOP_DIR/$UEFI_PATH - export PYTHON_COMMAND=/usr/bin/python3 - export WORKSPACE=$TOP_DIR/$UEFI_PATH - - #Build base tools - source $TOP_DIR/$UEFI_PATH/edksetup.sh - make -C $TOP_DIR/$UEFI_PATH/BaseTools - - build -a $TARGET_ARCH -t $EDK2_TOOLCHAIN -p MdeModulePkg/MdeModulePkg.dsc - popd -} - -do_clean() -{ - pushd $TOP_DIR/$UEFI_PATH - source $TOP_DIR/$UEFI_PATH/edksetup.sh - make -C $TOP_DIR/$UEFI_PATH/BaseTools clean - popd -} - -do_package () -{ - echo "Packaging..."; - - if [ -f $TOP_DIR/$UEFI_PATH/Build/MdeModule/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/${TARGET_ARCH}/CapsuleApp.efi ]; then - echo "CapsuleApp.efi successfully generated at $TOP_DIR/$UEFI_PATH/Build/MdeModule/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/${TARGET_ARCH}/CapsuleApp.efi" - else - echo "Error: CapsuleApp.efi could not be generated. Please check the logs" - fi - -} - -DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source $DIR/framework.sh $BUILD_PLAT $BUILD_TYPE diff --git a/common/scripts/build-uefi-apps.sh b/common/scripts/build-uefi-apps.sh index 0b6a231..2f80b3b 100755 --- a/common/scripts/build-uefi-apps.sh +++ b/common/scripts/build-uefi-apps.sh @@ -1,32 +1,20 @@ #!/usr/bin/env bash -# Copyright (c) 2021, 2023, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2021, 2023-2024, Arm Limited or its affiliates. All rights reserved. +# SPDX-License-Identifier : Apache-2.0 # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# 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 # -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# 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. +## # # This script uses the following environment variables from the variant @@ -53,35 +41,23 @@ UEFI_PATH=edk2 UEFI_TOOLCHAIN=GCC5 UEFI_BUILD_MODE=DEBUG TARGET_ARCH=AARCH64 -KEYS_DIR=$TOP_DIR/security-interface-extension-keys +KEYS_DIR=$TOP_DIR/bbsr-keys BUILD_PLAT=$1 BUILD_TYPE=$2 # if BBR standalone build if [[ $BUILD_TYPE = S ]]; then - . $TOP_DIR/../../common/config/bbr_common_config.cfg + . $TOP_DIR/../../common/config/bbr_source.cfg else # source common config if arm-systemready ACS build - . $TOP_DIR/../../common/config/sr_es_common_config.cfg +. $TOP_DIR/../common/config/systemready-band-source.cfg fi if [[ $arch != "aarch64" ]]; then CROSS_COMPILE=$TOP_DIR/$GCC fi -if [ $BUILD_PLAT = SR ]; then - BUILD_PLAT=ES -fi - -#Currently the BUILD_PLAT flag is not used. For future use -if ! [[ $BUILD_PLAT = IR ]] && ! [[ $BUILD_PLAT = ES ]]; then - echo "Please provide a target." - echo "Usage $0 " - echo "S->Standalone BBR,F->Full systemready" - exit -fi - if ! [[ $BUILD_TYPE = S ]] && ! [[ $BUILD_TYPE = F ]] ; then echo "Please provide a Build type." echo "Usage $0 " @@ -92,7 +68,6 @@ fi echo "Target: $BUILD_PLAT" echo "Build type: $BUILD_TYPE" - if [[ $BUILD_TYPE = S ]]; then BBR_DIR=$TOP_DIR/../../ else @@ -101,7 +76,6 @@ fi do_build() { - pushd $TOP_DIR/$UEFI_PATH if [[ $arch != "aarch64" ]]; then CROSS_COMPILE_DIR=$(dirname $CROSS_COMPILE) @@ -131,9 +105,7 @@ do_clean() fi source $TOP_DIR/$UEFI_PATH/edksetup.sh make -C $TOP_DIR/$UEFI_PATH/BaseTools clean - popd - } do_package () @@ -149,9 +121,7 @@ do_package () else echo "Error: CapsuleApp.efi could not be generated. Please check the logs" fi - } DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source $DIR/framework.sh $@ - diff --git a/common/scripts/get_source.sh b/common/scripts/get_source.sh index b80d566..dfc6c2b 100755 --- a/common/scripts/get_source.sh +++ b/common/scripts/get_source.sh @@ -18,14 +18,7 @@ TOP_DIR=`pwd` -. $TOP_DIR/../../common/config/bbr_common_config.cfg - -#Optional argument 'arm' shall be set when targeting a 32bit Arm device -if [ "$1" == "arm" ]; then - TARGET_ARCH="arm" -else - TARGET_ARCH="aarch64" -fi +. $TOP_DIR/../../common/config/bbr_source.cfg get_cross_compiler() { @@ -36,11 +29,7 @@ get_cross_compiler() echo "==================================================================" else echo "Downloading cross compiler. Version : ${GCC_TOOLS_VERSION}" - if [ $TARGET_ARCH == "arm" ]; then - TAG=arm-linux-gnueabihf - else TAG=aarch64-none-linux-gnu - fi mkdir -p tools pushd $TOP_DIR/tools wget $CROSS_COMPILER_URL diff --git a/common/sct-tests/sbbr-tests/BBR_SCT.dsc b/common/sct-tests/sbbr-tests/BBR_SCT.dsc index 9c6a10a..529d0d2 100755 --- a/common/sct-tests/sbbr-tests/BBR_SCT.dsc +++ b/common/sct-tests/sbbr-tests/BBR_SCT.dsc @@ -99,8 +99,8 @@ *_*_AARCH64_PP_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS = --muldefweak - DEBUG_*_*_CC_FLAGS = -DEFI_DEBUG -DACS_VERSION=\"v24.03_2.1.0\" - RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -DACS_VERSION=\"v24.03_2.1.0\" + DEBUG_*_*_CC_FLAGS = -DEFI_DEBUG + RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG [Libraries] SctPkg/Library/SctLib/SctLib.inf diff --git a/common/sct-tests/sbbr-tests/BBR_SCT_arm.dsc b/common/sct-tests/sbbr-tests/BBR_SCT_arm.dsc deleted file mode 100755 index 3c21d6f..0000000 --- a/common/sct-tests/sbbr-tests/BBR_SCT_arm.dsc +++ /dev/null @@ -1,619 +0,0 @@ -# -# The material contained herein is not a license, either -# expressly or impliedly, to any intellectual property owned -# or controlled by any of the authors or developers of this -# material or to any contribution thereto. The material -# contained herein is provided on an "AS IS" basis and, to the -# maximum extent permitted by applicable law, this information -# is provided AS IS AND WITH ALL FAULTS, and the authors and -# developers of this material hereby disclaim all other -# warranties and conditions, either express, implied or -# statutory, including, but not limited to, any (if any) -# implied warranties, duties or conditions of merchantability, -# of fitness for a particular purpose, of accuracy or -# completeness of responses, of results, of workmanlike -# effort, of lack of viruses and of lack of negligence, all -# with regard to this material and any contribution thereto. -# Designers must not rely on the absence or characteristics of -# any features or instructions marked "reserved" or -# "undefined." The Unified EFI Forum, Inc. reserves any -# features or instructions so marked for future definition and -# shall have no responsibility whatsoever for conflicts or -# incompatibilities arising from future changes to them. ALSO, -# THERE IS NO WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, -# QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION OR -# NON-INFRINGEMENT WITH REGARD TO THE TEST SUITE AND ANY -# CONTRIBUTION THERETO. -# -# IN NO EVENT WILL ANY AUTHOR OR DEVELOPER OF THIS MATERIAL OR -# ANY CONTRIBUTION THERETO BE LIABLE TO ANY OTHER PARTY FOR -# THE COST OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST -# PROFITS, LOSS OF USE, LOSS OF DATA, OR ANY INCIDENTAL, -# CONSEQUENTIAL, DIRECT, INDIRECT, OR SPECIAL DAMAGES WHETHER -# UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE, ARISING IN ANY -# WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS -# DOCUMENT, WHETHER OR NOT SUCH PARTY HAD ADVANCE NOTICE OF -# THE POSSIBILITY OF SUCH DAMAGES. -# -# Copyright 2006 - 2016 Unified EFI, Inc. All -# Rights Reserved, subject to all existing rights in all -# matters included within this Test Suite, to which United -# EFI, Inc. makes no claim of right. -# -# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
-# -# Copyright (c) 2016-2020, ARM Ltd. All rights reserved.
-# -# -#/*++ -# -# Module Name: -# -# BBR_SCT_arm.dsc -# -# Abstract: -# -# This is a build description file used to build the test modules of BBR SCT. -# -# Notes: -# -# The info in this file is broken down into sections. The start of a section -# is designated by a "[" in the first column. So the [=====] separater ends -# a section. -# -#--*/ - -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ -[Defines] - PLATFORM_NAME = bbrSct - PLATFORM_GUID = d513138b-9d4a-479c-8058-4a5160018663 - PLATFORM_VERSION = 0.1 - DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = Build/bbrSct - SUPPORTED_ARCHITECTURES = AARCH64|ARM - BUILD_TARGETS = DEBUG|RELEASE - SKUID_IDENTIFIER = DEFAULT - - DEFINE GCC_VER_MACRO = -D EFI_SPECIFICATION_VERSION=0x00020028 -D TIANO_RELEASE_VERSION=0x00080006 - DEFINE MSFT_VER_MACRO = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 - - -################################################################################ -# -# SKU Identification section - list of all SKU IDs supported by this -# Platform. -# -################################################################################ -[SkuIds] - 0|DEFAULT # The entry: 0|DEFAULT is reserved and always required. - -[BuildOptions] - *_*_AARCH64_CC_FLAGS = -D EFIAARCH64 -I$(WORKSPACE)/MdePkg/Include/AArch64 $(GCC_VER_MACRO) - GCC:*_*_AARCH64_CC_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error - *_*_AARCH64_VFRPP_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) - *_*_AARCH64_APP_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) - *_*_AARCH64_PP_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) - RVCT:*_*_AARCH64_DLINK_FLAGS = --muldefweak - - #TODO: OM - fixme RVCT:*_*_ARM_CC_FLAGS = -D EFIARM $(GCC_VER_MACRO) - *_*_ARM_CC_FLAGS = -D EFIARM - GCC:*_*_ARM_CC_FLAGS = -D EFIARM $(GCC_VER_MACRO) -fno-stack-protector -ffreestanding -nostdinc -nostdlib -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=implicit-function-declaration -Wno-error - *_*_ARM_VFRPP_FLAGS = -D EFIARM $(GCC_VER_MACRO) - *_*_ARM_APP_FLAGS = -D EFIARM $(GCC_VER_MACRO) - *_*_ARM_PP_FLAGS = -D EFIARM $(GCC_VER_MACRO) - - RVCT:*_*_ARM_DLINK_FLAGS = --muldefweak -# 167: "argument of type is incompatible with parameter of type # " -# (caused here by passing typed pointers to functions that take "void *" or "void **") -# 1295: "provide arguments" (i.e. `UINTN Function ()` should be `UINTN Function (VOID)`) -# 188: "enumerated type mixed with another type" -# (i.e. passing an integer as an enum without a cast) -# 550: "variable was set but never used" -# 1: "last line of file ends without a newline" -# 68: "integer conversion resulted in a change of sign" ("if (Status == -1)") -# 111: "statement is unreachable" (invariably "break;" after "return X;" in case statement) -# 177: "function was declared but never referenced" - RVCT:*_*_ARM_CC_FLAGS = --diag_remark=167 --diag_suppress=167,1295,188,550,1,68,111,177 - - - DEBUG_*_*_CC_FLAGS = -DEFI_DEBUG -DACS_VERSION=\"v1.0\" - RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -DACS_VERSION=\"v1.0\" - -[Libraries] - SctPkg/Library/SctLib/SctLib.inf - SctPkg/Library/SctGuidLib/SctGuidLib.inf - SctPkg/Library/EfiTestLib/EfiTestLib.inf - - SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf - - MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - -[Libraries.ARM] - ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf - -[Libraries.AARCH64] - ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf - -[LibraryClasses.common] - UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf - UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf - HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - - SctLib|SctPkg/Library/SctLib/SctLib.inf - NetLib|SctPkg/Library/NetLib/NetLib.inf - EntsLib|SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf - EasLib|SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Eas.inf - EfiTestLib|SctPkg/Library/EfiTestLib/EfiTestLib.inf - -[LibraryClasses.ARM] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf - ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf - -[LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf - ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf - -############################################################################### -# -# These are the components that will be built by the master makefile -# -############################################################################### - -[Components] - -# -# The default package -# -DEFINE PACKAGE=Default - -# -# Components -# - -# -# Following are the SCT suite & related drivers -# - -SctPkg/TestInfrastructure/SCT/Framework/Sct.inf -SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.inf -SctPkg/TestInfrastructure/SCT/Drivers/TestProfile/TestProfile.inf -SctPkg/TestInfrastructure/SCT/Drivers/TestRecovery/TestRecovery.inf -SctPkg/TestInfrastructure/SCT/Drivers/TestLogging/TestLogging.inf - -# -# Related SCT applications -# - -SctPkg/Application/InstallSct/InstallSct.inf -SctPkg/Application/StallForKey/StallForKey.inf - -SctPkg/SCRT/SCRTApp/SCRTApp.inf -SctPkg/SCRT/SCRTDriver/SCRTDriver.inf - -# -# Test cases for UEFI SCT and UEFI/EFI SCT -# - -SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_uefi.inf -SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTest_uefi.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.inf -SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTest.inf -SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTest.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.inf - -SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTest.inf -SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTest.inf -SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Bis/BlackBoxTest/BisBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo/BlackBoxTest/BlockIoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/BusSpecificDriverOverride/BlackBoxTest/BusSpecificDriverOverrideBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DebugPort/BlackBoxTest/DebugPortBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/DecompressBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PlatformDriverOverride/BlackBoxTest/PlatformDriverOverrideBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/ScsiIo/BlackBoxTest/ScsiIoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/ExtScsiPassThru/BlackBoxTest/ExtScsiPassThruBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/iScsiInitiatorName/BlackBoxTest/iScsiInitiatorNameBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SerialIo/BlackBoxTest/SerialIoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SimplePointer/BlackBoxTest/SimplePointerBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf -SctPkg/TestCase/UEFI/EFI/Protocol/UnicodeCollation2/BlackBoxTest/UnicodeCollation2BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/UsbIo/BlackBoxTest/UsbIoTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Authentication/BlackBoxTest/AuthenticationBBTest.inf -#SctPkg/TestCase/UEFI/EFI/Protocol/Hash/BlackBoxTest/HashBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Tape/BlackBoxTest/TapeBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HIIImageExBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HIIFontExBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/VlanConfig/BlackBoxTest/VlanConfigBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/IPsec2/BlackBoxTest/IPsec2BBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/AbsolutePointer/BlackBoxTest/AbsolutePointerBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PlatformToDriverConfiguration/BlackBoxTest/PlatformToDriverConfigurationBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/FirmwareManagement/BlackBoxTest/FirmwareManagementBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/AtaPassThru/BlackBoxTest/AtaPassThruBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/StorageSecurityCommand/BlackBoxTest/StorageSecurityCommandBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/AdapterInfo/BlackBoxTest/AdapterInfoProtocolBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/TimeStamp/BlackBoxTest/TimeStampProtocolBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/RandomNumber/BlackBoxTest/RandomNumberBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandlerBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/RamDisk/BlackBoxTest/RamDiskProtocolBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/SDMMCPassThru/BlackBoxTest/SDMMCPassThruBBTest.inf - -SctPkg/TestCase/UEFI/EFI/Protocol/PartitionInfo/BlackBoxTest/PartitionInfoBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTest.inf -SctPkg/TestCase/UEFI/EFI/Protocol/ResetNotification/BlackBoxTest/ResetNotificationBBTest.inf -# -# Dependency files for UEFI/EFI Compliant Test -# - -SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Dependency/Config/Config.inf - -# -# Dependency files for Image Services Test -# - -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/LoadFile/LoadFile.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/Application1/Application1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/Application2/Application2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/Application3/Application3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/Application4/Application4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/BootServicesDriver1/BootServicesDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/BootServicesDriver2/BootServicesDriver2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/BootServicesDriver3/BootServicesDriver3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/BootServicesDriver4/BootServicesDriver4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/BootServicesDriver5/BootServicesDriver5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/BootServicesDriver6/BootServicesDriver6.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/RuntimeServicesDriver1/RuntimeServicesDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/RuntimeServicesDriver2/RuntimeServicesDriver2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/RuntimeServicesDriver3/RuntimeServicesDriver3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/RuntimeServicesDriver4/RuntimeServicesDriver4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/RuntimeServicesDriver5/RuntimeServicesDriver5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/RuntimeServicesDriver6/RuntimeServicesDriver6.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage1/CombinationImage1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage2/CombinationImage2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage3/CombinationImage3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage4/CombinationImage4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage5/CombinationImage5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage6/CombinationImage6.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage7/CombinationImage7.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage8/CombinationImage8.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage9/CombinationImage9.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/CombinationImage10/CombinationImage10.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/ValidHiiImage1/ValidHiiImage1.inf -#SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/VeryLargeImage1/VeryLargeImage1.inf - - -# -# Dependency files for Protocol Handler Services Test -# - -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver1/BusDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver2/BusDriver2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver3/BusDriver3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusDriver4/BusDriver4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver1/DBindingDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver2/DBindingDriver2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver3/DBindingDriver3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver4/DBindingDriver4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DBindingDriver5/DBindingDriver5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver1/DeviceDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver2/DeviceDriver2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver3/DeviceDriver3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver4/DeviceDriver4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver5/DeviceDriver5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver6/DeviceDriver6.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver7/DeviceDriver7.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver11/DeviceDriver11.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver12/DeviceDriver12.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver13/DeviceDriver13.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver14/DeviceDriver14.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver15/DeviceDriver15.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver18/DeviceDriver18.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver19/DeviceDriver19.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver110/DeviceDriver110.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/DeviceDriver111/DeviceDriver111.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver1/TestDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver2/TestDriver2.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver3/TestDriver3.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver4/TestDriver4.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/TestDriver5/TestDriver5.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/PlatformOverrideDriver1/PlatformOverrideDriver1.inf -SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Dependency/BusOverrideDriver1/BusOverrideDriver1.inf - -# -# Dependency files for Decompress Protocol Test -# - -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile1/UncompressedFile1.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/UncompressedFile2/UncompressedFile2.inf -SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf - -# -# Dependency files for EBC Protocol Test -# -SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf - -# -# Dependency files for Loaded Image Protocol Test -# - -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/Dependency/Application1/Application1.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/Dependency/Application2/Application2.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/Dependency/BootServicesDriver1/BootServicesDriver1.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/Dependency/BootServicesDriver2/BootServicesDriver2.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/Dependency/RuntimeServicesDriver1/RuntimeServicesDriver1.inf -SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/Dependency/RuntimeServicesDriver2/RuntimeServicesDriver2.inf - -# -# Dependency files for PCI IO Protocol Test -# - -SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf -SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/MakeConfigWritable/MakeConfigWritable.inf - -# -# Dependency files for PCI Root Bridge IO Protocol Test -# - -SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf - -# -# Dependency files for PXE Base Code Protocol Test -# -SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf - -# -# Dependency files for Config Keyword Handler Protocol Test -# -SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/Dependency/SampleDriver/DriverSampleDxe.inf - -# -# Support Files -# -SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/Eftp.inf -SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.inf -SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.inf -SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.inf - - -# -# Test Cases for RIVL (Only for UEFI SCT) -# - -SctPkg/TestCase/RIVL/BootService/BootServiceENTSTest.inf -SctPkg/TestCase/RIVL/RuntimeService/RuntimeServiceENTSTest.inf -SctPkg/TestCase/RIVL/GenericService/GenericServiceENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf - -SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf -SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf - - -# -# Test cases for SBBR SCT -# - -# Boot Services Tests - SBBR v1.0 Appendix A -# -## 1. EFI_RAISE_TPL -## 2. EFI_RESTORE_TPL -## 3. EFI_CREATE_EVENT -## 4. EFI_SET_TIMER -## 5. EFI_WAIT_FOR_EVENT -## 6. EFI_SIGNAL_EVENT -## 7. EFI_CLOSE_EVENT -## 8. EFI_CREATE_EVENT_EX -#SctPkg/TestCase/UEFI/EFI/BootServices/EventTimerTaskPriorityServices/BlackBoxTest/EventTimerTaskPriorityServicesBBTest_uefi.inf -# -## 9. EFI_IMAGE_LOAD -## 10. EFI_IMAGE_START -## 11. EFI_EXIT -## 12. EFI_IMAGE_UNLOAD -## 13. EFI_EXIT_BOOT_SERVICES -#SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTest.inf -# -## 14. EFI_ALLOCATE_PAGES -## 15. EFI_FREE_PAGES -## 16. EFI_GET_MEMORY_MAP -## 17. EFI_ALLOCATE_POOL -## 18. EFI_FREE_POOL -#SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxTest/MemoryAllocationServicesBBTest.inf -# -## 19. EFI_INSTALL_CONFIGURATION_TABLE -## 20. EFI_GET_NEXT_MONOTONIC_COUNT -## 21. EFI_STALL -## 22. EFI_SET_WATCHDOG_TIMER -## 23. EFI_CALCULATE_CRC32 -## 24. EFI_COPY_MEM -## 25. EFI_SET_MEM -#SctPkg/TestCase/UEFI/EFI/BootServices/MiscBootServices/BlackBoxTest/MiscBootServicesBBTest.inf -# -## 26. EFI_INSTALL_PROTOCOL_INTERFACE -## 27. EFI_REINSTALL_PROTOCOL_INTERFACE -## 28. EFI_UNINSTALL_PROTOCOL_INTERFACE -## 29. EFI_HANDLE_PROTOCOL -## 30. EFI_REGISTER_PROTOCOL_NOTIFY -## 31. EFI_LOCATE_HANDLE -## 32. EFI_LOCATE_PROTOCOL -## 33. EFI_LOCATE_DEVICE_PATH -## 34. EFI_CONNECT_CONTROLLER -## 35. EFI_DISCONNECT_CONTROLLER -## 36. EFI_OPEN_PROTOCOL -## 37. EFI_CLOSE_PROTOCOL -## 38. EFI_OPEN_PROTOCOL_INFORMATION -## 39. EFI_PROTOCOLS_PER_HANDLE -## 40. EFI_LOCATE_HANDLE_BUFFER -## 41. EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES -## 42. EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES -#SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTest.inf - -# End of Boot Services Tests - SBBR v1.0 Appendix A - -# -# UEFI System Environment and Configuration Tests - SBBR v1.0 3.3 -# -# ARM: disabled for ArmReadCurrentEL wich are not available on ArmLib for 32bits -#SctPkg/TestCase/UEFI/EFI/Generic/SbbrSysEnvConfig/BlackBoxTest/SysEnvConfigBBTest.inf -#End of UEFI System Environment and Configuration Tests - SBBR v1.0 3.3 -# -# Check if EFI Specification Version is 2.7 or greater -SctPkg/TestCase/UEFI/EFI/Generic/SbbrEfiSpecVerLvl/BlackBoxTest/EfiSpecVerLvlBBTest.inf -# -# UEFI Boot Services - SBBR v1.0 3.4 -# -## 3.4.4 Configuration Tables -SctPkg/TestCase/UEFI/EFI/BootServices/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTest.inf -# End of UEFI Boot Services - SBBR v1.0 3.4 - - - -# -# Required UEFI Runtime Services Tests - SBBR v1.0 Appendix B -# -## 1. EFI_GET_TIME -## 2. EFI_SET_TIME -## 3. EFI_GET_WAKEUP_TIME -## 4. EFI_SET_WAKEUP_TIME -#SctPkg/TestCase/UEFI/EFI/RuntimeServices/TimeServices/BlackBoxTest/TimeServicesBBTest.inf -# -## 5. EFI_GET_VARIABLE -## 6. EFI_GET_NEXT_VARIABLE_NAME -## 7. EFI_SET_VARIABLE -## 8. EFI_QUERY_VARIABLE_INFO -#SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTest.inf -# -## 9. EFI_QUERY_CAPSULE_CAPABILITIES -## 10. EFI_UPDATE_CAPSULE -## 11. EFI_RESET_SYSTEM -#SctPkg/TestCase/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTest.inf -# -## 12. EFI_SET_VIRTUAL_ADDRESS_MAP -## 13. EFI_CONVERT_POINTER -# -# UEFI Required Protocols Tests - SBBR Appendix C -# -SctPkg/TestCase/UEFI/EFI/Generic/SbbrRequiredUefiProtocols/BlackBoxTest/RequiredUefiProtocolsBBTest.inf -#SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_uefi.inf -## -## Dependency files for UEFI/EFI Compliant Test -## -#SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Dependency/Config/Config.inf -# End of UEFI Required Protocols Tests - SBBR Appendix C - -#SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTest.inf -#SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTest.inf -#SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTest.inf -#SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf - -# -# Support Files -# -#SctPkg/TestInfrastructure/SCT/Framework/ENTS/Eftp/Eftp.inf -#SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/SerialMonitor/SerialMonitor.inf -#SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.inf -#SctPkg/TestInfrastructure/SCT/Framework/ENTS/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.inf diff --git a/common/sct-tests/sbbr-tests/build_bbr_arm.sh b/common/sct-tests/sbbr-tests/build_bbr_arm.sh deleted file mode 100755 index 8c4dfc2..0000000 --- a/common/sct-tests/sbbr-tests/build_bbr_arm.sh +++ /dev/null @@ -1,326 +0,0 @@ -#!/bin/bash -# The material contained herein is not a license, either -# expressly or impliedly, to any intellectual property owned -# or controlled by any of the authors or developers of this -# material or to any contribution thereto. The material -# contained herein is provided on an "AS IS" basis and, to the -# maximum extent permitted by applicable law, this information -# is provided AS IS AND WITH ALL FAULTS, and the authors and -# developers of this material hereby disclaim all other -# warranties and conditions, either express, implied or -# statutory, including, but not limited to, any (if any) -# implied warranties, duties or conditions of merchantability, -# of fitness for a particular purpose, of accuracy or -# completeness of responses, of results, of workmanlike -# effort, of lack of viruses and of lack of negligence, all -# with regard to this material and any contribution thereto. -# Designers must not rely on the absence or characteristics of -# any features or instructions marked "reserved" or -# "undefined." The Unified EFI Forum, Inc. reserves any -# features or instructions so marked for future definition and -# shall have no responsibility whatsoever for conflicts or -# incompatibilities arising from future changes to them. ALSO, -# THERE IS NO WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, -# QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION OR -# NON-INFRINGEMENT WITH REGARD TO THE TEST SUITE AND ANY -# CONTRIBUTION THERETO. -# -# IN NO EVENT WILL ANY AUTHOR OR DEVELOPER OF THIS MATERIAL OR -# ANY CONTRIBUTION THERETO BE LIABLE TO ANY OTHER PARTY FOR -# THE COST OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST -# PROFITS, LOSS OF USE, LOSS OF DATA, OR ANY INCIDENTAL, -# CONSEQUENTIAL, DIRECT, INDIRECT, OR SPECIAL DAMAGES WHETHER -# UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE, ARISING IN ANY -# WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS -# DOCUMENT, WHETHER OR NOT SUCH PARTY HAD ADVANCE NOTICE OF -# THE POSSIBILITY OF SUCH DAMAGES. -# -# Copyright 2006 - 2015 Unified EFI, Inc. All -# Rights Reserved, subject to all existing rights in all -# matters included within this Test Suite, to which United -# EFI, Inc. makes no claim of right. -# -# Copyright (c) 2011, 2015-2020 ARM Ltd. All rights reserved.
-# - -SctpackageDependencyList=(SctPkg BaseTools) - -function get_build_arch -{ - case `uname -m` in - aarch64*) - BUILD_ARCH=AARCH64;; - *) - BUILD_ARCH=other;; - esac -} - -function set_cross_compile -{ - get_build_arch - - echo "Target: $SCT_TARGET_ARCH" - echo "Build: $BUILD_ARCH" - if [ "$SCT_TARGET_ARCH" = "$BUILD_ARCH" ]; then - TEMP_CROSS_COMPILE= - elif [ "$SCT_TARGET_ARCH" == "AARCH64" ]; then - if [ X"$CROSS_COMPILE_64" != X"" ]; then - TEMP_CROSS_COMPILE="$CROSS_COMPILE_64" - else - TEMP_CROSS_COMPILE=aarch64-linux-gnu- - fi - elif [ "$SCT_TARGET_ARCH" == "ARM" ]; then - if [ X"$CROSS_COMPILE_32" != X"" ]; then - TEMP_CROSS_COMPILE="$CROSS_COMPILE_32" - else - TEMP_CROSS_COMPILE=arm-linux-gnueabihf- - fi - else - echo "Unsupported target architecture '$SCT_TARGET_ARCH'!" >&2 - fi -} - -function get_gcc_version -{ - gcc_version=$($1 -dumpversion) - - if [ ${gcc_version%%.*} -ge 5 ]; then - gcc_version=5 - fi - - case $gcc_version in - 4.6*|4.7*|4.8*|4.9*|5*) - echo GCC$(echo ${gcc_version} | awk -F. '{print $1$2}') - ;; - *) - echo "Unknown toolchain version '$gcc_version'" >&2 - echo "Attempting to build using GCC49 profile." >&2 - echo GCC49 - ;; - esac -} - -function get_clang_version -{ - clang_version=`$1 --version | head -1 | sed 's/^.*version\s*\([0-9]*\).\([0-9]*\).*/\1\2/g'` - echo "CLANG$clang_version" -} - - -GetBaseToolsBinSubDir() { - # - # Figure out a uniq directory name from the uname command - # - UNAME_DIRNAME=`uname -sm` - UNAME_DIRNAME=${UNAME_DIRNAME// /-} - UNAME_DIRNAME=${UNAME_DIRNAME//\//-} - echo $UNAME_DIRNAME -} - -GetEdkToolsPathBinDirectory() { - # - # Figure out a uniq directory name from the uname - # command - # - BIN_SUB_DIR=`GetBaseToolsBinSubDir` - - if [ -e $EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR ] - then - EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR - else - EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/BinWrappers/PosixLike - fi - echo $EDK_TOOLS_PATH_BIN -} - -PrintUsage() { - # - #Print Help - # - echo "Usage:" - echo " $0 \ - \ -[build type (RELEASE OR DEBUG, DEFAULT: DEBUG)]" -} - -#Iterate through the SCT package dependency list and check if they exist in the current directory -for pkg in ${names[@]} -do - if [ ! -d `pwd`/$name] - then - echo "Couldn't build SCT:" - echo The directory `pwd`/$name does not exist. - exit -1 - fi -done - -export EFI_SOURCE=`pwd` - -# check if the last command was successful -status=$? -if test $status -ne 0; then - echo Could not Run the edksetup.sh script - exit -1 -fi - -SCT_TARGET_ARCH=${1} - -# -# Pick a default tool type for a given OS -# -case `uname` in - Linux*) - case ${2} in - RVCT | rvct) - TARGET_TOOLS=RVCTLINUX - ;; - - ARMGCC | armgcc) - TARGET_TOOLS=ARMGCC - ;; - - GCC | gcc) - set_cross_compile - CROSS_COMPILE="$TEMP_CROSS_COMPILE" - export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc` - - ;; - - *) - echo "Couldn't build BBR SCT:" - PrintUsage - exit -1 - ;; - esac - ;; - CYGWIN*) - case ${2} in - RVCT | rvct) - TARGET_TOOLS=RVCT31CYGWIN - ;; - - ARMGCC | armgcc) - TARGET_TOOLS=ARMGCCCYGWIN - ;; - - *) - echo "Couldn't build BBR SCT:" - PrintUsage - exit -1 - ;; - esac - ;; - *) - echo "Couldn't build BBR SCT:" - echo "Unknown OS, Use this script either in Unix or Cygwin environment". - PrintUsage - exit -1 - ;; -esac - -echo "TOOLCHAIN is ${TARGET_TOOLS}" -export ${TARGET_TOOLS}_${SCT_TARGET_ARCH}_PREFIX=$CROSS_COMPILE -echo "Toolchain prefix: ${TARGET_TOOLS}_${SCT_TARGET_ARCH}_PREFIX=$CROSS_COMPILE" - -SCT_BUILD=DEBUG -if [ "$3" = "RELEASE" -o "$3" = "DEBUG" ]; then - SCT_BUILD=$3 - shift -fi - -# -# Setup workspace if it is not set -# -if [ -z "${WORKSPACE:-}" ]; then - echo Initializing workspace - # Uses an external BaseTools project - # Uses the BaseTools in edk2 - export WORKSPACE=$PWD - export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/SctPkg - # We do not pass BuildArmSct.sh arguments to edksetup.sh - while (( "$#" )); do - shift - done - pwd - . edk2/edksetup.sh -else - echo Building from: $WORKSPACE -fi - -if [[ ! -e $EDK_TOOLS_PATH/Source/C/bin ]] -then - # build the tools if they don't yet exist - echo Building tools: $EDK_TOOLS_PATH - make -C $EDK_TOOLS_PATH - status=$? - if test $status -ne 0 - then - echo Error while building EDK tools - exit -1 - fi -else - echo using prebuilt tools -fi - -rm -f $EDK_TOOLS_PATH/Source/C/bin/GenBin - -# build the GenBin if it doesn't yet exist -echo Building GenBin -make -C SctPkg/Tools/Source/GenBin -status=$? -if test $status -ne 0 -then -echo Error while building GenBin - exit -1 -fi - -# Copy GenBin file to Base tools bin directory -DEST_DIR=`GetEdkToolsPathBinDirectory` -# Ensure the directory exist -mkdir -p $DEST_DIR -cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin - -# -# Build the SCT package -# -build -p SctPkg/UEFI/BBR_SCT_arm.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9 - -# Check if there is any error -status=$? -if test $status -ne 0 -then -echo Could not build the BBR SCT package - exit -1 -fi - -# -# If the argument is clean, then don't have to generate Sct binary. -# -for arg in "$@" -do - if [ $arg == clean ] || [ $arg == cleanall ] - then - # no need to post process if we are doing a clean - exit 1 - fi -done - -# -# Change directory to Build directory -# -cd Build/bbrSct/${SCT_BUILD}_${TARGET_TOOLS} -pwd - -# -# Run a script to generate Sct binary for the target architecture -# -../../../SctPkg/CommonGenFramework.sh bbr_sct $SCT_TARGET_ARCH Install$SCT_TARGET_ARCH.efi - -status=$? -if test $status -ne 0 -then -echo Could not generate BBR SCT binary - exit -1 -else -echo The BBR SCT binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/bbrSct/${SCT_BUILD}_${TARGET_TOOLS}" -fi diff --git a/ebbr/config/EBBR-arm.seq b/ebbr/config/EBBR-arm.seq deleted file mode 100755 index 00f96ad..0000000 Binary files a/ebbr/config/EBBR-arm.seq and /dev/null differ diff --git a/ebbr/config/EBBRStartup.nsh b/ebbr/config/EBBRStartup.nsh index 3dde46e..3ab019c 100755 --- a/ebbr/config/EBBRStartup.nsh +++ b/ebbr/config/EBBRStartup.nsh @@ -1,41 +1,32 @@ -# Copyright (c) 2021, 2023 ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +#!/usr/bin/env bash + +# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved. +# SPDX-License-Identifier : Apache-2.0 # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# 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 # -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# 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. +## + echo -off for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F - if exist FS%i:\EFI\BOOT\bbr\SCT then + if exist FS%i:\acs_tests\bbr\SCT then # # Found EFI SCT harness # FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT - echo Press any key to stop the EFI SCT running + cd FS%i:\acs_tests\bbr\SCT + echo "Press any key to stop the EFI SCT running" stallforkey.efi 5 if %lasterror% == 0 then goto Done @@ -46,7 +37,9 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F #Check if SCT run has already completed if exist FS%j:\acs_results\sct_results\Overall\Summary.log then - echo SCT has completed run. Press any key to start SCT execution from the beginning. WARNING: Ensure you have backed up the existing logs. + echo "SCT has completed run." + echo "Press any key to start SCT execution from the beginning." + echo "WARNING: Ensure you have backed up the existing logs." stallforkey.efi 5 if %lasterror% == 0 then #Backup the existing logs @@ -60,14 +53,14 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F endif endif - if exist FS%i:\EFI\BOOT\bbr\SCT\.passive.mode then - if exist FS%i:\EFI\BOOT\bbr\SCT\.verbose.mode then + if exist FS%i:\acs_tests\bbr\SCT\.passive.mode then + if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then Sct -c -p mnp -v else Sct -c -p mnp endif else - if exist FS%i:\EFI\BOOT\bbr\SCT\.verbose.mode then + if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then Sct -c -v else Sct -c @@ -75,18 +68,18 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F #SCT execution has finished. Copy the logs to acs_results if exist FS%j:\acs_results\sct_results\ then - if exist FS%i:\EFI\BOOT\bbr\SCT\Overall then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Overall FS%j:\acs_results\sct_results\ + if exist FS%i:\acs_tests\bbr\SCT\Overall then + cp -r FS%i:\acs_tests\bbr\SCT\Overall FS%j:\acs_results\sct_results\ endif - if exist FS%i:\EFI\BOOT\bbr\SCT\Dependency\EfiCompliantBBTest then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Dependency\EfiCompliantBBTest FS%j:\acs_results\sct_results\ + if exist FS%i:\acs_tests\bbr\SCT\Dependency\EfiCompliantBBTest then + cp -r FS%i:\acs_tests\bbr\SCT\Dependency\EfiCompliantBBTest FS%j:\acs_results\sct_results\ endif - if exist FS%i:\EFI\BOOT\bbr\SCT\Sequence then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Sequence FS%j:\acs_results\sct_results\ + if exist FS%i:\acs_tests\bbr\SCT\Sequence then + cp -r FS%i:\acs_tests\bbr\SCT\Sequence FS%j:\acs_results\sct_results\ endif #Restart to avoid an impact of running SCT tests on rest of the suites - echo Reset the system ... + echo "Reset the system ..." reset endif #goto Done @@ -97,7 +90,7 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F cd FS%j:\acs_results mkdir sct_results FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT + cd FS%i:\acs_tests\bbr\SCT if %1 == sct_extd then echo "Starting extended run of SCT" Sct -s EBBR_extd_run.seq diff --git a/ebbr/config/IR_VER.patch b/ebbr/patches/ACS_VER_fwts.patch similarity index 100% rename from ebbr/config/IR_VER.patch rename to ebbr/patches/ACS_VER_fwts.patch diff --git a/ebbr/patches/sctversion.patch b/ebbr/patches/sctversion.patch new file mode 100644 index 0000000..a4545f9 --- /dev/null +++ b/ebbr/patches/sctversion.patch @@ -0,0 +1,12 @@ +diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +index 94cae289..5934db2d 100644 +--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c ++++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +@@ -30,6 +30,7 @@ Abstract: + #include "StandardTest.h" + #include + ++#define ACS_VERSION "SystemReady devicetree ACS v3.0.0\nBBR ACS v1.0.6 (EBBR)" + static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 }; + + // diff --git a/ebbr/patches/standalone_ebbr_ver.patch b/ebbr/patches/standalone_ebbr_ver.patch new file mode 100644 index 0000000..f0ab8cc --- /dev/null +++ b/ebbr/patches/standalone_ebbr_ver.patch @@ -0,0 +1,12 @@ +diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +index 94cae289..3685f025 100644 +--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c ++++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +@@ -30,6 +30,7 @@ Abstract: + #include "StandardTest.h" + #include + ++#define ACS_VERSION "BBR ACS 2.2.0-BETA0 (EBBR)" + static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 }; + + // diff --git a/ebbr/scripts/build-scripts/build_ebbr.sh b/ebbr/scripts/build-scripts/build_ebbr.sh index 51e50e0..a8b94d5 100755 --- a/ebbr/scripts/build-scripts/build_ebbr.sh +++ b/ebbr/scripts/build-scripts/build_ebbr.sh @@ -1,32 +1,20 @@ #!/usr/bin/env bash -# Copyright (c) 2021, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2021, 2024, Arm Limited or its affiliates. All rights reserved. +# SPDX-License-Identifier : Apache-2.0 # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# 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 # -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# 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` @@ -39,7 +27,7 @@ create_scripts_link() elif [[ $1 = "sct" ]]; then ln -s $TOP_DIR/../../common/scripts/build-sct.sh $TOP_DIR/build-scripts/build-sct.sh else - ln -s $TOP_DIR/../../common/scripts/build-sct.sh $TOP_DIR/build-scripts/build-sct.sh + ln -s $TOP_DIR/../../common/scripts/build-sct.sh $TOP_DIR/build-scripts/build-sct.sh ln -s $TOP_DIR/../../common/scripts/build-fwts.sh $TOP_DIR/build-scripts/build-fwts.sh fi ln -s $TOP_DIR/../../common/scripts/build-uefi-apps.sh $TOP_DIR/build-scripts/build-uefi-apps.sh @@ -54,13 +42,15 @@ init_dir() create_scripts_link init_dir - if [[ $1 = "fwts" ]]; then - source ./build-scripts/build-fwts.sh IR S + source ./build-scripts/build-fwts.sh EBBR S elif [[ $1 = "sct" ]]; then - source ./build-scripts/build-sct.sh IR S + source ./build-scripts/build-sct.sh EBBR S else - source ./build-scripts/build-fwts.sh IR S - source ./build-scripts/build-sct.sh IR S + source ./build-scripts/build-fwts.sh EBBR S + source ./build-scripts/build-sct.sh EBBR S fi -source ./build-scripts/build-uefi-apps.sh IR S + +source ./build-scripts/build-uefi-apps.sh EBBR S + +TOP_DIR=`pwd` diff --git a/sbbr/config/SBBRStartup.nsh b/sbbr/config/SBBRStartup.nsh index ef1f3b2..13d229c 100755 --- a/sbbr/config/SBBRStartup.nsh +++ b/sbbr/config/SBBRStartup.nsh @@ -1,41 +1,32 @@ -# Copyright (c) 2021, 2023 ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. +#!/usr/bin/env bash + +# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved. +# SPDX-License-Identifier : Apache-2.0 # -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# 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 # -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# 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. +## + echo -off for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F - if exist FS%i:\EFI\BOOT\bbr\SCT then + if exist FS%i:\acs_tests\bbr\SCT then # # Found EFI SCT harness # FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT - echo Press any key to stop the EFI SCT running + cd FS%i:\acs_tests\bbr\SCT + echo "Press any key to stop the EFI SCT running" stallforkey.efi 5 if %lasterror% == 0 then goto Done @@ -46,7 +37,9 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F #Check if SCT run has already completed if exist FS%j:\acs_results\sct_results\Overall\Summary.log then - echo SCT has completed run. Press any key to start SCT execution from the beginning. WARNING: Ensure you have backed up the existing logs. + echo "SCT has completed run." + echo "Press any key to start SCT execution from the beginning." + echo "WARNING: Ensure you have backed up the existing logs." stallforkey.efi 5 if %lasterror% == 0 then #Backup the existing logs @@ -60,14 +53,14 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F endif endif - if exist FS%i:\EFI\BOOT\bbr\SCT\.passive.mode then - if exist FS%i:\EFI\BOOT\bbr\SCT\.verbose.mode then + if exist FS%i:\acs_tests\bbr\SCT\.passive.mode then + if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then Sct -c -p mnp -v else Sct -c -p mnp endif else - if exist FS%i:\EFI\BOOT\bbr\SCT\.verbose.mode then + if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then Sct -c -v else Sct -c @@ -75,18 +68,18 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F #SCT execution has finished. Copy the logs to acs_results if exist FS%j:\acs_results\sct_results\ then - if exist FS%i:\EFI\BOOT\bbr\SCT\Overall then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Overall FS%j:\acs_results\sct_results\ + if exist FS%i:\acs_tests\bbr\SCT\Overall then + cp -r FS%i:\acs_tests\bbr\SCT\Overall FS%j:\acs_results\sct_results\ endif - if exist FS%i:\EFI\BOOT\bbr\SCT\Dependency\EfiCompliantBBTest then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Dependency\EfiCompliantBBTest FS%j:\acs_results\sct_results\ + if exist FS%i:\acs_tests\bbr\SCT\Dependency\EfiCompliantBBTest then + cp -r FS%i:\acs_tests\bbr\SCT\Dependency\EfiCompliantBBTest FS%j:\acs_results\sct_results\ endif - if exist FS%i:\EFI\BOOT\bbr\SCT\Sequence then - cp -r FS%i:\EFI\BOOT\bbr\SCT\Sequence FS%j:\acs_results\sct_results\ + if exist FS%i:\acs_tests\bbr\SCT\Sequence then + cp -r FS%i:\acs_tests\bbr\SCT\Sequence FS%j:\acs_results\sct_results\ endif #Restart to avoid an impact of running SCT tests on rest of the suites - echo Reset the system ... + echo "Reset the system ..." reset endif #goto Done @@ -97,7 +90,7 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F cd FS%j:\acs_results mkdir sct_results FS%i: - cd FS%i:\EFI\BOOT\bbr\SCT + cd FS%i:\acs_tests\bbr\SCT if %1 == sct_extd then echo "Starting extended run of SCT" Sct -s SBBR_extd_run.seq diff --git a/sbbr/config/ES_VER.patch b/sbbr/patches/ACS_VER_fwts.patch similarity index 91% rename from sbbr/config/ES_VER.patch rename to sbbr/patches/ACS_VER_fwts.patch index d4f035a..266942d 100644 --- a/sbbr/config/ES_VER.patch +++ b/sbbr/patches/ACS_VER_fwts.patch @@ -1,5 +1,5 @@ diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c -index 1f139a7..421012d 100644 +index 1f139a7..458ba1b 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -33,6 +33,9 @@ @@ -7,7 +7,7 @@ index 1f139a7..421012d 100644 #include "fwts_pm_method.h" + -+#define ACS_VERSION "v1.3.0" ++#define ACS_VERSION "v2.1.0" + typedef struct { const char *title; /* Test category */ diff --git a/sbbr/patches/sctversion.patch b/sbbr/patches/sctversion.patch new file mode 100644 index 0000000..8bf4e5d --- /dev/null +++ b/sbbr/patches/sctversion.patch @@ -0,0 +1,12 @@ +diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +index 94cae289..5934db2d 100644 +--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c ++++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +@@ -30,6 +30,7 @@ Abstract: + #include "StandardTest.h" + #include + ++#define ACS_VERSION "SystemReady ACS v3.0.0\nBBR ACS v1.0.5 (SBBR)" + static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 }; + + // diff --git a/sbbr/patches/standalone_sbbr_ver.patch b/sbbr/patches/standalone_sbbr_ver.patch new file mode 100644 index 0000000..05c2ead --- /dev/null +++ b/sbbr/patches/standalone_sbbr_ver.patch @@ -0,0 +1,12 @@ +diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +index 94cae289..1a8bb233 100644 +--- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c ++++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Drivers/StandardTest/StandardTest.c +@@ -30,6 +30,7 @@ Abstract: + #include "StandardTest.h" + #include + ++#define ACS_VERSION "BBR ACS 2.1.0-BETA0 (SBBR)" + static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 }; + + // diff --git a/sbbr/scripts/build-scripts/build_sbbr.sh b/sbbr/scripts/build-scripts/build_sbbr.sh index 420ce00..5afdf07 100755 --- a/sbbr/scripts/build-scripts/build_sbbr.sh +++ b/sbbr/scripts/build-scripts/build_sbbr.sh @@ -43,11 +43,11 @@ create_scripts_link init_dir if [[ $1 = "fwts" ]]; then - source ./build-scripts/build-fwts.sh ES S + source ./build-scripts/build-fwts.sh SBBR S elif [[ $1 = "sct" ]]; then - source ./build-scripts/build-sct.sh ES S + source ./build-scripts/build-sct.sh SBBR S else - source ./build-scripts/build-fwts.sh ES S - source ./build-scripts/build-sct.sh ES S + source ./build-scripts/build-fwts.sh SBBR S + source ./build-scripts/build-sct.sh SBBR S fi -source ./build-scripts/build-uefi-apps.sh ES S +source ./build-scripts/build-uefi-apps.sh SBBR S