From 1c7af941a0148db3adeb5a4dffc72ebd12431707 Mon Sep 17 00:00:00 2001 From: Amrathesh Date: Mon, 22 Dec 2025 11:00:48 +0000 Subject: [PATCH 1/2] Rename PAL/VAL INF files to drop Unified prefix - Rename PAL/VAL INF files and update BASE_NAME/LIBRARY_CLASS to match - Refresh all apps INF library references to PalLib/ValLib/ValLibRB - Update edk2 and mem_test patches to new INF paths and names Signed-off-by: Amrathesh Change-Id: Ibbb9ee65317bc2329cadc049b7844ec133585493 --- apps/uefi/Bsa.inf | 4 +- apps/uefi/Drtm.inf | 4 +- apps/uefi/Mem.inf | 4 +- apps/uefi/Mpam.inf | 4 +- apps/uefi/Pfdi.inf | 4 +- apps/uefi/Sbsa.inf | 4 +- apps/uefi/Unified.inf | 4 +- apps/uefi/Vbsa.inf | 4 +- apps/uefi/pc_bsa.inf | 4 +- mem_test/patches/mem_test_edk2.patch | 82 +++++++++---------- .../{UnifiedPalLib.inf => PalLib.inf} | 5 +- pal/uefi_dt/{UnifiedPalLib.inf => PalLib.inf} | 3 +- patches/edk2_bsa_acpi.patch | 6 +- patches/edk2_bsa_dt.patch | 24 +++--- patches/edk2_drtm.patch | 6 +- patches/edk2_mpam.patch | 6 +- patches/edk2_pcbsa.patch | 17 ++-- patches/edk2_pfdi.patch | 10 +-- patches/edk2_sbsa.patch | 14 ++-- patches/edk2_unified_acpi.patch | 14 ++-- patches/edk2_vbsa.patch | 6 +- val/{UnifiedValLib.inf => ValLib.inf} | 4 +- val/{UnifiedValLibRB.inf => ValLibRB.inf} | 6 +- 23 files changed, 107 insertions(+), 132 deletions(-) rename pal/uefi_acpi/{UnifiedPalLib.inf => PalLib.inf} (94%) rename pal/uefi_dt/{UnifiedPalLib.inf => PalLib.inf} (98%) rename val/{UnifiedValLib.inf => ValLib.inf} (94%) rename val/{UnifiedValLibRB.inf => ValLibRB.inf} (92%) diff --git a/apps/uefi/Bsa.inf b/apps/uefi/Bsa.inf index be641989..8f148103 100644 --- a/apps/uefi/Bsa.inf +++ b/apps/uefi/Bsa.inf @@ -315,8 +315,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/Drtm.inf b/apps/uefi/Drtm.inf index 44fe1710..e8173634 100644 --- a/apps/uefi/Drtm.inf +++ b/apps/uefi/Drtm.inf @@ -69,8 +69,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/Mem.inf b/apps/uefi/Mem.inf index 2cc9b873..d2401aab 100644 --- a/apps/uefi/Mem.inf +++ b/apps/uefi/Mem.inf @@ -185,8 +185,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib LibCFlat UefiLib ShellLib diff --git a/apps/uefi/Mpam.inf b/apps/uefi/Mpam.inf index 1ed29539..e2241094 100644 --- a/apps/uefi/Mpam.inf +++ b/apps/uefi/Mpam.inf @@ -68,8 +68,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/Pfdi.inf b/apps/uefi/Pfdi.inf index 6309e857..640828a5 100644 --- a/apps/uefi/Pfdi.inf +++ b/apps/uefi/Pfdi.inf @@ -58,8 +58,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/Sbsa.inf b/apps/uefi/Sbsa.inf index a255ef0b..9b4bda18 100644 --- a/apps/uefi/Sbsa.inf +++ b/apps/uefi/Sbsa.inf @@ -320,8 +320,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/Unified.inf b/apps/uefi/Unified.inf index f1d8321e..e3b79ab3 100644 --- a/apps/uefi/Unified.inf +++ b/apps/uefi/Unified.inf @@ -316,8 +316,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/Vbsa.inf b/apps/uefi/Vbsa.inf index 871b7f37..54d8fcac 100644 --- a/apps/uefi/Vbsa.inf +++ b/apps/uefi/Vbsa.inf @@ -318,8 +318,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/apps/uefi/pc_bsa.inf b/apps/uefi/pc_bsa.inf index e457404d..8881575c 100644 --- a/apps/uefi/pc_bsa.inf +++ b/apps/uefi/pc_bsa.inf @@ -318,8 +318,8 @@ ShellPkg/ShellPkg.dec [LibraryClasses] - UnifiedValLib - UnifiedPalLib + ValLib + PalLib UefiLib ShellLib DebugLib diff --git a/mem_test/patches/mem_test_edk2.patch b/mem_test/patches/mem_test_edk2.patch index c5bd8699..720a11bb 100644 --- a/mem_test/patches/mem_test_edk2.patch +++ b/mem_test/patches/mem_test_edk2.patch @@ -3,56 +3,56 @@ index 9f27e83bb0..79e8c9f023 100644 --- a/BaseTools/Scripts/GccBase.lds +++ b/BaseTools/Scripts/GccBase.lds @@ -21,6 +21,7 @@ SECTIONS { - . = PECOFF_HEADER_SIZE; - - .text : ALIGN(CONSTANT(COMMONPAGESIZE)) { -+ _textbsa = .; - *(.text .text.* .stub .gnu.linkonce.t.*) - *(.rodata .rodata.* .gnu.linkonce.r.*) - *(.got .got.*) + . = PECOFF_HEADER_SIZE; + + .text : ALIGN(CONSTANT(COMMONPAGESIZE)) { ++ _textbsa = .; + *(.text .text.* .stub .gnu.linkonce.t.*) + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.got .got.*) diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c index 17e48443ac..a2b3adefdf 100644 --- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c +++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c @@ -16,6 +16,9 @@ - #include - #include - -+EFI_SYSTEM_TABLE *mySystemTable; -+EFI_HANDLE myImageHandle; -+ - /** - UEFI entry point for an application that will in turn call the - ShellAppMain function which has parameters similar to a standard C + #include + #include + ++EFI_SYSTEM_TABLE *mySystemTable; ++EFI_HANDLE myImageHandle; ++ + /** + UEFI entry point for an application that will in turn call the + ShellAppMain function which has parameters similar to a standard C @@ -51,6 +54,9 @@ ShellCEntryLib ( - EfiShellParametersProtocol = NULL; - EfiShellInterface = NULL; - -+ mySystemTable = SystemTable; -+ myImageHandle = ImageHandle; -+ - Status = SystemTable->BootServices->OpenProtocol ( - ImageHandle, - &gEfiShellParametersProtocolGuid, + EfiShellParametersProtocol = NULL; + EfiShellInterface = NULL; + ++ mySystemTable = SystemTable; ++ myImageHandle = ImageHandle; ++ + Status = SystemTable->BootServices->OpenProtocol ( + ImageHandle, + &gEfiShellParametersProtocolGuid, diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index 557b0ec0f3..bccbed89b5 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -27,6 +27,9 @@ - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLib.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf -+ LibCFlat|ShellPkg/Application/sysarch-acs/mem_test/LibCFlat.inf - !if $(TARGET) == RELEASE - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - !else + UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf + UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLib.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf ++ LibCFlat|ShellPkg/Application/sysarch-acs/mem_test/LibCFlat.inf + !if $(TARGET) == RELEASE + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + !else @@ -102,6 +105,7 @@ - ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf - ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf - ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf -+ ShellPkg/Application/sysarch-acs/apps/uefi/Mem.inf - - ShellPkg/Application/Shell/Shell.inf { - + ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf + ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf + ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf ++ ShellPkg/Application/sysarch-acs/apps/uefi/Mem.inf + + ShellPkg/Application/Shell/Shell.inf { + diff --git a/pal/uefi_acpi/UnifiedPalLib.inf b/pal/uefi_acpi/PalLib.inf similarity index 94% rename from pal/uefi_acpi/UnifiedPalLib.inf rename to pal/uefi_acpi/PalLib.inf index 80bcbb3d..00543e82 100644 --- a/pal/uefi_acpi/UnifiedPalLib.inf +++ b/pal/uefi_acpi/PalLib.inf @@ -18,11 +18,11 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = UnifiedPalLib + BASE_NAME = PalLib FILE_GUID = 1c1e3192-7dc7-4413-b6d7-d58bf37e1231 MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 - LIBRARY_CLASS = UnifiedPalLib|UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = PalLib|UEFI_APPLICATION UEFI_DRIVER [Sources.common] src/AArch64/ArmSmc.S src/AArch64/AcsTestInfra.S @@ -82,4 +82,3 @@ [BuildOptions] GCC:*_*_*_ASM_FLAGS = -march=armv8.2-a GCC:*_*_*_CC_FLAGS = -O0 -I${ACS_PATH}/pal/baremetal/target/RDN2/include/ - diff --git a/pal/uefi_dt/UnifiedPalLib.inf b/pal/uefi_dt/PalLib.inf similarity index 98% rename from pal/uefi_dt/UnifiedPalLib.inf rename to pal/uefi_dt/PalLib.inf index 52dc9067..c6b4f16f 100644 --- a/pal/uefi_dt/UnifiedPalLib.inf +++ b/pal/uefi_dt/PalLib.inf @@ -18,7 +18,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = UnifiedPalLib + BASE_NAME = PalLib FILE_GUID = 7f2093fb-2e69-46eb-af52-ba1df42f6195 MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 @@ -82,4 +82,3 @@ [BuildOptions] GCC:*_*_*_ASM_FLAGS = -march=armv8.2-a GCC:*_*_*_CC_FLAGS = -O0 -I${ACS_PATH}/pal/baremetal/target/RDN2/include/ -I$(WORKSPACE)/MdePkg/Library/BaseFdtLib/libfdt/libfdt - diff --git a/patches/edk2_bsa_acpi.patch b/patches/edk2_bsa_acpi.patch index 66913d13..021ca97f 100644 --- a/patches/edk2_bsa_acpi.patch +++ b/patches/edk2_bsa_acpi.patch @@ -1,13 +1,11 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8..ac3f818 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -66,6 +66,8 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLibRB.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLibRB.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF diff --git a/patches/edk2_bsa_dt.patch b/patches/edk2_bsa_dt.patch index b1bdcde1..d0036eeb 100644 --- a/patches/edk2_bsa_dt.patch +++ b/patches/edk2_bsa_dt.patch @@ -1,8 +1,6 @@ -diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c -index f0a8b9fe62..e41e0de3e0 100644 ---- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c -+++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c -@@ -90,8 +90,8 @@ UefiHiiServicesLibConstructor ( +--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c ++++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c +@@ -90,8 +90,8 @@ // // Retrieve the pointer to the UEFI HII Config Routing Protocol // @@ -13,21 +11,19 @@ index f0a8b9fe62..e41e0de3e0 100644 // // Retrieve the pointer to the optional UEFI HII Font Protocol -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 94d95de0eb..797d6abe16 100644 ---- a/ShellPkg/ShellPkg.dsc -+++ b/ShellPkg/ShellPkg.dsc -@@ -66,6 +66,9 @@ +--- a/ShellPkg/ShellPkg.dsc ++++ b/ShellPkg/ShellPkg.dsc +@@ -66,6 +66,9 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf + BaseFdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLibRB.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_dt/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLibRB.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_dt/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF -@@ -93,6 +96,7 @@ +@@ -93,6 +96,7 @@ ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf @@ -35,7 +31,7 @@ index 94d95de0eb..797d6abe16 100644 ShellPkg/Application/Shell/Shell.inf { -@@ -157,4 +161,4 @@ +@@ -157,4 +161,4 @@ ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyApp.inf [BuildOptions] diff --git a/patches/edk2_drtm.patch b/patches/edk2_drtm.patch index fc0a44ee..e6291911 100644 --- a/patches/edk2_drtm.patch +++ b/patches/edk2_drtm.patch @@ -1,13 +1,11 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8..237d348 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -66,6 +66,8 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLib.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLib.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF diff --git a/patches/edk2_mpam.patch b/patches/edk2_mpam.patch index 8dd5ef18..20c3d818 100644 --- a/patches/edk2_mpam.patch +++ b/patches/edk2_mpam.patch @@ -1,13 +1,11 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8280..c68e9d4f36 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -66,6 +66,8 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLib.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLib.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF diff --git a/patches/edk2_pcbsa.patch b/patches/edk2_pcbsa.patch index 5442a526..ed157d67 100644 --- a/patches/edk2_pcbsa.patch +++ b/patches/edk2_pcbsa.patch @@ -1,22 +1,19 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8280..ac7bf6c9a1 100644 ---- a/ShellPkg/ShellPkg.dsc -+++ b/ShellPkg/ShellPkg.dsc -@@ -27,6 +27,8 @@ +--- a/ShellPkg/ShellPkg.dsc ++++ b/ShellPkg/ShellPkg.dsc +@@ -27,6 +27,8 @@ UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLibRB.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLibRB.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf !if $(TARGET) == RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !else -@@ -93,7 +95,7 @@ +@@ -93,6 +95,7 @@ ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf -- + ShellPkg/Application/sysarch-acs/apps/uefi/pc_bsa.inf + ShellPkg/Application/Shell/Shell.inf { - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/patches/edk2_pfdi.patch b/patches/edk2_pfdi.patch index fd378aaa..d159a01a 100644 --- a/patches/edk2_pfdi.patch +++ b/patches/edk2_pfdi.patch @@ -1,8 +1,6 @@ -diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c -index f0a8b9fe62..e41e0de3e0 100644 --- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c +++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c -@@ -90,8 +90,8 @@ UefiHiiServicesLibConstructor ( +@@ -90,8 +90,8 @@ // // Retrieve the pointer to the UEFI HII Config Routing Protocol // @@ -13,8 +11,6 @@ index f0a8b9fe62..e41e0de3e0 100644 // // Retrieve the pointer to the optional UEFI HII Font Protocol -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 94d95de0eb..dbd4453044 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -66,6 +66,9 @@ @@ -22,8 +18,8 @@ index 94d95de0eb..dbd4453044 100644 SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf + BaseFdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLib.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_dt/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLib.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_dt/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF diff --git a/patches/edk2_sbsa.patch b/patches/edk2_sbsa.patch index cd568982..5211d864 100644 --- a/patches/edk2_sbsa.patch +++ b/patches/edk2_sbsa.patch @@ -1,17 +1,15 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8..3c66d1a 100644 ---- a/ShellPkg/ShellPkg.dsc -+++ b/ShellPkg/ShellPkg.dsc -@@ -66,6 +66,8 @@ +--- a/ShellPkg/ShellPkg.dsc ++++ b/ShellPkg/ShellPkg.dsc +@@ -66,6 +66,8 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLibRB.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLibRB.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF -@@ -93,6 +95,7 @@ +@@ -93,6 +95,7 @@ ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf diff --git a/patches/edk2_unified_acpi.patch b/patches/edk2_unified_acpi.patch index 7499c2b1..7416fc9d 100644 --- a/patches/edk2_unified_acpi.patch +++ b/patches/edk2_unified_acpi.patch @@ -1,17 +1,15 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8..3c66d1a 100644 ---- a/ShellPkg/ShellPkg.dsc -+++ b/ShellPkg/ShellPkg.dsc -@@ -66,6 +66,8 @@ +--- a/ShellPkg/ShellPkg.dsc ++++ b/ShellPkg/ShellPkg.dsc +@@ -66,6 +66,8 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLibRB.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLibRB.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF -@@ -93,6 +95,7 @@ +@@ -93,6 +95,7 @@ ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf diff --git a/patches/edk2_vbsa.patch b/patches/edk2_vbsa.patch index 0ad926d4..61dc2b2c 100644 --- a/patches/edk2_vbsa.patch +++ b/patches/edk2_vbsa.patch @@ -1,13 +1,11 @@ -diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8280..80b844b547 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -66,6 +66,8 @@ ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf -+ UnifiedValLib|ShellPkg/Application/sysarch-acs/val/UnifiedValLibRB.inf -+ UnifiedPalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/UnifiedPalLib.inf ++ ValLib|ShellPkg/Application/sysarch-acs/val/ValLibRB.inf ++ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF diff --git a/val/UnifiedValLib.inf b/val/ValLib.inf similarity index 94% rename from val/UnifiedValLib.inf rename to val/ValLib.inf index 2e179b88..84f6de26 100644 --- a/val/UnifiedValLib.inf +++ b/val/ValLib.inf @@ -17,11 +17,11 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = UnifiedValLib + BASE_NAME = ValLib FILE_GUID = cdd4fb8f-06c5-4a28-8cb8-7f5b664e278c MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 - LIBRARY_CLASS = UnifiedValLib|UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = ValLib|UEFI_APPLICATION UEFI_DRIVER [Sources.common] src/AArch64/PeRegSysSupport.S diff --git a/val/UnifiedValLibRB.inf b/val/ValLibRB.inf similarity index 92% rename from val/UnifiedValLibRB.inf rename to val/ValLibRB.inf index ea06e0cd..9e657a32 100644 --- a/val/UnifiedValLibRB.inf +++ b/val/ValLibRB.inf @@ -19,11 +19,11 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = UnifiedValLibRB + BASE_NAME = ValLibRB FILE_GUID = f2a45bb6-61c8-4f94-b3b9-397f935d17fa MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 - LIBRARY_CLASS = UnifiedValLibRB|UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = ValLibRB|UEFI_APPLICATION UEFI_DRIVER [Sources.common] src/AArch64/PeRegSysSupport.S @@ -88,4 +88,4 @@ [BuildOptions] GCC:*_*_*_ASM_FLAGS = -march=armv8.6-a+sve+profile - GCC:*_*_*_CC_FLAGS = -DTARGET_UEFI -DCOMPILE_RB_EXE \ No newline at end of file + GCC:*_*_*_CC_FLAGS = -DTARGET_UEFI -DCOMPILE_RB_EXE From 2aa57948cd037246645f35ef50843b152fd2c69c Mon Sep 17 00:00:00 2001 From: Amrathesh Date: Tue, 23 Dec 2025 08:36:10 +0000 Subject: [PATCH 2/2] Rename unified UEFI app to xBSA and update build/docs/CI - rename unified UEFI sources, build target, and artifacts to xbsa_acpi. - move unified docs to docs/xbsa and update references/build instructions. - update CI/build scripts to use xbsa_acpi arg and renamed edk2 patch. Signed-off-by: Amrathesh Change-Id: I86aa1e44e642a1a6107d5d8ed34880e796a60043 --- .github/workflows/sysarch_ci.yml | 8 +-- README.md | 10 ++-- apps/uefi/acs.h | 8 +-- apps/uefi/{Unified.inf => xbsa_acpi.inf} | 4 +- apps/uefi/{unified_main.c => xbsa_main.c} | 12 ++-- docs/{unified => xbsa}/README.md | 56 +++++++++---------- docs/{unified => xbsa}/user_guide.rst | 6 +- ...nified_acpi.patch => edk2_xbsa_acpi.patch} | 2 +- prebuilt_images/README.md | 2 +- tools/scripts/acsbuild.sh | 8 +-- val/include/rule_based_execution.h | 2 +- 11 files changed, 59 insertions(+), 59 deletions(-) rename apps/uefi/{Unified.inf => xbsa_acpi.inf} (99%) rename apps/uefi/{unified_main.c => xbsa_main.c} (96%) rename docs/{unified => xbsa}/README.md (72%) rename docs/{unified => xbsa}/user_guide.rst (97%) rename patches/{edk2_unified_acpi.patch => edk2_xbsa_acpi.patch} (91%) diff --git a/.github/workflows/sysarch_ci.yml b/.github/workflows/sysarch_ci.yml index 16618ae2..b856870b 100644 --- a/.github/workflows/sysarch_ci.yml +++ b/.github/workflows/sysarch_ci.yml @@ -99,10 +99,10 @@ jobs: arg: vbsa outfile: Vbsa.efi artifact: Vbsa_acpi_target.efi - - name: Unified ACPI - arg: unified - outfile: UnifiedAcs.efi - artifact: unified.efi + - name: xBSA ACPI + arg: xbsa_acpi + outfile: xbsa_acpi.efi + artifact: xbsa_acpi.efi - name: PFDI DT arg: pfdi outfile: pfdi.efi diff --git a/README.md b/README.md index e46c89d9..f1e83d86 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ * [MemTest ACS](#memtest-architecture-compliance-suite) * [PFDI ACS](#pfdi-architecture-compliance-suite) * [VBSA ACS](#vbsa-architecture-compliance-suite) -* [Unified UEFI Application](#unified-uefi-application) +* [xBSA UEFI application](#xbsa-uefi-application) * [Security Implications](#-security-implications) * [Feedback and Support](#-feedback-and-support) * [License](#-license) @@ -52,7 +52,7 @@ sysarch-acs/ │ ├── uefi/ │ | └── _main.c ├── docs/ -│ ├── unified/ +│ ├── xbsa/ │ ├── bsa/ │ ├── sbsa/ │ ├── drtm/ @@ -205,11 +205,11 @@ Refer to the [VBSA ACS README](docs/vbsa/README.md) for detailed build steps, ex --- -## Unified UEFI Application -Provides a unified entry point for running BSA, SBSA, PC-BSA validation from a single UEFI application. +## xBSA UEFI application +Provides a unified entry point for running BSA, SBSA, and PC-BSA validation from a single UEFI application. #### Reference for Build, Execution, and More -Refer to the [Unified ACS README](docs/unified/README.md) for build steps, execution procedures, additional information, and known limitations. +Refer to the [xBSA README](docs/xbsa/README.md) for build steps, execution procedures, additional information, and known limitations. --- diff --git a/apps/uefi/acs.h b/apps/uefi/acs.h index db5f2c58..8d320069 100644 --- a/apps/uefi/acs.h +++ b/apps/uefi/acs.h @@ -42,10 +42,10 @@ #define VBSA_ACS_MINOR_VER 7 #define VBSA_ACS_SUBMINOR_VER 0 -/* Unified ACS Release versions */ -#define UNI_ACS_MAJOR_VER 1 -#define UNI_ACS_MINOR_VER 0 -#define UNI_ACS_SUBMINOR_VER 0 +/* xBSA ACS Release versions */ +#define XBSA_ACS_MAJOR_VER 1 +#define XBSA_ACS_MINOR_VER 0 +#define XBSA_ACS_SUBMINOR_VER 0 /* DRTM Release versions */ #define DRTM_ACS_MAJOR_VER 0 diff --git a/apps/uefi/Unified.inf b/apps/uefi/xbsa_acpi.inf similarity index 99% rename from apps/uefi/Unified.inf rename to apps/uefi/xbsa_acpi.inf index e3b79ab3..90d90980 100644 --- a/apps/uefi/Unified.inf +++ b/apps/uefi/xbsa_acpi.inf @@ -18,7 +18,7 @@ [Defines] INF_VERSION = 0x00010006 - BASE_NAME = UnifiedAcs + BASE_NAME = xbsa_acpi FILE_GUID = a912f198-7f0e-4803-b908-b757b806ec83 MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 0.1 @@ -34,7 +34,7 @@ app.c acs_globals.c acs_helpers.c - unified_main.c + xbsa_main.c ../../test_pool/pe/pe001.c ../../test_pool/pe/pe002.c ../../test_pool/pe/pe003.c diff --git a/apps/uefi/unified_main.c b/apps/uefi/xbsa_main.c similarity index 96% rename from apps/uefi/unified_main.c rename to apps/uefi/xbsa_main.c index 46c0953a..cd9368b5 100644 --- a/apps/uefi/unified_main.c +++ b/apps/uefi/xbsa_main.c @@ -29,7 +29,7 @@ #include "val/include/rule_based_execution.h" #include "acs.h" -/* CLI parameter table for Unified ACS, for description refer HelpMsg */ +/* CLI parameter table for xBSA UEFI application, for description refer HelpMsg */ CONST SHELL_PARAM_ITEM ParamList[] = { {L"-a", TypeValue}, {L"-cache", TypeFlag}, @@ -63,7 +63,7 @@ CONST SHELL_PARAM_ITEM ParamList[] = { VOID HelpMsg (VOID) { - Print (L"\nUsage: Unified.efi [options]\n" + Print (L"\nUsage: xbsa_acpi.efi [options]\n" "Options:\n" "-a Architecture selection: 'bsa', 'sbsa', or 'pcbsa'\n" " -a bsa Use full BSA rule checklist \n" @@ -194,10 +194,10 @@ execute_tests() } /* Print ACS header */ - val_print(ACS_PRINT_TEST, "\n\nUnified Architecture Compliance Suite", 0); - val_print(ACS_PRINT_TEST, "\n Version %d.", UNI_ACS_MAJOR_VER); - val_print(ACS_PRINT_TEST, "%d.", UNI_ACS_MINOR_VER); - val_print(ACS_PRINT_TEST, "%d\n", UNI_ACS_SUBMINOR_VER); + val_print(ACS_PRINT_TEST, "\n\nxBSA Architecture Compliance Suite", 0); + val_print(ACS_PRINT_TEST, "\n Version %d.", XBSA_ACS_MAJOR_VER); + val_print(ACS_PRINT_TEST, "%d.", XBSA_ACS_MINOR_VER); + val_print(ACS_PRINT_TEST, "%d\n", XBSA_ACS_SUBMINOR_VER); val_print(ACS_PRINT_TEST, "(Print level is %2d)\n\n", g_print_level); val_print(ACS_PRINT_TEST, "\n Creating Platform Information Tables\n", 0); diff --git a/docs/unified/README.md b/docs/xbsa/README.md similarity index 72% rename from docs/unified/README.md rename to docs/xbsa/README.md index ba561bb2..a51624df 100644 --- a/docs/unified/README.md +++ b/docs/xbsa/README.md @@ -1,27 +1,27 @@ ## Table of Contents -- [Unified UEFI Application](#unified-uefi-application) +- [xBSA UEFI application](#xbsa-uefi-application) - [Release Details](#release-details) -- [Unified build steps](#unified-build-steps) +- [xBSA build steps](#xbsa-build-steps) - [UEFI Shell application](#uefi-shell-application) - [Prerequisites](#prerequisites) - [Setup the workspace and clone required repositories](#setup-the-workspace-and-clone-required-repositories) - [Build edk2 prerequisites](#build-edk2-prerequisites) - - [Start the Unified ACS build](#start-the-unified-acs-build) + - [Start the xBSA application build](#start-the-xbsa-application-build) - [Build output](#build-output) - [Linux application](#linux-application) -- [Unified run steps](#unified-run-steps) +- [xBSA run steps](#xbsa-run-steps) - [For UEFI application](#for-uefi-application) - [For Linux application](#for-linux-application) - [Related Documentation](#related-documentation) - [Support](#support) -## Unified UEFI Application +## xBSA UEFI application -The **Unified UEFI Application** packages the BSA, SBSA and PC-BSA test suites into a single, self-checking UEFI binary. +The **xBSA UEFI application** packages the BSA, SBSA and PC-BSA test suites into a single, self-checking UEFI binary. It is intended for platform teams that want to validate a design once and cover the combined requirements of the Base System Architecture (BSA), Server Base System Architecture (SBSA) and PCBase System Architecture (PC-BSA) specifications. -Most tests run from the **UEFI Shell** by invoking the Unified ACS UEFI application. +Most tests run from the **UEFI Shell** by invoking the xBSA UEFI application. Selected PCIe and peripheral tests require the Exerciser VIP to achieve complete coverage. The test suite can also be executed in bare-metal environments; initialization of those environments remains platform-specific. @@ -30,11 +30,11 @@ The test suite can also be executed in bare-metal environments; initialization o - **Coverage:** Aggregates validation for [BSA 1.2](https://developer.arm.com/documentation/den0094/e/?lang=en) and [SBSA 8.0](https://developer.arm.com/documentation/den0029/j/?lang=en). - **Execution levels:** Suitable for both Pre-Silicon and Silicon validation. - **Complementary requirements:** Running with the Exerciser VIP is recommended for complete PCIe compliance coverage. -- **Linux dependencies:** The Unified ACS relies on the BSA and SBSA Linux applications for tests that require an OS environment. Refer to the dedicated BSA and SBSA documentation for details. +- **Linux dependencies:** The xBSA UEFI application relies on the BSA and SBSA Linux applications for tests that require an OS environment. Refer to the dedicated BSA and SBSA documentation for details. -## Unified build steps +## xBSA build steps -Follow the steps below to build the combined UEFI shell application (`UnifiedAcs.efi`) inside an edk2 workspace. +Follow the steps below to build the combined UEFI shell application (`xbsa_acpi.efi`) inside an edk2 workspace. ### UEFI Shell application @@ -73,28 +73,28 @@ source edksetup.sh make -C BaseTools/Source/C ``` -#### Start the Unified Application build +#### Start the xBSA application build ``` rm -rf Build/ -source ShellPkg/Application/sysarch-acs/tools/scripts/acsbuild.sh unified +source ShellPkg/Application/sysarch-acs/tools/scripts/acsbuild.sh xbsa_acpi ``` #### Build output -The Unified EFI binary is generated at: -`workspace/edk2/Build/Shell/DEBUG_GCC/AARCH64/UnifiedAcs.efi` +The xBSA EFI binary is generated at: +`workspace/edk2/Build/Shell/DEBUG_GCC/AARCH64/xbsa_acpi.efi` -> **Note:** Unified ACS currently supports ACPI-based builds. Platform-specific device tree enablement is not available for the unified target. Ensure Exerciser PAL APIs are implemented when the Exerciser VIP is present. +> **Note:** The xBSA UEFI application currently supports ACPI-based builds. Platform-specific device tree enablement is not available for the xBSA target. Ensure Exerciser PAL APIs are implemented when the Exerciser VIP is present. ### Linux application -Unified ACS relies on the existing BSA and SBSA Linux applications when OS-based tests are required. Build these components using the instructions in `docs/bsa/README.md` and `docs/sbsa/README.md`, then deploy them alongside the Unified ACS UEFI binary. +The xBSA UEFI application relies on the existing BSA and SBSA Linux applications when OS-based tests are required. Build these components using the instructions in `docs/bsa/README.md` and `docs/sbsa/README.md`, then deploy them alongside the xBSA UEFI binary. -## Unified run steps +## xBSA run steps ### For UEFI application #### Silicon system On platforms with USB access: -1. Copy `UnifiedAcs.efi` to a FAT-formatted USB device. +1. Copy `xbsa_acpi.efi` to a FAT-formatted USB device. - **For U-Boot firmware systems, additional steps** 1. Copy `Shell.efi` to the USB device (available under `prebuilt_images/IR`). @@ -113,32 +113,32 @@ On platforms with USB access: map -r ``` 3. Switch to the USB filesystem (for example, `fs0:`). -4. Run `UnifiedAcs.efi` with the required parameters. +4. Run `xbsa_acpi.efi` with the required parameters. 5. Capture the UART console output for log retention. -- For application parameters, see the [Unified User Guide](user_guide.rst). +- For application parameters, see the [xBSA User Guide](user_guide.rst). #### Emulation environment with secondary storage -1. Create an image containing `UnifiedAcs.efi` and `Shell.efi` (for U-Boot systems): +1. Create an image containing `xbsa_acpi.efi` and `Shell.efi` (for U-Boot systems): ``` mkfs.vfat -C -n HD0 hda.img 2097152 - sudo mount -o rw,loop=/dev/loop0,uid=$(whoami),gid=$(whoami) hda.img /mnt/unified - sudo cp "/UnifiedAcs.efi" /mnt/unified/ - sudo umount /mnt/unified + sudo mount -o rw,loop=/dev/loop0,uid=$(whoami),gid=$(whoami) hda.img /mnt/acs + sudo cp "/xbsa_acpi.efi" /mnt/acs/ + sudo umount /mnt/acs ``` *(Select an available loop device if `/dev/loop0` is busy.)* 2. Load the image into the emulated secondary storage using the platform-specific mechanism. 3. Boot to the UEFI shell. 4. Identify the filesystem with `map -r`. 5. Switch to the filesystem (`fs:`). -6. Execute `UnifiedAcs.efi` with the appropriate parameters. +6. Execute `xbsa_acpi.efi` with the appropriate parameters. 7. Preserve the UART console output for debug or certification review. -- For application parameters, see the [Unified User Guide](user_guide.rst). +- For application parameters, see the [xBSA User Guide](user_guide.rst). ### For Linux application -Unified ACS reuses the BSA and SBSA Linux applications to exercise OS-reliant tests: +The xBSA UEFI application reuses the BSA and SBSA Linux applications to exercise OS-reliant tests: 1. Transfer the built binaries (`bsa_acs.ko`, `bsa_app`, `sbsa_acs.ko`, `sbsa_app`) to the target system (for example, on a USB drive). 2. Boot into Linux and locate the removable storage device. 3. Load each kernel module before running the corresponding user-space application: @@ -157,7 +157,7 @@ Unified ACS reuses the BSA and SBSA Linux applications to exercise OS-reliant te sudo rmmod bsa_acs ``` -- For application parameters, see the [Unified User Guide](user_guide.rst). +- For application parameters, see the [xBSA User Guide](user_guide.rst). ## Related Documentation diff --git a/docs/unified/user_guide.rst b/docs/xbsa/user_guide.rst similarity index 97% rename from docs/unified/user_guide.rst rename to docs/xbsa/user_guide.rst index 7e51f088..d000db2e 100644 --- a/docs/unified/user_guide.rst +++ b/docs/xbsa/user_guide.rst @@ -1,9 +1,9 @@ -Unified Command Line Options -============================ +xBSA Command Line Options +========================= Usage:: - Unified.efi [options] + xbsa_acpi.efi [options] Options ------- diff --git a/patches/edk2_unified_acpi.patch b/patches/edk2_xbsa_acpi.patch similarity index 91% rename from patches/edk2_unified_acpi.patch rename to patches/edk2_xbsa_acpi.patch index 7416fc9d..e0a6acdd 100644 --- a/patches/edk2_unified_acpi.patch +++ b/patches/edk2_xbsa_acpi.patch @@ -13,7 +13,7 @@ ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf -+ ShellPkg/Application/sysarch-acs/apps/uefi/Unified.inf ++ ShellPkg/Application/sysarch-acs/apps/uefi/xbsa_acpi.inf ShellPkg/Application/Shell/Shell.inf { diff --git a/prebuilt_images/README.md b/prebuilt_images/README.md index cdb7e3cf..9a443201 100644 --- a/prebuilt_images/README.md +++ b/prebuilt_images/README.md @@ -25,5 +25,5 @@ These are preserved only for reference and backward compatibility. ## Going Forward - All new ACS builds will be published in the [sysarch-acs](https://github.com/ARM-software/sysarch-acs) repository. -- Prebuilt binaries from future specifications will be integrated and made available in the unified prebuilt location. +- Prebuilt binaries from future specifications will be integrated and made available in the prebuilt location. - Partners should use the `sysarch-acs` prebuilt images for the most up-to-date and supported releases. diff --git a/tools/scripts/acsbuild.sh b/tools/scripts/acsbuild.sh index f40b44d0..2858d338 100755 --- a/tools/scripts/acsbuild.sh +++ b/tools/scripts/acsbuild.sh @@ -40,7 +40,7 @@ export ACS_PATH=$(realpath "$acs_path") if [ "$#" -ne 1 ]; then echo "Usage: source ShellPkg/Application/sysarch-acs/tools/scripts/acsbuild.sh " - echo "where acs_type is unified, bsa, bsa_dt, sbsa, nist, mpam, drtm, mem_test, pfdi" + echo "where acs_type is xbsa_acpi, bsa, bsa_dt, sbsa, nist, mpam, drtm, mem_test, pfdi" return 1; fi @@ -169,9 +169,9 @@ if [ "$1" == "mpam" ]; then return 0; fi -if [ "$1" == "unified" ]; then +if [ "$1" == "xbsa_acpi" ]; then git checkout ShellPkg/ShellPkg.dsc - git apply ShellPkg/Application/sysarch-acs/patches/edk2_unified_acpi.patch - build -a AARCH64 -t GCC -p ShellPkg/ShellPkg.dsc -m ShellPkg/Application/sysarch-acs/apps/uefi/Unified.inf + git apply ShellPkg/Application/sysarch-acs/patches/edk2_xbsa_acpi.patch + build -a AARCH64 -t GCC -p ShellPkg/ShellPkg.dsc -m ShellPkg/Application/sysarch-acs/apps/uefi/xbsa_acpi.inf return 0; fi diff --git a/val/include/rule_based_execution.h b/val/include/rule_based_execution.h index 443ecffb..50468005 100644 --- a/val/include/rule_based_execution.h +++ b/val/include/rule_based_execution.h @@ -98,7 +98,7 @@ extern const sbsa_rule_entry_t sbsa_rule_list[]; extern const pcbsa_rule_entry_t pcbsa_rule_list[]; extern const vbsa_rule_entry_t vbsa_rule_list[]; -/* Global selections configured by the app (unified_main.c) */ +/* Global selections configured by the app */ extern uint32_t g_level_filter_mode; /* LEVEL_FILTER_MODE_e */ extern uint32_t g_level_value; /* numeric value interpreted per-arch */ /* BSA-only software view selector bitmask; 0 means no filtering */