Vlv2TbltDevicePkg: Add the missing BootManagerMenuApp

lcp · mdkinney · commit 0faad02bdbb5 · 2019-08-09T12:07:42.000-07:00
* BootManagerMenuApp wasn't imported so the Boot Device Menu never showed
  correctly.

* Also fix the description of UiApp.
  In the "Rule.Common.UEFI_APPLICATION.UI" section, it intends to change
  the description of UiApp to "Enter Setup" to make the boot option
  self-explaining in the Boot Menu. But this didn't happen since the rule
  wasn't assigned to UiApp correctly, so the Boot Menu only showed "UiApp"
  which is not understandable to users. This patch adds "RuleOverride = UI"
  to UiApp.inf to change the description.

v2:
  Update the description

Cc: Zailiang Sun &lt;zailiang.sun@intel.com&gt;
Cc: Yi Qian &lt;yi.qian@intel.com&gt;
Cc: Michael D Kinney &lt;michael.d.kinney@intel.com&gt;
Signed-off-by: Gary Lin &lt;glin@suse.com&gt;
Reviewed-by: Michael D Kinney &lt;michael.d.kinney@intel.com&gt;
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -417,7 +417,8 @@ INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
 INF MdeModulePkg/Universal/Metronome/Metronome.inf
 INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
 INF MdeModulePkg/Logo/LogoDxe.inf
-INF MdeModulePkg/Application/UiApp/UiApp.inf
+INF RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf
+INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -924,6 +924,7 @@
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
   }
+  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
 
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -939,6 +939,7 @@
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
   }
+  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
 
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

Original file line number	Diff line number	Diff line change
`@@ -924,6 +924,7 @@`
`924`	`924`	`NULL\|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf`
`925`	`925`	`NULL\|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf`
`926`	`926`	`}`
	`927`	`+ MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf`
`927`	`928`
`928`	`929`	`MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf`
`929`	`930`	`MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf`
Original file line number	Diff line number	Diff line change
`@@ -939,6 +939,7 @@`
`939`	`939`	`NULL\|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf`
`940`	`940`	`NULL\|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf`
`941`	`941`	`}`
	`942`	`+ MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf`
`942`	`943`
`943`	`944`	`MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf`
`944`	`945`	`MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf`