Drop Qualcomm Mass Storage App

An entry to the new BuiltinLinuxKrl will be added to SimpleInit later

diff --git a/sdm845Pkg/Binary b/sdm845Pkg/Binary
index 8ef0c1c3f33bac3423482561f553cfb5321ce36d..b3a69de2d3eec03d1055b5a79f4d92e5fff889fc 160000 (submodule)
--- a/sdm845Pkg/Binary
+++ b/sdm845Pkg/Binary
@@ -1 +1 @@
-Subproject commit 8ef0c1c3f33bac3423482561f553cfb5321ce36d
+Subproject commit b3a69de2d3eec03d1055b5a79f4d92e5fff889fc

diff --git a/sdm845Pkg/Devices/845.fdf b/sdm845Pkg/Devices/845.fdf
index 6916b7646a7be0ee9e2cc453deef56db3949048e..2bda0f5e849a5bf2b051031d3a8708113bda769d 100644 (file)
--- a/sdm845Pkg/Devices/845.fdf
+++ b/sdm845Pkg/Devices/845.fdf
@@ -566,8 +566,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
-
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/beryllium.fdf b/sdm845Pkg/Devices/beryllium.fdf
index c7bf33ce042fbc524d76955823c3687135d037c0..075b15ffae6bdcdc5dc177c6063910d2fb681f5a 100644 (file)
--- a/sdm845Pkg/Devices/beryllium.fdf
+++ b/sdm845Pkg/Devices/beryllium.fdf
@@ -563,7 +563,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
   INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
 
   #

diff --git a/sdm845Pkg/Devices/dipper.fdf b/sdm845Pkg/Devices/dipper.fdf
index ed2fcc17916fd7752d4f25840eb6d655953c2c27..d313cc4d481ba520e99d192dedbb69f85f22094d 100644 (file)
--- a/sdm845Pkg/Devices/dipper.fdf
+++ b/sdm845Pkg/Devices/dipper.fdf
@@ -554,8 +554,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
-
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/enchilada.fdf b/sdm845Pkg/Devices/enchilada.fdf
index 5043089eeb5882efa95c14d70d2dbbbdf82dc8ef..7a56bf0abe720bab7104dfda089cfaa963241b8d 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -575,8 +575,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-
-  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
   INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
 
 

diff --git a/sdm845Pkg/Devices/fajita.fdf b/sdm845Pkg/Devices/fajita.fdf
index 18536cecabd7812072376c005ff05543667d143f..8fa49e0dbff758f114993c26e7d704518913d942 100644 (file)
--- a/sdm845Pkg/Devices/fajita.fdf
+++ b/sdm845Pkg/Devices/fajita.fdf
@@ -579,7 +579,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
   INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf
 
   #

diff --git a/sdm845Pkg/Devices/m1892.fdf b/sdm845Pkg/Devices/m1892.fdf
index 5b7ee9686efe77927946a1f5559abc9525ffc07f..a9abeff5a20a05c1d4fcc9988ea87d457bd15464 100644 (file)
--- a/sdm845Pkg/Devices/m1892.fdf
+++ b/sdm845Pkg/Devices/m1892.fdf
@@ -572,8 +572,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
-
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/odin.fdf b/sdm845Pkg/Devices/odin.fdf
index 8990db679916bd33b41aae46fbce0c647d1664be..d82112ed2393981787980217eb6e07e56c8acf97 100644 (file)
--- a/sdm845Pkg/Devices/odin.fdf
+++ b/sdm845Pkg/Devices/odin.fdf
@@ -553,8 +553,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
-
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/perseus.fdf b/sdm845Pkg/Devices/perseus.fdf
index 2ca88e73b1276cafe876ea8c1c83525b26fd02ef..f74c2fdab195a2b7b90831eef6bf4268d74d63ed 100644 (file)
--- a/sdm845Pkg/Devices/perseus.fdf
+++ b/sdm845Pkg/Devices/perseus.fdf
@@ -553,8 +553,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
-
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/polaris.fdf b/sdm845Pkg/Devices/polaris.fdf
index 2524c05131ecbb12d51deaed253183bec3020ce5..db350ce0b6a8d34764eb5be085af9ef5060bc8e2 100644 (file)
--- a/sdm845Pkg/Devices/polaris.fdf
+++ b/sdm845Pkg/Devices/polaris.fdf
@@ -561,7 +561,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 !endif #$(INCLUDE_TFTP_COMMAND)\r
 \r
-  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf\r
   INF sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf\r
 \r
   #\r

diff --git a/sdm845Pkg/Devices/trident.fdf b/sdm845Pkg/Devices/trident.fdf
index b15ee841cb52116e451780dd50125cd8ed5f0b5f..4acccd303f4d2ba699e617c4c1ffc946582c43d4 100644 (file)
--- a/sdm845Pkg/Devices/trident.fdf
+++ b/sdm845Pkg/Devices/trident.fdf
@@ -571,7 +571,6 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-  INF  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
 
   #
   # Bds

diff --git a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
index 60b85a11cf06be52fb66fdc3475f5e1b4758788c..cd91f73b80b4e4257367a91021e110ea219a033c 100644 (file)
--- a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -682,18 +682,12 @@ VOID EFIAPI PlatformBootManagerAfterConsole(VOID)
   PlatformRegisterFvBootOption(
       &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE);
 
-  //
-  // Register Qualcomm Mass Storage App
-  //
-  PlatformRegisterFvBootOption(
-      &gUsbfnMsdAppFileGuid, L"UEFI Mass Storage", LOAD_OPTION_ACTIVE);
-
 #ifdef BUILTIN_LINUX_TEST
   //
   // Register Built-in Linux Kernel
   //
   PlatformRegisterFvBootOption(
-      &gBuiltinLinuxKrlFileGuid, L"Linux Mass Storage", LOAD_OPTION_ACTIVE);
+      &gBuiltinLinuxKrlFileGuid, L"USB Attached SCSI (UAS) Storage", LOAD_OPTION_ACTIVE);
 #endif
 
 #ifdef AB_SLOTS_SUPPORT

diff --git a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 7fdfd8097b79504cd21c0e5f20fe0d9e9e0b2398..9dcfbf54f8d69d246ba6f58b4c3f41330fc17622 100644 (file)
--- a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -77,7 +77,6 @@
   gEfiEndOfDxeEventGroupGuid
   gEfiTtyTermGuid
   gUefiShellFileGuid
-  gUsbfnMsdAppFileGuid
   gBuiltinLinuxKrlFileGuid
   gSwitchSlotsAppFileGuid
   gSimpleInitFileGuid

diff --git a/sdm845Pkg/sdm845Pkg.dec b/sdm845Pkg/sdm845Pkg.dec
index ff95c444e90039a08a854f03c957d3214b49848b..12ebcf50447b89d368fd9674dd29c47959086b47 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dec
+++ b/sdm845Pkg/sdm845Pkg.dec
@@ -45,7 +45,6 @@
   gEfiMemCardInfoProtocolGuid       = { 0x85c1f7d2, 0xbce6, 0x4f31, { 0x8f, 0x4d, 0xd3, 0x7e, 0x03, 0xd0, 0x5e, 0xaa } }
 
 [Guids]
-  gUsbfnMsdAppFileGuid                = { 0x1C207232, 0x4086, 0x9BE7, { 0xDB, 0x16, 0x15, 0x9D, 0x66, 0xAB, 0x46, 0x6A } }
   gSwitchSlotsAppFileGuid             = { 0xD5BC0FB1, 0xA833, 0x4607, { 0xB7, 0xB6, 0x5E, 0xF9, 0xD1, 0x0B, 0xEE, 0xB7 } }
   gSimpleInitFileGuid                 = { 0x6D77B2BB, 0x69EB, 0x42AB, { 0xBE, 0xCF, 0x4F, 0x40, 0xC8, 0x95, 0x68, 0xC3 } }
   gBuiltinLinuxKrlFileGuid            = { 0x2a24787e, 0xe09c, 0x43ce, { 0xb5, 0xcf, 0xd0, 0x30, 0x66, 0xf6, 0x09, 0x2f } }

diff --git a/sdm845Pkg/sdm845Pkg.dsc b/sdm845Pkg/sdm845Pkg.dsc
index 2e38eabd9a16b5bccb9ecd425d217cea8f8aecc3..8faeeced0a4055ba24e778632043d3b095c986c8 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dsc
+++ b/sdm845Pkg/sdm845Pkg.dsc
@@ -342,6 +342,4 @@
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
-
-  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf
   sdm845Pkg/Binary/845/BuiltinLinuxKrl/BuiltinLinuxKrl.inf