Skip to content

Commit 7bf1929

Browse files
chetan-rathorechetan-rathore
authored
Merge pull request #168 from chetan-rathore/main
Changes for bsa/sbsa common val pal and minor changes
2 parents 27990c8 + f8a4d4a commit 7bf1929

9 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎ES/patches/es_bsa.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ index a8b6de3..85dc2c0 100644
1717
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
1818
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
1919
+ BsaValLib|ShellPkg/Application/bsa-acs/val/BsaValLib.inf
20-
+ BsaPalLib|ShellPkg/Application/bsa-acs/platform/pal_uefi_acpi/BsaPalLib.inf
20+
+ BsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_acpi/BsaPalLib.inf
2121

2222
[LibraryClasses.ARM,LibraryClasses.AARCH64]
2323
#

‎IR/patches/ir_bsa.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ index 38fde3dc71..677625e067 100644
1919
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
2020
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
2121
+ BsaValLib|ShellPkg/Application/bsa-acs/val/BsaValLib.inf
22-
+ BsaPalLib|ShellPkg/Application/bsa-acs/platform/pal_uefi_dt/BsaPalLib.inf
22+
+ BsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_dt/BsaPalLib.inf
2323
+ FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
2424

2525
[LibraryClasses.ARM,LibraryClasses.AARCH64]

‎SR/patches/es_bsa.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ index a8b6de3..85dc2c0 100644
1717
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
1818
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
1919
+ BsaValLib|ShellPkg/Application/bsa-acs/val/BsaValLib.inf
20-
+ BsaPalLib|ShellPkg/Application/bsa-acs/platform/pal_uefi_acpi/BsaPalLib.inf
20+
+ BsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_acpi/BsaPalLib.inf
2121

2222
[LibraryClasses.ARM,LibraryClasses.AARCH64]
2323
#

‎SR/patches/sr_sbsa.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ index 6f0d092..61caf7e 100644
1616
DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
1717
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
1818
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
19-
+ SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf
20-
+ SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf
19+
+ SbsaValLib|ShellPkg/Application/bsa-acs/val/SbsaValLib.inf
20+
+ SbsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_acpi/SbsaPalLib.inf
2121

2222
[LibraryClasses.ARM,LibraryClasses.AARCH64]
2323
#

‎common/config/common_config.cfg‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,14 @@
2626
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2727
# POSSIBILITY OF SUCH DAMAGE.
2828

29-
# Common configurations
30-
31-
#SystemReady ACS version
32-
ACS_VERSION=""
33-
34-
#Linux kernel version. Source downloaded from https://github.com/torvalds/linux.git
35-
LINUX_KERNEL_VERSION=6.4
36-
37-
#BusyBox source tag : https://git.busybox.net/busybox/
38-
BUSYBOX_SRC_VERSION=1_34_stable
29+
# Yocto Build uses below configs
3930

4031
#EDK2 source tag from https://github.com/tianocore/edk2.git
4132
EDK2_SRC_VERSION=edk2-stable202302
4233
EDK2_SRC_TAG=f80f052277c88a67c55e107b550f504eeea947d3
4334

44-
#Cross compiler tools from https://releases.linaro.org/components/toolchain/binaries
45-
LINARO_TOOLS_MAJOR_VERSION=7.5-2019.12
46-
LINARO_TOOLS_VERSION=7.5.0-2019.12
47-
48-
#FWTS source tag from git://kernel.ubuntu.com/hwe/fwts.git
49-
FWTS_SRC_VERSION=v23.07.00
50-
5135
# EDK2-TEST source tag from https://github.com/tianocore/edk2-test
5236
SCT_SRC_TAG=032822757792c5d4d0bfed1fd8524e69ef4f2d17
53-
5437
# GRUB2 source from https://github.com/rhboot/grub2.git
5538
GRUB_SRC_TAG=grub-2.06
5639

@@ -67,17 +50,30 @@ ARM_BBR_TAG=""
6750
#NOTE: If the value is NULL then the latest Linux ACS source will be downloaded
6851
ARM_LINUX_ACS_TAG=""
6952

70-
#Linux kernel version for Yocto build. Used only for the IR Band
71-
YOCTO_LINUX_KERNEL_VERSION=6.4
72-
7353
# EDK2-LIBC source tag from https://github.com/tianocore/edk2-libc
7454
EDK2_LIBC_SRC_TAG=c32222fed9927420fc46da503dea1ebb874698b6
7555

76-
# Buildroot tag
77-
BUILDROOT_SRC_TAG=2022.08.1
56+
#edk2-test-parser version
57+
EDK2_TEST_PARSER_TAG=e8cdb692592d2a152cb87cf4d9fbd7ba2ae8b405
58+
59+
#SystemReady ACS version
60+
ACS_VERSION=""
61+
62+
63+
# This might be used by IR 1.0 busybox
64+
65+
#Linux kernel version. Source downloaded from https://github.com/torvalds/linux.git
66+
LINUX_KERNEL_VERSION=6.4
67+
68+
#BusyBox source tag : https://git.busybox.net/busybox/
69+
BUSYBOX_SRC_VERSION=1_34_stable
70+
71+
#Cross compiler tools from https://releases.linaro.org/components/toolchain/binaries
72+
LINARO_TOOLS_MAJOR_VERSION=7.5-2019.12
73+
LINARO_TOOLS_VERSION=7.5.0-2019.12
7874

7975
# export GCC toolchain path
8076
GCC=tools/gcc-linaro-${LINARO_TOOLS_VERSION}-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
8177

82-
#edk2-test-parser version
83-
EDK2_TEST_PARSER_TAG=e8cdb692592d2a152cb87cf4d9fbd7ba2ae8b405
78+
#FWTS source tag from git://kernel.ubuntu.com/hwe/fwts.git
79+
FWTS_SRC_VERSION=v23.07.00

‎common/ramdisk/init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ if [ $ADDITIONAL_CMD_OPTION != "noacs" ]; then
126126
else
127127
#SBBR Execution
128128
echo "Executing FWTS for SBBR"
129-
fwts -r stdout -q --uefi-set-var-multiple=1 --uefi-get-mn-count-multiple=1 --sbbr esrt uefibootpath > /mnt/acs_results/fwts/FWTSResults.log
129+
fwts -r stdout -q --uefi-set-var-multiple=1 --uefi-get-mn-count-multiple=1 --sbbr esrt uefibootpath aest cedt slit srat hmat pcct pdtt bgrt bert einj erst hest sdei nfit iort mpam ibft ras2 > /mnt/acs_results/fwts/FWTSResults.log
130130
fi
131131

132132
sleep 2

‎common/scripts/build-linux-bsa.sh‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ BSA_PATH=$TOP_DIR/edk2/ShellPkg/Application/bsa-acs
4242

4343
build_bsa_kernel_driver()
4444
{
45-
pushd $TOP_DIR/linux-acs/bsa-acs-drv/files
46-
arch=$(uname -m)
45+
pushd $TOP_DIR/linux-acs/acs-drv/files
46+
rm -rf $TOP_DIR/linux-acs/acs-drv/files/val
47+
rm -rf $TOP_DIR/linux-acs/acs-drv/files/test_pool
48+
49+
arch=$(uname -m)
4750
echo $arch
4851
if [[ $arch = "aarch64" ]]
4952
then
@@ -52,7 +55,7 @@ build_bsa_kernel_driver()
5255
else
5356
export CROSS_COMPILE=$TOP_DIR/$GCC
5457
fi
55-
./setup.sh $TOP_DIR/edk2/ShellPkg/Application/bsa-acs
58+
./bsa_setup.sh $TOP_DIR/edk2/ShellPkg/Application/bsa-acs
5659
./linux_bsa_acs.sh
5760
popd
5861
}
@@ -71,7 +74,7 @@ pack_in_ramdisk()
7174
if [ ! -d $TOP_DIR/ramdisk/linux-bsa ]; then
7275
mkdir $TOP_DIR/ramdisk/linux-bsa
7376
fi
74-
cp $TOP_DIR/linux-acs/bsa-acs-drv/files/bsa_acs.ko $TOP_DIR/ramdisk/linux-bsa
77+
cp $TOP_DIR/linux-acs/acs-drv/files/bsa_acs.ko $TOP_DIR/ramdisk/linux-bsa
7578
cp $BSA_PATH/linux_app/bsa-acs-app/bsa $TOP_DIR/ramdisk/linux-bsa
7679
}
7780

‎common/scripts/build-linux-sbsa.sh‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ PLATDIR=${TOP_DIR}/output
4242

4343
build_sbsa_kernel_driver()
4444
{
45-
pushd $TOP_DIR/linux-acs/sbsa-acs-drv/files
45+
pushd $TOP_DIR/linux-acs/acs-drv/files
46+
rm -rf $TOP_DIR/linux-acs/acs-drv/files/val
47+
rm -rf $TOP_DIR/linux-acs/acs-drv/files/test_pool
48+
4649
arch=$(uname -m)
4750
echo $arch
4851
if [[ $arch = "aarch64" ]]
@@ -52,7 +55,7 @@ build_sbsa_kernel_driver()
5255
else
5356
export CROSS_COMPILE=$TOP_DIR/$GCC
5457
fi
55-
./setup.sh $TOP_DIR/edk2/ShellPkg/Application/sbsa-acs
58+
./sbsa_setup.sh $TOP_DIR/edk2/ShellPkg/Application/bsa-acs $TOP_DIR/edk2/ShellPkg/Application/sbsa-acs
5659
./linux_sbsa_acs.sh
5760
popd
5861
}
@@ -109,7 +112,7 @@ pack_in_ramdisk()
109112
mkdir $TOP_DIR/ramdisk/linux-sbsa
110113

111114
# Add all needed packages to build root
112-
cp $TOP_DIR/linux-acs/sbsa-acs-drv/files/sbsa_acs.ko $TOP_DIR/ramdisk/linux-sbsa/
115+
cp $TOP_DIR/linux-acs/acs-drv/files/sbsa_acs.ko $TOP_DIR/ramdisk/linux-sbsa/
113116
cp $SBSA_PATH/linux_app/sbsa-acs-app/sbsa $TOP_DIR/ramdisk/linux-sbsa
114117
cp -r $SBSA_PATH/linux_app/pmu_app/pmuval $TOP_DIR/ramdisk/linux-sbsa
115118

@@ -133,4 +136,4 @@ build_sbsa_kernel_driver
133136
build_sbsa_app
134137
build_pmu_app
135138
build_mte_test
136-
pack_in_ramdisk
139+
pack_in_ramdisk

‎common/scripts/build-sbsaefi.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ do_build()
9494
fi
9595

9696
export PACKAGES_PATH=$TOP_DIR/$UEFI_PATH:$TOP_DIR/$UEFI_PATH/$UEFI_LIBC_PATH
97-
source ShellPkg/Application/sbsa-acs/tools/scripts/avsbuild.sh
97+
source ShellPkg/Application/sbsa-acs/tools/scripts/acsbuild.sh
9898
popd
9999
}
100100

0 commit comments

Comments
 (0)