diff --git a/Common/MU_OEM_SAMPLE b/Common/MU_OEM_SAMPLE index 4d54415bf..fc94172c1 160000 --- a/Common/MU_OEM_SAMPLE +++ b/Common/MU_OEM_SAMPLE @@ -1 +1 @@ -Subproject commit 4d54415bf5bd8c22d6a11b73c28c2ef5c029dbd0 +Subproject commit fc94172c1bf92cb2fed89fd420ad0f842143fa51 diff --git a/Common/MU_TIANO b/Common/MU_TIANO index 2cb135b37..2f03c18ba 160000 --- a/Common/MU_TIANO +++ b/Common/MU_TIANO @@ -1 +1 @@ -Subproject commit 2cb135b37c956b3de40ac20ce1f54ea4361aa539 +Subproject commit 2f03c18baaa1de3a8aae45c0aa5cebb177bfd898 diff --git a/Features/CONFIG b/Features/CONFIG index 7d4a54e70..f7a1e7897 160000 --- a/Features/CONFIG +++ b/Features/CONFIG @@ -1 +1 @@ -Subproject commit 7d4a54e701841709b317647e05c7a8ffe53c03cf +Subproject commit f7a1e789745eeefe9afe8b7bc4a4b12254becde5 diff --git a/Features/DFCI b/Features/DFCI index de8bb4d5e..703b25e37 160000 --- a/Features/DFCI +++ b/Features/DFCI @@ -1 +1 @@ -Subproject commit de8bb4d5e741234d74febe5268dca4e09503faec +Subproject commit 703b25e37d7cc57ad6110b58e533fd1803748e83 diff --git a/MU_BASECORE b/MU_BASECORE index 433da20ac..6310e1ece 160000 --- a/MU_BASECORE +++ b/MU_BASECORE @@ -1 +1 @@ -Subproject commit 433da20ac62db2f0f1135e0a930aacea65bdb210 +Subproject commit 6310e1ecef38b2ebee0b352494b17913fc9c90b6 diff --git a/Platforms/KailuaPkg/Device/ayaneo-aps/APRIORI.inc b/Platforms/KailuaPkg/Device/ayaneo-aps/APRIORI.inc index eb84b63c4..9f3439f09 100644 --- a/Platforms/KailuaPkg/Device/ayaneo-aps/APRIORI.inc +++ b/Platforms/KailuaPkg/Device/ayaneo-aps/APRIORI.inc @@ -64,7 +64,7 @@ APRIORI DXE { } INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf + INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SdccDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf # INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/TzDxe/TzDxeLA.inf diff --git a/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.dsc.inc b/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.dsc.inc index 618e2e7f6..d27706ca9 100644 --- a/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.dsc.inc +++ b/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.dsc.inc @@ -41,7 +41,7 @@ $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SimpleTextInOut $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/CPRDxe/CPRDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/GpiDxe/GpiDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SPIDxe/SPIDxe.inf -$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf +#$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf #$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/FeatureEnablerDxe/FeatureEnablerDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DisplayDxe/DisplayDxe.inf #$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/QRKSDxe/QRKSDxe.inf @@ -74,6 +74,7 @@ $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/FvUtilsDxe/FvUt # Patched Binaries $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ButtonsDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf +$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SdccDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SPMIDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbConfigDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ClockDxe.inf diff --git a/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.inc b/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.inc index 4a6427538..ab815762f 100644 --- a/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.inc +++ b/Platforms/KailuaPkg/Device/ayaneo-aps/DXE.inc @@ -40,6 +40,7 @@ INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/RscDxe/RscD INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ButtonsDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SPMIDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SdccDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbConfigDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ClockDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/PmicDxeLa.inf @@ -354,7 +355,7 @@ INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/CPRDxe/CPRDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/GpiDxe/GpiDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SPIDxe/SPIDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ChargerExDxe/ChargerExDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PmicGlinkDxe/PmicGlinkDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/QcomChargerDxe/QcomChargerDxeLA.inf diff --git a/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.depex b/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.depex new file mode 100644 index 000000000..265ee7cb4 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.depex differ diff --git a/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.efi b/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.efi new file mode 100644 index 000000000..ac5c8bb39 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.inf b/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.inf new file mode 100644 index 000000000..d7827729a --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayaneo-aps/PatchedBinaries/SdccDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS SdccDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2024-05-11 06:11:14Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = SdccDxe + FILE_GUID = F10F76DB-42C1-533F-34A8-69BE24653110 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|SdccDxe.depex|* + PE32|SdccDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/APRIORI.inc b/Platforms/KailuaPkg/Device/ayn-odin2/APRIORI.inc index f9b809831..f0d9f0614 100644 --- a/Platforms/KailuaPkg/Device/ayn-odin2/APRIORI.inc +++ b/Platforms/KailuaPkg/Device/ayn-odin2/APRIORI.inc @@ -65,7 +65,7 @@ APRIORI DXE { } INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf + INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SdccDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf # INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/TzDxe/TzDxeLA.inf diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/DXE.dsc.inc b/Platforms/KailuaPkg/Device/ayn-odin2/DXE.dsc.inc index 08a67ce35..b29729921 100644 --- a/Platforms/KailuaPkg/Device/ayn-odin2/DXE.dsc.inc +++ b/Platforms/KailuaPkg/Device/ayn-odin2/DXE.dsc.inc @@ -40,7 +40,7 @@ $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SimpleTextInOut $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/CPRDxe/CPRDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/GpiDxe/GpiDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SPIDxe/SPIDxe.inf -$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf +#$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf #$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/FeatureEnablerDxe/FeatureEnablerDxe.inf #$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DisplayDxe/DisplayDxe.inf #$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/QRKSDxe/QRKSDxe.inf @@ -73,6 +73,7 @@ $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/FvUtilsDxe/FvUt # Patched Binaries $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ButtonsDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf +$(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SdccDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SPMIDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbConfigDxe.inf $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ClockDxe.inf diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/DXE.inc b/Platforms/KailuaPkg/Device/ayn-odin2/DXE.inc index 19ee195a9..bd7e65521 100644 --- a/Platforms/KailuaPkg/Device/ayn-odin2/DXE.inc +++ b/Platforms/KailuaPkg/Device/ayn-odin2/DXE.inc @@ -4,8 +4,8 @@ #} INF SurfaceDuoFamilyPkg/Driver/SimpleFbDxe/SimpleFbDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/EnvDxe/EnvDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ParserDxe/ParserDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/EnvDxe/EnvDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ParserDxe/ParserDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SerialPortDxe/SerialPortDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/VerifiedBootDxe/VerifiedBootDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PsStateDxe/PsStateDxe.inf @@ -15,17 +15,17 @@ INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ResetRuntim INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/FontDxe/FontDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/QcomWDogDxe/QcomWDogDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ChipInfoDxe/ChipInfoDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/IPCCDxe/IPCCDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/IPCCDxe/IPCCDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/GLinkDxe/GLinkDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PlatformInfoDxe/PlatformInfoDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DALSYSDxe/DALSYSDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DALSYSDxe/DALSYSDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/HALIOMMUDxe/HALIOMMUDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/HWIODxe/HWIODxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/I2CDxe/I2CDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/TLMMDxe/TLMMDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/CmdDbDxe/CmdDbDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PwrUtilsDxe/PwrUtilsDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/RpmhDxe/RpmhDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/RpmhDxe/RpmhDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/NpaDxe/NpaDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ULogDxe/ULogDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/VcsDxe/VcsDxe.inf @@ -36,9 +36,15 @@ INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SmemDxe/Sme INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/RscDxe/RscDxe.inf # Patched Binaries +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/DALSYSDxe.inf +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/RpmhDxe.inf +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/IPCCDxe.inf +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/EnvDxe.inf +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ParserDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ButtonsDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SPMIDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf +INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/SdccDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbConfigDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/ClockDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/PmicDxeLa.inf @@ -351,7 +357,7 @@ INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/CPRDxe/CPRDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/GpiDxe/GpiDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SPIDxe/SPIDxe.inf -INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf +#INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SdccDxe/SdccDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DisplayDxe/DisplayDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/ChargerExDxe/ChargerExDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PmicGlinkDxe/PmicGlinkDxe.inf @@ -370,10 +376,10 @@ INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbDeviceDx INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbInitDxe/UsbInitDxe.inf #INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UCDxe/UCDxe.inf -FILE DRIVER = 5F0937CD-73F9-445E-B320-BB6FD5D3CBDE { - SECTION PE32 = $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UCDxe/UCDxe.efi - SECTION UI = "UCDxe" -} +#FILE DRIVER = 5F0937CD-73F9-445E-B320-BB6FD5D3CBDE { +# SECTION PE32 = $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UCDxe/UCDxe.efi +# SECTION UI = "UCDxe" +#} INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PILDxe/PILDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/PILProxyDxe/PILProxyDxe.inf INF $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/SPSSDxe/SPSSDxe.inf @@ -399,4 +405,9 @@ FILE DRIVER = 1C04F529-0612-4319-9315-B2E75C16810A { SECTION UI = "FeatureEnablerDxe" } +FILE DRIVER = 5F0937CD-73F9-445E-B320-BB6FD5D3CBDE { + SECTION PE32 = $(PACKAGE_NAME)/Device/$(TARGET_DEVICE)/PatchedBinaries/UCDxe.efi + SECTION UI = "UCDxe" +} + INF SurfaceDuoFamilyPkg/Driver/RamPartitionDxe/RamPartitionDxe.inf diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.depex new file mode 100644 index 000000000..098cfdc1c --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.depex @@ -0,0 +1 @@ +9Gfv28 \ No newline at end of file diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.efi new file mode 100644 index 000000000..b553d4c3a Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.inf new file mode 100644 index 000000000..f2a11064d --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DALSYSDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS DALSYSDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:21Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = DALSys + FILE_GUID = 8E9BD160-B184-11DF-94E2-0800200C9A66 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|DALSYSDxe.depex|* + PE32|DALSYSDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.depex new file mode 100644 index 000000000..f4d1d0525 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.depex @@ -0,0 +1 @@ +E\z!C|/_iv zH({EA|[`[C[<>+Q-lHUBOflMBbӵGoUiB(. 욭{ H00=z>M\m$_lOŽy \ No newline at end of file diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.efi new file mode 100644 index 000000000..a89ec2ad7 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.inf new file mode 100644 index 000000000..3f347575c --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/DisplayDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS DisplayDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:22Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = DisplayDxe + FILE_GUID = 4138022F-06C7-4F79-9C94-7E33B511A4E7 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|DisplayDxe.depex|* + PE32|DisplayDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.depex new file mode 100644 index 000000000..2a47cc229 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.depex @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.efi new file mode 100644 index 000000000..eae6a36d9 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.inf new file mode 100644 index 000000000..70e16c6d5 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/EnvDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS EnvDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:21Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = EnvDxe + FILE_GUID = 90A49AFD-422F-08AE-9611-E788D3804845 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|EnvDxe.depex|* + PE32|EnvDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.depex new file mode 100644 index 000000000..d24065d0a --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.depex @@ -0,0 +1 @@ +B7ELfG \ No newline at end of file diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.efi new file mode 100644 index 000000000..7094dd2ef Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.inf new file mode 100644 index 000000000..416b94974 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/IPCCDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS IPCCDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:21Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = IPCCDxe + FILE_GUID = 42031F68-1F0B-429B-93F1-0EB0CF89DDBF + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|IPCCDxe.depex|* + PE32|IPCCDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.depex new file mode 100644 index 000000000..2a47cc229 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.depex @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.efi new file mode 100644 index 000000000..23364ff64 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.inf new file mode 100644 index 000000000..221a1db69 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/ParserDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS ParserDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:21Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = ParserDxe + FILE_GUID = 4A568B8A-4D9D-4984-9C75-CEE33698E451 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|ParserDxe.depex|* + PE32|ParserDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.depex new file mode 100644 index 000000000..d24065d0a --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.depex @@ -0,0 +1 @@ +B7ELfG \ No newline at end of file diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.efi new file mode 100644 index 000000000..0a43501d0 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.inf new file mode 100644 index 000000000..2c8ba0902 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/RpmhDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS RpmhDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:21Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = RpmhDxe + FILE_GUID = CB29F4D1-7F37-4692-A416-93E82E219766 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|RpmhDxe.depex|* + PE32|RpmhDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.depex b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.depex new file mode 100644 index 000000000..265ee7cb4 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.depex differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.efi new file mode 100644 index 000000000..93715d972 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.inf new file mode 100644 index 000000000..41d9f06d7 --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/SdccDxe.inf @@ -0,0 +1,22 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS SdccDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:22Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = SdccDxe + FILE_GUID = F10F76DB-42C1-533F-34A8-69BE24653110 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = EfiEntry + +[Binaries.AARCH64] + DXE_DEPEX|SdccDxe.depex|* + PE32|SdccDxe.efi|* + +[Depex] + TRUE +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/UCDxe.efi b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/UCDxe.efi new file mode 100644 index 000000000..57e97c170 Binary files /dev/null and b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/UCDxe.efi differ diff --git a/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/UCDxe.inf b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/UCDxe.inf new file mode 100644 index 000000000..38cdcc6fe --- /dev/null +++ b/Platforms/KailuaPkg/Device/ayn-odin2/PatchedBinaries/UCDxe.inf @@ -0,0 +1,18 @@ +# **************************************************************************** +# AUTOGENERATED BY UEFIReader +# AUTOGENED AS UCDxe.inf +# DO NOT MODIFY +# GENERATED ON: 2023-10-01 10:35:22Z + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = UCDxe + FILE_GUID = 5F0937CD-73F9-445E-B320-BB6FD5D3CBDE + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + +[Binaries.AARCH64] + PE32|UCDxe.efi|* + +# AUTOGEN ENDS +# **************************************************************************** diff --git a/Platforms/KailuaPkg/Kailua.dsc b/Platforms/KailuaPkg/Kailua.dsc index c0b7cf432..b4d558fd7 100644 --- a/Platforms/KailuaPkg/Kailua.dsc +++ b/Platforms/KailuaPkg/Kailua.dsc @@ -27,7 +27,7 @@ FLASH_DEFINITION = $(PACKAGE_NAME)/$(PLATFORM_NAME).fdf SECURE_BOOT = 1 USE_PHYSICAL_TIMER = 0 - USE_SCREEN_FOR_SERIAL_OUTPUT = 1 + USE_SCREEN_FOR_SERIAL_OUTPUT = 0 USE_MEMORY_FOR_SERIAL_OUTPUT = 0 USE_UART_FOR_SERIAL_OUTPUT = 0 @@ -54,7 +54,7 @@ STANDALONEMM_CRYPTO_ARCH = NONE PLATFORM_HAS_ACTLR_EL1_UNIMPLEMENTED_ERRATA = 1 - PLATFORM_HAS_AMCNTENSET0_EL0_UNIMPLEMENTED_ERRATA = 0 + PLATFORM_HAS_AMCNTENSET0_EL0_UNIMPLEMENTED_ERRATA = 1 PLATFORM_HAS_GIC_V3_WITHOUT_IRM_FLAG_SUPPORT_ERRATA = 1 PLATFORM_HAS_PSCI_MEMPROTECT_FAILING_ERRATA = 0 diff --git a/Platforms/KailuaPkg/KailuaNoSb.dsc b/Platforms/KailuaPkg/KailuaNoSb.dsc index 272eaae3f..601177606 100644 --- a/Platforms/KailuaPkg/KailuaNoSb.dsc +++ b/Platforms/KailuaPkg/KailuaNoSb.dsc @@ -27,7 +27,7 @@ FLASH_DEFINITION = $(PACKAGE_NAME)/$(PLATFORM_NAME).fdf SECURE_BOOT = 0 USE_PHYSICAL_TIMER = 0 - USE_SCREEN_FOR_SERIAL_OUTPUT = 1 + USE_SCREEN_FOR_SERIAL_OUTPUT = 0 USE_MEMORY_FOR_SERIAL_OUTPUT = 0 USE_UART_FOR_SERIAL_OUTPUT = 0 @@ -54,7 +54,7 @@ STANDALONEMM_CRYPTO_ARCH = NONE PLATFORM_HAS_ACTLR_EL1_UNIMPLEMENTED_ERRATA = 1 - PLATFORM_HAS_AMCNTENSET0_EL0_UNIMPLEMENTED_ERRATA = 0 + PLATFORM_HAS_AMCNTENSET0_EL0_UNIMPLEMENTED_ERRATA = 1 PLATFORM_HAS_GIC_V3_WITHOUT_IRM_FLAG_SUPPORT_ERRATA = 1 PLATFORM_HAS_PSCI_MEMPROTECT_FAILING_ERRATA = 0 diff --git a/Platforms/SurfaceDuoFamilyPkg/Library/MsBootPolicyLib/MsBootPolicyLib.c b/Platforms/SurfaceDuoFamilyPkg/Library/MsBootPolicyLib/MsBootPolicyLib.c index 86bb6fc90..85c7b4fff 100644 --- a/Platforms/SurfaceDuoFamilyPkg/Library/MsBootPolicyLib/MsBootPolicyLib.c +++ b/Platforms/SurfaceDuoFamilyPkg/Library/MsBootPolicyLib/MsBootPolicyLib.c @@ -394,7 +394,11 @@ MsBootPolicyLibIsDevicePathBootable ( Size = GetDevicePathSize (DevicePath); - SdCardDevicePath = GetSdCardDevicePath (); +// woa msmnile patch start +// Set SdCardDevicePath to NULL so the after codes will not disable SD Card Boot. + // SdCardDevicePath = GetSdCardDevicePath (); + SdCardDevicePath = NULL; +// woa-msmnile patch end if (NULL != SdCardDevicePath) { PrintDevicePath (SdCardDevicePath); diff --git a/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc b/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc index 3fcd4b9b2..32488cf70 100644 --- a/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc +++ b/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamily.dsc.inc @@ -48,7 +48,7 @@ !if $(TARGET) == DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2f + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800fee0f gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|1 gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0 @@ -569,6 +569,11 @@ BaseCryptLib|OpensslPkg/Library/BaseCryptLib/RuntimeCryptLib.inf TlsLib|OpensslPkg/Library/TlsLib/TlsLib.inf IntrinsicLib|OpensslPkg/Library/IntrinsicLib/IntrinsicLib.inf +## Patch: Fix memset redefine issue while linking, only implement while screen serial is enabled. +!if $(USE_SCREEN_FOR_SERIAL_OUTPUT) == 1 + CompilerIntrinsicsLib|OpensslPkg/Library/IntrinsicLib/IntrinsicLib.inf +!endif +## End patch OpensslLib|OpensslPkg/Library/OpensslLib/OpensslLib.inf # Contains openSSL library used by BaseCryptoLib } @@ -676,4 +681,4 @@ RVCT:*_*_ARM_DLINK_FLAGS = --scatter $(EDK_TOOLS_PATH)/Scripts/Rvct-Align4K.sct [BuildOptions.AARCH64.EDKII.MM_CORE_STANDALONE,BuildOptions.AARCH64.EDKII.MM_STANDALONE] - GCC:*_*_*_CC_FLAGS = -mstrict-align -march=armv8-a \ No newline at end of file + GCC:*_*_*_CC_FLAGS = -mstrict-align -march=armv8-a