Features/Intel|Platforms/Intel: Complete pending changes to [Components.{ARCH}]

mikebeaton · nate-desimone · commit 4f0b58d219ca · 2024-11-25T12:23:29.000-08:00
As noted in the code, it was intended to update various manually specified instances of [Components.IA32/X64] to [Components.$(DXE_ARCH)] or [Components.$(PEI_ARCH)] as appropriate, once macro expansion in the Components {ARCH} value was supported. This support was added some time ago[1], but the marked changes were never made. [1]: https://bugzilla.tianocore.org/show_bug.cgi?id=2308 Signed-off-by: Mike Beaton <mjsbeaton@gmail.com>
diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
@@ -42,10 +42,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # ACPI Debug Feature Package
   #####################################
diff --git a/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc b/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc
@@ -63,10 +63,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # Network Feature Package
   #####################################
diff --git a/Features/Intel/OutOfBandManagement/AsfFeaturePkg/Include/AsfFeature.dsc b/Features/Intel/OutOfBandManagement/AsfFeaturePkg/Include/AsfFeature.dsc
@@ -36,17 +36,11 @@
 #
 # Feature PEI Components
 #
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   AsfFeaturePkg/AsfPei/AsfPei.inf
 
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   AsfFeaturePkg/AsfDxe/AsfDxe.inf
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc
@@ -82,10 +82,7 @@
 #
 # Feature PEI Components
 #
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #####################################
   # IPMI Feature Package
   #####################################
@@ -106,10 +103,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # IPMI Feature Package
   #####################################
diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/SpcrFeature.dsc b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/SpcrFeature.dsc
@@ -42,8 +42,5 @@
 #       generated for it, but the binary will not be put into any firmware volume.
 #
 ################################################################################
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf
diff --git a/Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc b/Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc
@@ -71,10 +71,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #
   # SMM Variable Support
   #
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
@@ -63,10 +63,7 @@
 #
 # Feature PEI Components
 #
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #####################################
   # S3 Feature Package
   #####################################
@@ -79,10 +76,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # S3 Feature Package
   #####################################
diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc
@@ -51,10 +51,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # SMBIOS Feature Package
   #####################################
diff --git a/Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc b/Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc
@@ -68,10 +68,7 @@
 #
 # Feature PEI Components
 #
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #####################################
   # <TEMPLATE> Feature Package
   #####################################
@@ -84,10 +81,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # <TEMPLATE> Feature Package
   #####################################
diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
@@ -43,10 +43,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   !if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE
     LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf
   !else
diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc
@@ -59,10 +59,7 @@
 #
 # Feature DXE Components
 #
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed.
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #####################################
   # User Authentication Feature Package
   #####################################
diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc
@@ -72,15 +72,11 @@
 #######################################
 # Component Includes
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
 
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
 
@@ -269,9 +265,7 @@
 #######################################
 # PEI Components
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
@@ -345,9 +339,7 @@
 #######################################
 # DXE Components
 #######################################
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.dsc
@@ -110,16 +110,11 @@
 #######################################
 # Component Includes
 #######################################
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
 
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
 
@@ -371,9 +366,7 @@
 #######################################
 # PEI Components
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
@@ -508,9 +501,7 @@
 #######################################
 # DXE Components
 #######################################
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 # Compiled .efi but not in FV:
 # - dpDynamicCommand, TestPointDumpApp
 # Other apps; perhaps useful:
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
@@ -71,15 +71,11 @@
 #######################################
 # Component Includes
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
 
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
 
@@ -285,9 +281,7 @@
 #######################################
 # PEI Components
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
@@ -367,9 +361,7 @@
 #######################################
 # DXE Components
 #######################################
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
@@ -101,16 +101,11 @@
 #######################################
 # Component Includes
 #######################################
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
 
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
 
@@ -292,9 +287,7 @@
 #######################################
 # PEI Components
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
@@ -407,9 +400,7 @@
 #######################################
 # DXE Components
 #######################################
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
@@ -76,9 +76,7 @@
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
 !include $(SKT_PKG)/SktPkgPei.dsc
 
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
 
 #######################################
@@ -221,9 +219,7 @@
 #######################################
 # DXE Components
 #######################################
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc
@@ -72,15 +72,11 @@
 #######################################
 # Component Includes
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CorePeiInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
 
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
 !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc
 !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
 
@@ -269,9 +265,7 @@
 #######################################
 # PEI Components
 #######################################
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.IA32]
+[Components.$(PEI_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
@@ -337,9 +331,7 @@
 #######################################
 # DXE Components
 #######################################
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-#        is completed
-[Components.X64]
+[Components.$(DXE_ARCH)]
   #######################################
   # Edk2 Packages
   #######################################
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,7 @@`
`42`	`42`	`#`
`43`	`43`	`# Feature DXE Components`
`44`	`44`	`#`
`45`		`-`
`46`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`47`		`-# is completed.`
`48`		`-[Components.X64]`
	`45`	`+[Components.$(DXE_ARCH)]`
`49`	`46`	`#####################################`
`50`	`47`	`# ACPI Debug Feature Package`
`51`	`48`	`#####################################`
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,7 @@`
`63`	`63`	`#`
`64`	`64`	`# Feature DXE Components`
`65`	`65`	`#`
`66`		`-`
`67`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`68`		`-# is completed.`
`69`		`-[Components.X64]`
	`66`	`+[Components.$(DXE_ARCH)]`
`70`	`67`	`#####################################`
`71`	`68`	`# Network Feature Package`
`72`	`69`	`#####################################`
Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,11 @@`
`36`	`36`	`#`
`37`	`37`	`# Feature PEI Components`
`38`	`38`	`#`
`39`		`-`
`40`		`-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`41`		`-# is completed.`
`42`		`-[Components.IA32]`
	`39`	`+[Components.$(PEI_ARCH)]`
`43`	`40`	`AsfFeaturePkg/AsfPei/AsfPei.inf`
`44`	`41`
`45`	`42`	`#`
`46`	`43`	`# Feature DXE Components`
`47`	`44`	`#`
`48`		`-`
`49`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`50`		`-# is completed.`
`51`		`-[Components.X64]`
	`45`	`+[Components.$(DXE_ARCH)]`
`52`	`46`	`AsfFeaturePkg/AsfDxe/AsfDxe.inf`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,7 @@`
`82`	`82`	`#`
`83`	`83`	`# Feature PEI Components`
`84`	`84`	`#`
`85`		`-`
`86`		`-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`87`		`-# is completed.`
`88`		`-[Components.IA32]`
	`85`	`+[Components.$(PEI_ARCH)]`
`89`	`86`	`#####################################`
`90`	`87`	`# IPMI Feature Package`
`91`	`88`	`#####################################`
`@@ -106,10 +103,7 @@`
`106`	`103`	`#`
`107`	`104`	`# Feature DXE Components`
`108`	`105`	`#`
`109`		`-`
`110`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`111`		`-# is completed.`
`112`		`-[Components.X64]`
	`106`	`+[Components.$(DXE_ARCH)]`
`113`	`107`	`#####################################`
`114`	`108`	`# IPMI Feature Package`
`115`	`109`	`#####################################`
Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,7 @@`
`71`	`71`	`#`
`72`	`72`	`# Feature DXE Components`
`73`	`73`	`#`
`74`		`-`
`75`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`76`		`-# is completed.`
`77`		`-[Components.X64]`
	`74`	`+[Components.$(DXE_ARCH)]`
`78`	`75`	`#`
`79`	`76`	`# SMM Variable Support`
`80`	`77`	`#`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,7 @@`
`51`	`51`	`#`
`52`	`52`	`# Feature DXE Components`
`53`	`53`	`#`
`54`		`-`
`55`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`56`		`-# is completed.`
`57`		`-[Components.X64]`
	`54`	`+[Components.$(DXE_ARCH)]`
`58`	`55`	`#####################################`
`59`	`56`	`# SMBIOS Feature Package`
`60`	`57`	`#####################################`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,7 @@`
`68`	`68`	`#`
`69`	`69`	`# Feature PEI Components`
`70`	`70`	`#`
`71`		`-`
`72`		`-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`73`		`-# is completed.`
`74`		`-[Components.IA32]`
	`71`	`+[Components.$(PEI_ARCH)]`
`75`	`72`	`#####################################`
`76`	`73`	`# <TEMPLATE> Feature Package`
`77`	`74`	`#####################################`
`@@ -84,10 +81,7 @@`
`84`	`81`	`#`
`85`	`82`	`# Feature DXE Components`
`86`	`83`	`#`
`87`		`-`
`88`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`89`		`-# is completed.`
`90`		`-[Components.X64]`
	`84`	`+[Components.$(DXE_ARCH)]`
`91`	`85`	`#####################################`
`92`	`86`	`# <TEMPLATE> Feature Package`
`93`	`87`	`#####################################`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,7 @@`
`43`	`43`	`#`
`44`	`44`	`# Feature DXE Components`
`45`	`45`	`#`
`46`		`-`
`47`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`48`		`-# is completed.`
`49`		`-[Components.X64]`
	`46`	`+[Components.$(DXE_ARCH)]`
`50`	`47`	`!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE`
`51`	`48`	`LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf`
`52`	`49`	`!else`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,7 @@`
`59`	`59`	`#`
`60`	`60`	`# Feature DXE Components`
`61`	`61`	`#`
`62`		`-`
`63`		`-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308`
`64`		`-# is completed.`
`65`		`-[Components.X64]`
	`62`	`+[Components.$(DXE_ARCH)]`
`66`	`63`	`#####################################`
`67`	`64`	`# User Authentication Feature Package`
`68`	`65`	`#####################################`