Skip to content

Commit

Permalink
EmbeddedPkg: Drop remaining ArmPkg and ArmPlatformPkg references
Browse files Browse the repository at this point in the history
  • Loading branch information
Bret Barkelew authored and kenlautner committed Dec 18, 2023
1 parent c029297 commit 65deb2e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
8 changes: 5 additions & 3 deletions EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec

[Packages.ARM, Packages.AARCH64]
ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
# MU_CHANGE [BEGIN]
# [Packages.ARM, Packages.AARCH64]
# ArmPkg/ArmPkg.dec
# ArmPlatformPkg/ArmPlatformPkg.dec
# MU_CHANGE [END]

[Guids]
gFdtTableGuid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
MdeModulePkg/MdeModulePkg.dec
EmbeddedPkg/EmbeddedPkg.dec

[Packages.ARM, Packages.AARCH64]
ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
# MU_CHANGE [BEGIN]
# [Packages.ARM, Packages.AARCH64]
# ArmPkg/ArmPkg.dec
# ArmPlatformPkg/ArmPlatformPkg.dec
# MU_CHANGE [END]
6 changes: 3 additions & 3 deletions EmbeddedPkg/EmbeddedPkg.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
## options defined ci/Plugin/CompilerPlugin
"CompilerPlugin": {
"skip": True, # MU_CHANGE
"skip": False,
"DscPath": "EmbeddedPkg.dsc"
},

Expand All @@ -25,8 +25,8 @@
"MdePkg/MdePkg.dec",
"MdeModulePkg/MdeModulePkg.dec",
"EmbeddedPkg/EmbeddedPkg.dec",
"ArmPkg/ArmPkg.dec",
"ArmPlatformPkg/ArmPlatformPkg.dec",
# "ArmPkg/ArmPkg.dec", # MU_CHANGE
# "ArmPlatformPkg/ArmPlatformPkg.dec", # MU_CHANGE
"NetworkPkg/NetworkPkg.dec"
],
# For host based unit tests
Expand Down
8 changes: 4 additions & 4 deletions EmbeddedPkg/EmbeddedPkg.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,16 @@
ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

[LibraryClasses.ARM, LibraryClasses.AARCH64]
ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
# ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf # MU_CHANGE
# ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf # MU_CHANGE
# SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf # MU_CHANGE
# NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf # MU_CHANGE
NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf # MU_CHANGE

# Add support for GCC stack protector
NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
# ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf # MU_CHANGE

################################################################################
#
Expand Down

0 comments on commit 65deb2e

Please sign in to comment.