Merge branch 'feature/ffa_enablement' into fix_non_tpm

Signed-off-by: kuqin12 <[email protected]>
microsoft · Jan 16, 2025 · da0da76 · da0da76
2 parents dbc63ad + 8f34b40
commit da0da76
Show file tree

Hide file tree

Showing 17 changed files with 173 additions and 368 deletions.
diff --git a/.azurepipelines/Platform-Build-GCC5.yml b/.azurepipelines/Platform-Build-GCC5.yml
@@ -28,79 +28,6 @@ jobs:
     os_type: Linux
     container_image: linux-gcc
     build_matrix:
-      QemuQ35_DEBUG:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: ""
-        BuildTarget: "DEBUG"
-        BuildExtraTag: ""
-        BuildExtraStep:
-          - template: Steps/RustSetupSteps.yml@mu_devops
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE BLD_*_QEMU_CORE_NUM=2 TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-        BuildArtifactsOther: "**/unit_test_results/*"
-
-      QemuQ35_RELEASE:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: ""
-        BuildTarget: "RELEASE"
-        BuildExtraTag: ""
-        BuildExtraStep:
-          - template: Steps/RustSetupSteps.yml@mu_devops
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE BLD_*_QEMU_CORE_NUM=2 TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-        BuildArtifactsOther: "**/unit_test_results/*"
-
-      QemuQ35_DEBUG_ARM:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: ""
-        BuildTarget: "DEBUG"
-        BuildExtraTag: "ON_ARM"
-        BuildExtraStep:
-          - script: echo No extra steps provided
-        Run: false
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE BLD_*_QEMU_CORE_NUM=2 TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        SelfHostAgent: true
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-          **/*/*TestApp.efi
-        BuildArtifactsOther: "**/unit_test_results/*"
-
-      QemuQ35_RELEASE_ARM:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: ""
-        BuildTarget: "RELEASE"
-        BuildExtraTag: "ON_ARM"
-        BuildExtraStep:
-          - script: echo No extra steps provided
-        Run: false
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE BLD_*_QEMU_CORE_NUM=2 TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        SelfHostAgent: true
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-          **/*/*TestApp.efi
-        BuildArtifactsOther: "**/unit_test_results/*"
-
-      QemuQ35_NO_SMM_RELEASE:
-        BuildPackage: QemuQ35Pkg
-        BuildFile: "Platforms/QemuQ35Pkg/PlatformBuild.py"
-        BuildFlags: "BLD_*_SMM_ENABLED=FALSE"
-        BuildTarget: "RELEASE"
-        BuildExtraTag: "NO_SMM"
-        BuildExtraStep:
-          - template: Steps/RustSetupSteps.yml@mu_devops
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE BLD_*_QEMU_CORE_NUM=2 BLD_*_SMM_ENABLED=FALSE"
-        BuildArtifactsBinary: |
-          **/QEMUQ35_*.fd
-        BuildArtifactsOther: ""
 
       QemuSbsa_DEBUG:
         BuildPackage: QemuSbsaPkg
@@ -109,10 +36,10 @@ jobs:
         BuildTarget: "DEBUG"
         BuildExtraTag: ""
         BuildExtraStep:
-          - script: sudo apt-get install -y libssl-dev
+          - script: sudo apt-get install -y libssl-dev clang llvm lld device-tree-compiler
             displayName: Install openssl
           - template: Steps/RustSetupSteps.yml@mu_devops
-        Run: true
+        Run: false
         RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
         BuildArtifactsBinary: |
           **/QEMU_EFI.fd
@@ -126,43 +53,11 @@ jobs:
         BuildTarget: "RELEASE"
         BuildExtraTag: ""
         BuildExtraStep:
-          - script: sudo apt-get install -y libssl-dev
+          - script: sudo apt-get install -y libssl-dev clang llvm lld device-tree-compiler
             displayName: Install openssl
           - template: Steps/RustSetupSteps.yml@mu_devops
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        BuildArtifactsBinary: |
-          **/QEMU_EFI.fd
-          **/SECURE_FLASH0.fd
-        BuildArtifactsOther: "**/unit_test_results/*"
-
-      QemuSbsa_DEBUG_ARM:
-        BuildPackage: QemuSbsaPkg
-        BuildFile: "Platforms/QemuSbsaPkg/PlatformBuild.py"
-        BuildFlags: ""
-        BuildTarget: "DEBUG"
-        BuildExtraTag: "ON_AARCH64"
-        BuildExtraStep:
-          - script: echo No extra steps provided
-        Run: true
-        RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        SelfHostAgent: true
-        BuildArtifactsBinary: |
-          **/QEMU_EFI.fd
-          **/SECURE_FLASH0.fd
-        BuildArtifactsOther: "**/unit_test_results/*"
-
-      QemuSbsa_RELEASE_ARM:
-        BuildPackage: QemuSbsaPkg
-        BuildFile: "Platforms/QemuSbsaPkg/PlatformBuild.py"
-        BuildFlags: ""
-        BuildTarget: "RELEASE"
-        BuildExtraTag: "ON_AARCH64"
-        BuildExtraStep:
-          - script: echo No extra steps provided
-        Run: true
+        Run: false
         RunFlags: "SHUTDOWN_AFTER_RUN=TRUE QEMU_HEADLESS=TRUE EMPTY_DRIVE=TRUE TEST_REGEX=*TestApp*.efi RUN_TESTS=TRUE"
-        SelfHostAgent: true
         BuildArtifactsBinary: |
           **/QEMU_EFI.fd
           **/SECURE_FLASH0.fd

diff --git a/.azurepipelines/Platform-Build-Job.yml b/.azurepipelines/Platform-Build-Job.yml
@@ -66,11 +66,6 @@ jobs:
 
       variables:
       - name: Run
-        ${{ if EndsWith(item.Key, 'CODE_COVERAGE') }}:
-          value: false
-        ${{ elseif or(eq(item.Value.Run, true), eq(parameters.os_type, 'Linux')) }}:
-          value: true
-        ${{ else }}:
           value: false
 
       ${{ if and(ne(parameters.container_image, ''), ne(item.Value.SelfHostAgent, true)) }}:
@@ -173,14 +168,6 @@ jobs:
           itemPattern: '**/*.efi'
           targetPath: 'Build/${{ item.Value.BuildPackage }}/${{ item.Value.BuildTarget }}_$(tool_chain_tag)/X64/'
 
-      # Run
-      - task: CmdLine@2
-        displayName: Run to Shell
-        inputs:
-          script: stuart_build -c ${{ item.Value.BuildFile }} TOOL_CHAIN_TAG=$(tool_chain_tag) TARGET=${{ item.Value.BuildTarget }} ${{ item.Value.BuildFlags }} ${{ item.Value.RunFlags }} --FlashOnly
-        condition: and(gt(variables.pkg_count, 0), succeeded())
-        timeoutInMinutes: ${{ parameters.run_timeout }}
-
       # Copy build logs to the artifact staging directory
       - template: Steps/CommonLogCopyAndPublish.yml@mu_devops
         parameters:

diff --git a/.azurepipelines/Platform-Build-VS.yml b/.azurepipelines/Platform-Build-VS.yml
diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml
@@ -43,26 +43,7 @@ extends:
         Pkgs: 'QemuPkg'
         Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
         ArchList: IA32,X64,AARCH64
-      TARGET_Q35:
-        Pkgs: 'QemuQ35Pkg'
-        Targets: 'NO-TARGET'
-        ArchList: IA32,X64
       TARGET_SBSA:
         Pkgs: 'QemuSbsaPkg'
         Targets: 'NO-TARGET'
         ArchList: AARCH64
-      TARGET_QEMU_ARM:
-        Pkgs: 'QemuPkg'
-        Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
-        ArchList: IA32,X64,AARCH64
-        SelfHostAgent: true
-      TARGET_Q35_ARM:
-        Pkgs: 'QemuQ35Pkg'
-        Targets: 'NO-TARGET'
-        ArchList: IA32,X64
-        SelfHostAgent: true
-      TARGET_SBSA_ARM:
-        Pkgs: 'QemuSbsaPkg'
-        Targets: 'NO-TARGET'
-        ArchList: AARCH64
-        SelfHostAgent: true