summaryrefslogtreecommitdiff
path: root/EDK
diff options
context:
space:
mode:
authorraywu <raywu@aaeon.com.tw>2018-09-14 08:31:46 +0800
committerraywu <raywu@aaeon.com.tw>2018-09-14 08:31:46 +0800
commit86318e713d1a2ec5a8165a8964d570e4c5a90dd8 (patch)
treec507aaba039b70236b53bd8bbff8c5709a7697ae /EDK
parent31bb486c913795c8b67d1c4dbaae2bdec4943fc9 (diff)
downloadzprj-86318e713d1a2ec5a8165a8964d570e4c5a90dd8.tar.xz
BIOS Custom Done
Diffstat (limited to 'EDK')
-rw-r--r--EDK/MiniSetup/BootOnly/postmgmtext.c3
-rw-r--r--EDK/MiniSetup/TseLite/callback.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/EDK/MiniSetup/BootOnly/postmgmtext.c b/EDK/MiniSetup/BootOnly/postmgmtext.c
index 530be2a..1daeb48 100644
--- a/EDK/MiniSetup/BootOnly/postmgmtext.c
+++ b/EDK/MiniSetup/BootOnly/postmgmtext.c
@@ -554,7 +554,8 @@ UINT32 CheckSystemPassword(UINT32 EmptyPasswordType, UINTN *NoOfRetries, UINTN *
(!(PasswordInstalled & AMI_PASSWORD_USER ))&&
(EmptyPasswordType & AMI_PASSWORD_USER)
)
- PasswordCheck = AMI_PASSWORD_USER;
+ //PasswordCheck = AMI_PASSWORD_USER;
+ PasswordCheck = AMI_PASSWORD_NONE;
if(
(!(PasswordInstalled & AMI_PASSWORD_ADMIN ))&&
(EmptyPasswordType & AMI_PASSWORD_ADMIN)
diff --git a/EDK/MiniSetup/TseLite/callback.c b/EDK/MiniSetup/TseLite/callback.c
index 1bd6f91..572ac4c 100644
--- a/EDK/MiniSetup/TseLite/callback.c
+++ b/EDK/MiniSetup/TseLite/callback.c
@@ -607,7 +607,7 @@ VOID _LoadDefaults( NVRAM_VARIABLE *defaults, UINTN data )
( controlInfo->ControlVariable == VARIABLE_ID_LEGACY_GROUP_INFO) ||
( controlInfo->ControlVariable == VARIABLE_ID_ADD_DRIVER_OPTION) || //EIP70421 & 70422 Support for driver order
(controlInfo->ControlVariable == VARIABLE_ID_DEL_DRIVER_OPTION) ||
- ( (TSEDonotLoadPasswordOnDefaults()) && (controlInfo->ControlVariable == VARIABLE_ID_AMITSESETUP) ) ) //EIP 93881 & 93873 : Save pwd to nvram and not loading empty pwd on loading defaults.
+ ( (TSEDonotLoadPasswordOnDefaults()) && (controlInfo->ControlVariable == VARIABLE_ID_AMITSESETUP && (controlInfo->ControlType == CONTROL_TYPE_PASSWORD) ) ) ) //EIP 93881 & 93873 : Save pwd to nvram and not loading empty pwd on loading defaults.
continue;
else if( ((defaults[controlInfo->ControlVariable].Buffer != NULL) && (defaults[controlInfo->ControlVariable].Size))
&&((VARIABLE_ID_BOOT_ORDER == controlInfo->ControlVariable) || (VARIABLE_ID_DRIVER_ORDER == controlInfo->ControlVariable))