1 files changed, 27 insertions, 30 deletions
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index e4f6057f40..ff895bccf0 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -40,7 +40,6 @@ SHELL_PARAM_ITEM    mIpSecConfigParamList[] = {
   { L"-enable",               TypeFlag },
   { L"-disable",              TypeFlag },
   { L"-status",               TypeFlag },
-  { L"-?",                    TypeFlag },
 
   //
   // SPD Selector
@@ -622,11 +621,36 @@ InitializeIpSecConfig (
   CONST CHAR16                  *ValueStr;
   CHAR16                        *ProblemParam;
   UINTN                         NonOptionCount;
+  EFI_HII_PACKAGE_LIST_HEADER   *PackageList;
 
   //
-  // Register our string package with HII and return the handle to it.
+  // Retrieve HII package list from ImageHandle
   //
-  mHiiHandle = HiiAddPackages (&gEfiCallerIdGuid, ImageHandle, IpSecConfigStrings, NULL);
+  Status = gBS->OpenProtocol (
+                  ImageHandle,
+                  &gEfiHiiPackageListProtocolGuid,
+                  (VOID **) &PackageList,
+                  ImageHandle,
+                  NULL,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Publish HII package list to HII Database.
+  //
+  Status = gHiiDatabase->NewPackageList (
+                          gHiiDatabase,
+                          PackageList,
+                          NULL,
+                          &mHiiHandle
+                          );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
   ASSERT (mHiiHandle != NULL);
 
   Status = ShellCommandLineParseEx (mIpSecConfigParamList, &ParamPackage, &ProblemParam, TRUE, FALSE);
@@ -728,33 +752,6 @@ InitializeIpSecConfig (
     }
   }
 
-  if (ShellCommandLineGetFlag (ParamPackage, L"-?")) {
-    if (DataType == -1) {
-      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_HELP), mHiiHandle);
-      goto Done;
-    }
-
-    switch (DataType) {
-      case IPsecConfigDataTypeSpd:
-        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_SPD_HELP), mHiiHandle);
-        break;
-
-      case IPsecConfigDataTypeSad:
-        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_SAD_HELP), mHiiHandle);
-        break;
-
-      case IPsecConfigDataTypePad:
-        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_PAD_HELP), mHiiHandle);
-        break;
-
-      default:
-        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_INCORRECT_DB), mHiiHandle);
-        break;
-    }
-
-    goto Done;
-  }
-
   NonOptionCount = ShellCommandLineGetCount (ParamPackage);
   if ((NonOptionCount - 1) > 0) {
     ValueStr = ShellCommandLineGetRawValue (ParamPackage, (UINT32) (NonOptionCount - 1));