From b062ed0c866585f17cd34c843578d0430aa4b585 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 20 Sep 2019 14:55:42 -0600 Subject: [PATCH] Make Change Boot Order the primary boot maintenance manager page --- .../Universal/BdsDxe/BootMaint/Bm.vfr | 16 ++++++++-------- .../Universal/BdsDxe/BootMaint/BootMaint.c | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr index 2c97ec76a0..b9646df7ff 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr @@ -26,6 +26,14 @@ formset name = BmmData, guid = BOOT_MAINT_FORMSET_GUID; + form formid = FORM_BOOT_CHG_ID, + title = STRING_TOKEN(STR_FORM_BOOT_CHG_TITLE); + + label FORM_BOOT_CHG_ID; + label LABEL_END; + + endform; + form formid = FORM_MAIN_ID, title = STRING_TOKEN(STR_FORM_MAIN_TITLE); @@ -74,14 +82,6 @@ formset label LABEL_END; endform; - form formid = FORM_BOOT_CHG_ID, - title = STRING_TOKEN(STR_FORM_BOOT_CHG_TITLE); - - label FORM_BOOT_CHG_ID; - label LABEL_END; - - endform; - form formid = FORM_DRV_DEL_ID, title = STRING_TOKEN(STR_FORM_DRV_DEL_TITLE); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c index 187e37ddc7..1797d35c5d 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c @@ -1483,7 +1483,8 @@ FormSetDispatcher ( EFI_BROWSER_ACTION_REQUEST ActionRequest; while (TRUE) { - UpdatePageId (CallbackData, FORM_MAIN_ID); + UpdatePageId (CallbackData, FORM_BOOT_CHG_ID); + UpdatePageBody (FORM_BOOT_CHG_ID, CallbackData); ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE; Status = gFormBrowser2->SendForm (