Revision: 16982
http://sourceforge.net/p/edk2/code/16982
Author: hwu1225
Date: 2015-03-02 06:38:03 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
Clean up the code. Action statement should not have text two opcode.
(Sync patch r16221 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/16221
Modified Paths:
--------------
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
branches/UDK2014.SP1/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
branches/UDK2014.SP1/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
branches/UDK2014.SP1/NetworkPkg/Ip6Dxe/Ip6Config.vfr
branches/UDK2014.SP1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
Modified:
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
===================================================================
---
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -82,7 +82,6 @@
text
help = STRING_TOKEN(STR_RESET),
text = STRING_TOKEN(STR_RESET),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = FORM_RESET;
Modified:
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
===================================================================
---
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -66,14 +66,12 @@
text
help = STRING_TOKEN(STR_SAVE_AND_EXIT),
text = STRING_TOKEN(STR_SAVE_AND_EXIT),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = KEY_VALUE_SAVE_AND_EXIT_BOOT;
text
help = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
text = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;
@@ -117,14 +115,12 @@
text
help = STRING_TOKEN(STR_SAVE_AND_EXIT),
text = STRING_TOKEN(STR_SAVE_AND_EXIT),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = KEY_VALUE_SAVE_AND_EXIT_DRIVER; //BUGBUB: allow duplicate
key in one formset???
text
help = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
text = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER;
Modified:
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
===================================================================
---
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -106,7 +106,6 @@
text
help = STRING_TOKEN(STR_CONTINUE_HELP),
text = STRING_TOKEN(STR_CONTINUE_PROMPT),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = FRONT_PAGE_KEY_CONTINUE;
Modified:
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
===================================================================
---
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -207,7 +207,6 @@
text
help = STRING_TOKEN (STR_SAVE_CHANGES),
text = STRING_TOKEN (STR_SAVE_CHANGES),
- text = STRING_TOKEN (STR_SAVE_CHANGES),
flags = INTERACTIVE,
key = KEY_SAVE_CHANGES;
Modified:
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
===================================================================
---
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -82,7 +82,6 @@
text
help = STRING_TOKEN(STR_SAVE_CHANGES),
text = STRING_TOKEN(STR_SAVE_CHANGES),
- text = STRING_TOKEN(STR_SAVE_CHANGES),
flags = INTERACTIVE,
key = KEY_SAVE_CHANGES;
Modified:
branches/UDK2014.SP1/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
===================================================================
--- branches/UDK2014.SP1/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++ branches/UDK2014.SP1/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -42,7 +42,6 @@
text
help = STRING_TOKEN(STR_FIRST_REFRESH_HELP),
text = STRING_TOKEN(STR_FIRST_REFRESH),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = KEY_VALUE_DEVICE_REFRESH;
@@ -102,7 +101,6 @@
text
help = STRING_TOKEN (STR_NULL_STRING),
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_SAVE_AND_EXIT),
flags = INTERACTIVE | RESET_REQUIRED,
key = KEY_VALUE_ORDER_SAVE_AND_EXIT;
endform;
Modified: branches/UDK2014.SP1/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
===================================================================
--- branches/UDK2014.SP1/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr 2015-02-28
20:34:36 UTC (rev 16981)
+++ branches/UDK2014.SP1/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr 2015-03-02
06:38:03 UTC (rev 16982)
@@ -88,14 +88,12 @@
text
help = STRING_TOKEN (STR_SAVE_AND_EXIT),
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_SAVE_AND_EXIT),
flags = INTERACTIVE,
key = KEY_SAVE_ORDER_CHANGES;
text
help = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
flags = INTERACTIVE,
key = KEY_IGNORE_ORDER_CHANGES;
endform;
@@ -109,14 +107,12 @@
text
help = STRING_TOKEN (STR_SAVE_AND_EXIT),
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_SAVE_AND_EXIT),
flags = INTERACTIVE,
key = KEY_SAVE_DELETE_ATTEMPT;
text
help = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
flags = INTERACTIVE,
key = KEY_IGNORE_DELETE_ATTEMPT;
endform;
@@ -353,7 +349,6 @@
text
help = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
text = STRING_TOKEN (STR_SAVE_CHANGES),
- text = STRING_TOKEN (STR_SAVE_CHANGES),
flags = INTERACTIVE,
key = KEY_SAVE_ATTEMPT_CONFIG;
Modified: branches/UDK2014.SP1/NetworkPkg/Ip6Dxe/Ip6Config.vfr
===================================================================
--- branches/UDK2014.SP1/NetworkPkg/Ip6Dxe/Ip6Config.vfr 2015-02-28
20:34:36 UTC (rev 16981)
+++ branches/UDK2014.SP1/NetworkPkg/Ip6Dxe/Ip6Config.vfr 2015-03-02
06:38:03 UTC (rev 16982)
@@ -127,7 +127,6 @@
text
help = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
text = STRING_TOKEN (STR_SAVE_CHANGES),
- text = STRING_TOKEN (STR_NULL),
flags = INTERACTIVE,
key = KEY_SAVE_CHANGES;
@@ -166,14 +165,12 @@
text
help = STRING_TOKEN (STR_SAVE_AND_EXIT),
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_SAVE_AND_EXIT),
flags = INTERACTIVE,
key = KEY_SAVE_CONFIG_CHANGES;
text
help = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
- text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
flags = INTERACTIVE,
key = KEY_IGNORE_CONFIG_CHANGES;
Modified:
branches/UDK2014.SP1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -24,9 +24,8 @@
title = STRING_TOKEN(STR_FORM_TITLE);
text
- help = STRING_TOKEN(STR_NULL_STRING),
+ help = STRING_TOKEN(STR_NULL_STRING),
text = STRING_TOKEN(STR_INPUT_PASSWORD),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = KEY_GET_PASSWORD;
Modified:
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -27,7 +27,6 @@
text
help = STRING_TOKEN(STR_NULL_STRING),
text = STRING_TOKEN(STR_NULL_STRING),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = FORM_OPEN_QUESTION_ID;
endif;
Modified:
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -35,7 +35,6 @@
text
help = STRING_TOKEN(STR_NULL_STRING),
text = STRING_TOKEN(STR_NULL_STRING),
- text = STRING_TOKEN(STR_NULL_STRING),
flags = INTERACTIVE,
key = QUESTIONID_USER_MANAGE;
endif;
Modified:
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
===================================================================
---
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
2015-02-28 20:34:36 UTC (rev 16981)
+++
branches/UDK2014.SP1/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
2015-03-02 06:38:03 UTC (rev 16982)
@@ -495,14 +495,12 @@
text
help = STRING_TOKEN(STR_SAVE_AND_EXIT),
text = STRING_TOKEN(STR_SAVE_AND_EXIT),
- text = STRING_TOKEN(STR_NULL),
flags = INTERACTIVE,
key = KEY_VALUE_SAVE_AND_EXIT_PK;
text
help = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
text = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
- text = STRING_TOKEN(STR_NULL),
flags = INTERACTIVE,
key = KEY_VALUE_NO_SAVE_AND_EXIT_PK;
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
