From 21c5b3f2d1ebe2dd1a41a0e9346d4a8e334c67e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?=
 <8659494+mhaeuser@users.noreply.github.com>
Date: Mon, 17 Jul 2023 20:01:08 +0200
Subject: [PATCH] MdePkg/UeImage: Remove support for SAL drivers

---
 BaseTools/ImageTool/Image.c               | 3 +--
 BaseTools/ImageTool/ImageTool.c           | 5 -----
 BaseTools/ImageTool/UeEmit.c              | 3 +--
 MdePkg/Include/IndustryStandard/UeImage.h | 3 +--
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/BaseTools/ImageTool/Image.c b/BaseTools/ImageTool/Image.c
index c65f5b027f..bc2a03d6ce 100644
--- a/BaseTools/ImageTool/Image.c
+++ b/BaseTools/ImageTool/Image.c
@@ -235,8 +235,7 @@ CheckToolImageReloc (
 #endif
 
   // FIXME: Update drivers?
-  if ((Image->HeaderInfo.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER ||
-       Image->HeaderInfo.Subsystem == EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER) &&
+  if (Image->HeaderInfo.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER &&
        Segment->Write) {
     printf("!!! writable reloc at %x !!!\n", Reloc->Target);
     //DEBUG_RAISE ();
diff --git a/BaseTools/ImageTool/ImageTool.c b/BaseTools/ImageTool/ImageTool.c
index de14e9696b..d3a4378e5c 100644
--- a/BaseTools/ImageTool/ImageTool.c
+++ b/BaseTools/ImageTool/ImageTool.c
@@ -321,11 +321,6 @@ NameToType (
     return EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;
   }
 
-  if ((strcmp (TypeName, "DXE_SAL_DRIVER") == 0)
-    || (strcmp (TypeName, "SAL_RT_DRIVER") == 0)) {
-    return EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER;
-  }
-
   return -1;
 }
 
diff --git a/BaseTools/ImageTool/UeEmit.c b/BaseTools/ImageTool/UeEmit.c
index 89a04cdccb..6bba682250 100644
--- a/BaseTools/ImageTool/UeEmit.c
+++ b/BaseTools/ImageTool/UeEmit.c
@@ -787,8 +787,7 @@ ToolImageEmitUeFile (
 
   Chaining = Image->HeaderInfo.BaseAddress == 0 &&
              !Image->HeaderInfo.FixedAddress &&
-             Image->HeaderInfo.Subsystem != EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER &&
-             Image->HeaderInfo.Subsystem != EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER;
+             Image->HeaderInfo.Subsystem != EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;
 
   UeHdr.Magic = UE_HEADER_MAGIC;
 
diff --git a/MdePkg/Include/IndustryStandard/UeImage.h b/MdePkg/Include/IndustryStandard/UeImage.h
index 26fe6c25a0..22aa574c6b 100644
--- a/MdePkg/Include/IndustryStandard/UeImage.h
+++ b/MdePkg/Include/IndustryStandard/UeImage.h
@@ -443,8 +443,7 @@ enum {
 enum {
   UeSubsystemEfiApplication        = 0,
   UeSubsystemEfiBootServicesDriver = 1,
-  UeSubsystemEfiRuntimeDriver      = 2,
-  UeSubsystemSalRuntimeDriver      = 3
+  UeSubsystemEfiRuntimeDriver      = 2
 };
 
 ///