From 9f936a5a2013accc499272828389082cd8155d78 Mon Sep 17 00:00:00 2001
From: raywu <raywu@aaeon.com.tw>
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 ++++
 2 files changed, 32 insertions(+), 3 deletions(-)

(limited to 'Board/EM')

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 <SetupDefinitions.h>
         #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 <SetupDefinitions.h>
         #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 <SetupDefinitions.h>
     #undef FORM_SET_FORM
-- 
cgit v1.2.3