From 9f936a5a2013accc499272828389082cd8155d78 Mon Sep 17 00:00:00 2001 From: raywu Date: Thu, 17 Jan 2019 16:04:44 +0800 Subject: DW01 - Dynamic Refresh FixBootOrder Setup Items --- .../DefaultFixedBootOrder/DefaultFixedBootOrder.sd | 30 +++++++++++++++++++--- Board/EM/Setup/Boot.vfr | 5 ++++ CRB/CSP.sdl | 2 +- Core/EM/EfiOsBootOptionNames/EfiOsBootOrder.c | 3 ++- SharkBayDT.veb | 4 ++- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/Board/EM/FixedBootOrder/DefaultFixedBootOrder/DefaultFixedBootOrder.sd b/Board/EM/FixedBootOrder/DefaultFixedBootOrder/DefaultFixedBootOrder.sd index 97811b7..15e44b6 100644 --- a/Board/EM/FixedBootOrder/DefaultFixedBootOrder/DefaultFixedBootOrder.sd +++ b/Board/EM/FixedBootOrder/DefaultFixedBootOrder/DefaultFixedBootOrder.sd @@ -180,6 +180,7 @@ STRING_TOKEN(STR_BOOT_ORDER_16) SEPARATOR SUBTITLE(STRING_TOKEN(STR_FIXED_BOOT_ORDER_SUBTITLE)) +suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 1 ; //LEGACY BOOT ITEM suppressif ideqvallist SETUP_DATA.BootMode == 1 2; label AUTO_ID(FIXED_BOOT_ITEM_LABEL1); @@ -195,6 +196,28 @@ STRING_TOKEN(STR_BOOT_ORDER_16) label AUTO_ID(FIXED_BOOT_ITEM_LABEL3); endif; //suppressif #endif +endif ; // suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 1 ; +suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 0 ; + suppressif ideqvallist SETUP_DATA.BootMode == 1 2; + grayoutif TRUE ; + oneof varid = SETUP_DATA.LegacyPriorities[0], + prompt = STRING_TOKEN(STR_BOOT_ORDER_1), + help = STRING_TOKEN(STR_BOOT_OPTION_HELP), + option text = STRING_TOKEN(STR_BOOT_HDD), value = 0, flags = MANUFACTURING | DEFAULT; + endoneof; + endif ; // grayoutif TRUE ; + endif ; // suppressif ideqvallist SETUP_DATA.BootMode == 1 2; + + suppressif ideqvallist SETUP_DATA.BootMode == 0 2; + grayoutif TRUE ; + oneof varid = SETUP_DATA.UefiPriorities[0], + prompt = STRING_TOKEN(STR_BOOT_ORDER_1), + help = STRING_TOKEN(STR_BOOT_OPTION_HELP), + option text = STRING_TOKEN(STR_BOOT_HDD), value = 0, flags = MANUFACTURING | DEFAULT; + endoneof; + endif ; // grayoutif TRUE ; + endif ; // suppressif ideqvallist SETUP_DATA.BootMode == 0 2; +endif ; // suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 0 ; //(EIP107268+)> #if USE_BCP_DEFAULT_PRIORITIES //----------------------------------------------------------------------------------// @@ -749,7 +772,7 @@ STRING_TOKEN(STR_BOOT_ORDER_16) help = STRING_TOKEN(STR_HDD_BOOT_ORDER_HELP); endif; endif; - +suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 1 ; suppressif ideqvallist SETUP_DATA.BootMode == 1; suppressif ideqvallist FIXED_BOOT_GROUP.LegacyODD == 0; goto ODD_BOOT_FORM_ID, @@ -797,6 +820,7 @@ STRING_TOKEN(STR_BOOT_ORDER_16) help = STRING_TOKEN(STR_USBFDD_BOOT_ORDER_HELP); endif; endif; +endif ; // suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 1 ; #endif //-------------------------------------------------- // UEFI GROUP FORM GOTO ITEM @@ -808,7 +832,7 @@ STRING_TOKEN(STR_BOOT_ORDER_16) help = STRING_TOKEN(STR_UEFI_HDD_BOOT_ORDER_HELP); endif; endif; - +suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 1 ; suppressif ideqvallist SETUP_DATA.BootMode == 0; suppressif ideqvallist FIXED_BOOT_GROUP.UefiODD == 0; goto UEFI_ODD_BOOT_FORM_ID, @@ -857,7 +881,7 @@ STRING_TOKEN(STR_BOOT_ORDER_16) help = STRING_TOKEN(STR_UEFI_USBFDD_BOOT_ORDER_HELP); endif; endif; - +endif ; // suppressif ideqvallist SETUP_DATA.OnlyBootHDD == 1 ; #endif //#ifdef FORM_SET_GOTO diff --git a/Board/EM/Setup/Boot.vfr b/Board/EM/Setup/Boot.vfr index e2afabd..bb80a8b 100644 --- a/Board/EM/Setup/Boot.vfr +++ b/Board/EM/Setup/Boot.vfr @@ -186,6 +186,8 @@ formset guid = BOOT_FORM_SET_GUID, #include #undef FORM_SET_ITEM + +#if !FIXED_BOOT_ORDER_SUPPORT //(EIP9585) SEPARATOR SUBTITLE(STRING_TOKEN(STR_BOOT_ORDER_SUBTITLE)) suppressif ideqvallist BOOT_MANAGER.BootCount == 0xFFFF; @@ -211,10 +213,12 @@ formset guid = BOOT_FORM_SET_GUID, help = STRING_TOKEN(STR_BBS_ORDER_HELP); endif; #endif +#endif //#if !FIXED_BOOT_ORDER_SUPPORT //(EIP9585) #define FORM_SET_GOTO #include #undef FORM_SET_GOTO endform; +#if !FIXED_BOOT_ORDER_SUPPORT //(EIP9585) #if !defined(GROUP_BOOT_OPTIONS_BY_TAG) || GROUP_BOOT_OPTIONS_BY_TAG==1 form formid = AUTO_ID(BBS_ORDER_FORM), @@ -237,6 +241,7 @@ formset guid = BOOT_FORM_SET_GUID, endif; endform; #endif +#endif //#if !FIXED_BOOT_ORDER_SUPPORT //(EIP9585) #define FORM_SET_FORM #include #undef FORM_SET_FORM diff --git a/CRB/CSP.sdl b/CRB/CSP.sdl index f462ebc..075a068 100644 --- a/CRB/CSP.sdl +++ b/CRB/CSP.sdl @@ -1666,7 +1666,7 @@ End TOKEN Name = "BBS_USB_DEVICE_TYPE_SUPPORT" - Value = "1" + Value = "0" Help = "Treat USB devices as a separate BBS device type" TokenType = Boolean TargetH = Yes diff --git a/Core/EM/EfiOsBootOptionNames/EfiOsBootOrder.c b/Core/EM/EfiOsBootOptionNames/EfiOsBootOrder.c index df5ef53..5479598 100644 --- a/Core/EM/EfiOsBootOptionNames/EfiOsBootOrder.c +++ b/Core/EM/EfiOsBootOptionNames/EfiOsBootOrder.c @@ -1432,7 +1432,8 @@ BOOLEAN RemoveLegacyGptHdd(BOOT_DEVICE *Device){ Status = pRS->GetVariable(L"Setup", &SetupGuid, NULL, &Size, &SetupData); - if( Device->BbsEntry->DeviceType != BBS_HARDDISK && SetupData.OnlyBootHDD == 1 ) return TRUE; +// if( Device->BbsEntry->DeviceType != BBS_HARDDISK && SetupData.OnlyBootHDD == 1 ) return TRUE; + if( Device->BbsEntry->Class != PCI_CL_MASS_STOR && SetupData.OnlyBootHDD == 1 ) return TRUE; return FALSE; } #endif diff --git a/SharkBayDT.veb b/SharkBayDT.veb index a56672a..bb82821 100644 --- a/SharkBayDT.veb +++ b/SharkBayDT.veb @@ -795,7 +795,9 @@ "Core\EM\AMIDebugRx\binaries\LIBS\DbgrUsbCableSelectLib.cif"= "SS: Alaska;$/Alaska/BIN/Modules/AMIDebugRx\binaries/LIBS;4.6.2_AMIDebugRx_2.04.0074" "Core\EM\AMIDebugRx\binaries\LIBS\DbgrX64Lib\DbgrX64Lib.cif"= "SS: Alaska;$/Alaska/BIN/Modules/AMIDebugRx\binaries/LIBS/DbgrX64Lib;4.6.2_AMIDebugRx_2.04.0074" "Core\EM\AMIDebugRx\binaries\LIBS\DebuggerLib\DebuggerLib.cif"= "SS: Alaska;$/Alaska/BIN/Modules/AMIDebugRx\binaries/LIBS/DebuggerLib;4.6.2_AMIDebugRx_2.04.0074" - +"FixedBootOrder.cif"= "SS: ALASKA;$/Alaska/BIN/Modules/Template/FixedBootOrder Demo;4.6.5.1_FixedBootOrder_17" +"Board\EM\FixedBootOrder\DefaultFixedBootOrder\DefaultFixedBootOrder.cif"= "SS: ALASKA;$/Alaska/BIN/Modules/Template/FixedBootOrder Demo\Board/em/FixedBootOrder;4.6.5.1_FixedBootOrder_17" +"Board\EM\FixedBootOrder\FixedBootOrderStyle\FixedBootOrderStyle.cif"= "SS: ALASKA;$/Alaska/BIN/Modules/Template/FixedBootOrder Demo\Board/em/FixedBootOrder;4.6.5.1_FixedBootOrder_17" "Board\Board.cif"= "SS: Alaska;$/Alaska/BIN/Board;4.6.5.4_Board_31" "Board\em\Setup\Setup.cif"= "SS: Alaska;$/Alaska/BIN/Board\Setup;4.6.5.4_Board_31" "Include\Protocol\AmiSetupProtocol.cif"= "SS: ALASKA;$/Alaska/BIN/Board\Setup;4.6.5.4_Board_31" -- cgit v1.2.3