From 7db76c4a1072cc92bdf3bde11572ff51aea8855e Mon Sep 17 00:00:00 2001
From: raywu <raywu@aaeon.com.tw>
Date: Thu, 12 Sep 2019 14:54:04 +0800
Subject: [FormalRelease] Change to DW01VR16 / No Boot Logo / No Password /
 Only Boot HDD Disabled

---
 CRB/CRB.sdl                                        | 18 ++++++++++--------
 CRB/CSP.sdl                                        | 22 +++++++++++++++++++++-
 .../EfiOsBootOptionNames/EfiOsBootOptionNames.sd   |  5 +++--
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/CRB/CRB.sdl b/CRB/CRB.sdl
index 1900690..ca659b3 100644
--- a/CRB/CRB.sdl
+++ b/CRB/CRB.sdl
@@ -2346,14 +2346,16 @@ End
 ##	Token = "WIN8_FEATURE_SUPPORT" "=" "1"
 ##End
 
-TOKEN
-	Name  = "DEFAULT_QUIET_BOOT"
-	Value  = "1"
-	Help  = "Default value of the Quiet Boot option"
-	TokenType = Boolean
-	TargetH = Yes
-	Token = "WIN8_FEATURE_SUPPORT" "=" "1"
-End
+##ray_override / [FormalRelease_VersionRevert_DW01VR16] Not Support GRG Logo / Removed >>
+##TOKEN
+##	Name  = "DEFAULT_QUIET_BOOT"
+##	Value  = "1"
+##	Help  = "Default value of the Quiet Boot option"
+##	TokenType = Boolean
+##	TargetH = Yes
+##	Token = "WIN8_FEATURE_SUPPORT" "=" "1"
+##End
+##ray_override / [FormalRelease_VersionRevert_DW01VR16] Not Support GRG Logo / Removed <<
 
 TOKEN
 	Name  = "OPTIMIZE_BOOT_FV_COPY"
diff --git a/CRB/CSP.sdl b/CRB/CSP.sdl
index 7a7b226..534ff89 100644
--- a/CRB/CSP.sdl
+++ b/CRB/CSP.sdl
@@ -1539,9 +1539,11 @@ TOKEN
 	TargetH = Yes
 	Token = "SETUP_BBS_POPUP_ENABLE" "!=" "0"
 End
+
+##ray_override / [FormalRelease_VersionRevert_DW01VR16] Not Support Default Password / Modified 1 -> 0
 TOKEN
 	Name  = "TSE_DEFAULT_SETUP_PASSWORD_SUPPORT"
-	Value  = "1"
+	Value  = "0"
 	Help  = "0 is default.set 1=> to Enable default setup password"
 	TokenType = Expression
 	TargetH = Yes
@@ -1724,6 +1726,24 @@ TOKEN
 #	Token = "NUMBER_OF_BASEBOARDS" "=" "1"
 End
 
+##ray_override / [FormalRelease_VersionRevert_DW01VR16] Not Support GRG Logo / Added >>
+ELINK
+	Name  = "$(BUILD_DIR)\Logo.ffs"
+	Parent  = "FV_MAIN"
+	InvokeOrder = AfterParent
+	Disable = Yes
+End
+
+TOKEN
+	Name  = "DEFAULT_QUIET_BOOT"
+	Value  = "0"
+	Help  = "Default value of the Quiet Boot option"
+	TokenType = Boolean
+	TargetH = Yes
+#	Token = "WIN8_FEATURE_SUPPORT" "=" "1"
+End
+##ray_override / [FormalRelease_VersionRevert_DW01VR16] Not Support GRG Logo / Added <<
+
 TOKEN
 	Name  = "TSE_MULTILINE_CONTROLS"
 	Value  = "1"
diff --git a/Core/EM/EfiOsBootOptionNames/EfiOsBootOptionNames.sd b/Core/EM/EfiOsBootOptionNames/EfiOsBootOptionNames.sd
index f966552..f1d66d1 100644
--- a/Core/EM/EfiOsBootOptionNames/EfiOsBootOptionNames.sd
+++ b/Core/EM/EfiOsBootOptionNames/EfiOsBootOptionNames.sd
@@ -101,11 +101,12 @@
         EOBON_ONEOF_NEW_OPTION_POLICY
         
         SEPARATOR
+//ray_override / [FormalRelease_VersionRevert_DW01VR16] Only Boot HDD Disabled as Default / Modified STR_ENABLED -> STR_DISABLED
         oneof varid = SETUP_DATA.OnlyBootHDD,
             prompt = STRING_TOKEN(STR_ONLY_BOOT_HDD),
             help = STRING_TOKEN(STR_ONLY_BOOT_HDD),
-            option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED, key = 0;
-            option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = 0, key = 0;
+            option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = 0, key = 0;
+            option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED, key = 0;
         endoneof;
 	#endif 	//#ifdef FORM_SET_FORM
 						
-- 
cgit v1.2.3