Add Mass Storage Uefi Application,Set PlatformBootTimeOut to 3s and Remove some usele...

diff --git a/sdm845Pkg/CommonDsc.dsc.inc b/sdm845Pkg/CommonDsc.dsc.inc
index 9e9cff0437ce2b739be4fbcb28366be61cf15bef..da55e3e7064db1489edc131eacae4a758fbe75cd 100644 (file)
--- a/sdm845Pkg/CommonDsc.dsc.inc
+++ b/sdm845Pkg/CommonDsc.dsc.inc
@@ -332,6 +332,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32
 
 [PcdsDynamicHii.common.DEFAULT]
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|0 # Variable: L"Timeout"
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|3 # Variable: L"Timeout"
 
 

diff --git a/sdm845Pkg/Devices/845.fdf b/sdm845Pkg/Devices/845.fdf
index 69f99dbbf622410a0f4d7005424c57000a4abac4..cf953f684c806a53024781024bdf99a7d5d48432 100644 (file)
--- a/sdm845Pkg/Devices/845.fdf
+++ b/sdm845Pkg/Devices/845.fdf
@@ -497,33 +497,16 @@ APRIORI DXE {
     SECTION UI = "UFSDxe"
   }
 
-  #
-  # Virtual Keyboard
-  #
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
+
 
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # USB Host Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-
-  #
-  # USB Mass Storage Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  #
-  # USB Peripheral Support
-  #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-
-  #
-  # Fastboot
-  #
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
@@ -570,6 +553,8 @@ 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 83c5e22f136bcaf20eebcaaaf4db5d2fc8c06a4f..648a3ec8b9e5fd25337b42780cb94e1a8f12dc6c 100644 (file)
--- a/sdm845Pkg/Devices/beryllium.fdf
+++ b/sdm845Pkg/Devices/beryllium.fdf
@@ -485,33 +485,17 @@ APRIORI DXE {
     SECTION UI = "UFSDxe"
   }
 
-  #
-  # Virtual Keyboard
-  #
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
+
 
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # USB Host Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 
-  #
-  # USB Mass Storage Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  #
-  # USB Peripheral Support
-  #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-
-  #
-  # Fastboot
-  #
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
@@ -567,6 +551,8 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+  INF  sdm845Pkg/Drivers/UsbfnMsdApp/UsbfnMsdApp.inf
+
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/dipper.fdf b/sdm845Pkg/Devices/dipper.fdf
index 409b3196a551225d2797887ee35463e3185fe208..8af2e05fcc7494256c4f10b178f9b29062ac9c94 100644 (file)
--- a/sdm845Pkg/Devices/dipper.fdf
+++ b/sdm845Pkg/Devices/dipper.fdf
@@ -485,33 +485,17 @@ APRIORI DXE {
     SECTION UI = "UFSDxe"
   }
 
-  #
-  # Virtual Keyboard
-  #
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
 
-  INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
-  INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # USB Host Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 
-  #
-  # USB Mass Storage Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  #
-  # USB Peripheral Support
-  #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
+  INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
+  INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # Fastboot
-  #
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
@@ -558,6 +542,8 @@ 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 7fd321af6b998ffbf6ec9dcfccaaa4bff79a38f5..25f18a65cd8cca4ed27414a3a3db44f503fdddd5 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -497,34 +497,17 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/Synaptics/SynapticsTouchDeviceDxe.efi
     SECTION UI = "SynapticsTouchDeviceDxe"
   }
+
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
   
-  #
-  # Virtual Keyboard
-  #
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
 
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # USB Host Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-
-  #
-  # USB Mass Storage Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  #
-  # USB Peripheral Support
-  #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-
-  #
-  # Fastboot
-  #
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
@@ -580,6 +563,10 @@ 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/fajita.fdf b/sdm845Pkg/Devices/fajita.fdf
index 8d6062f061403c6792584dd70d55c389aec0b40b..6b8dc6316fbc4500b38aa86f8443fc20b2ecdad2 100644 (file)
--- a/sdm845Pkg/Devices/fajita.fdf
+++ b/sdm845Pkg/Devices/fajita.fdf
@@ -497,34 +497,17 @@ APRIORI DXE {
     SECTION UI = "SynapticsTouchDeviceDxe"
   }
 
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
 
-  #
-  # Virtual Keyboard
-  #
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
 
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # USB Host Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-
-  #
-  # USB Mass Storage Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  #
-  # USB Peripheral Support
-  #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
 
-  #
-  # Fastboot
-  #
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
@@ -580,6 +563,8 @@ 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 6eac1df95b07f87f0a036ed598d89c643b7e37a4..4ce1a1e87d9f3152ec20093d4ad7e5e74f25890f 100644 (file)
--- a/sdm845Pkg/Devices/perseus.fdf
+++ b/sdm845Pkg/Devices/perseus.fdf
@@ -485,33 +485,16 @@ APRIORI DXE {
     SECTION UI = "UFSDxe"
   }
 
-  #
-  # Virtual Keyboard
-  #
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
+
 
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
-  #
-  # USB Host Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-
-  #
-  # USB Mass Storage Support
-  #
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  #
-  # USB Peripheral Support
-  #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-
-  #
-  # Fastboot
-  #
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
@@ -558,6 +541,8 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+  INF  sdm845Pkg/Drivers/UsbfnMsdApp/UsbfnMsdApp.inf
+
   #
   # Bds
   #

diff --git a/sdm845Pkg/Devices/polaris.fdf b/sdm845Pkg/Devices/polaris.fdf
index e959ded97c8f6bc0deea35fb17ae24da57f8651f..4742cb92663ca9776e7927d1e62a8b3373d0dbc1 100644 (file)
--- a/sdm845Pkg/Devices/polaris.fdf
+++ b/sdm845Pkg/Devices/polaris.fdf
@@ -484,33 +484,19 @@ APRIORI DXE {
     SECTION UI = "UFSDxe"\r
   }\r
 \r
-  #\r
-  # Virtual Keyboard\r
-  #\r
-  INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf\r
+    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi\r
+    SECTION UI = "UsbMsdDxe"\r
+  }\r
 \r
-  INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf\r
-  INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf\r
 \r
-  #\r
-  # USB Host Support\r
-  #\r
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
 \r
-  #\r
-  # USB Mass Storage Support\r
-  #\r
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
 \r
-  #\r
-  # USB Peripheral Support\r
-  #\r
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf\r
+  INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf\r
+  INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf\r
+\r
 \r
-  #\r
-  # Fastboot\r
-  #\r
-  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf\r
 \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
@@ -566,6 +552,8 @@ APRIORI DXE {
   INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 !endif #$(INCLUDE_TFTP_COMMAND)\r
 \r
+  INF sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf\r
+\r
   #\r
   # Bds\r
   #\r

diff --git a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
index 0854c91c1eb2cbe9ee764f28d8f4ad9364be1a0e..318456f127929c247853aa61cfb6e96f8b80b304 100644 (file)
--- a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -32,6 +32,8 @@
 
 #include "PlatformBm.h"
 
+
+
 #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) }
 
 #pragma pack (1)
@@ -705,7 +707,7 @@ PlatformBootManagerAfterConsole (
       Print (VERSION_STRING_PREFIX L"%s\n",
         PcdGetPtr (PcdFirmwareVersionString));
     }
-    Print (L"Press ESCAPE for boot options ");
+    Print (L"Press a any side button for for boot options");
   } else if (FirmwareVerLength > 0) {
     Status = gBS->HandleProtocol (gST->ConsoleOutHandle,
                     &gEfiGraphicsOutputProtocolGuid, (VOID **)&GraphicsOutput);
@@ -742,15 +744,16 @@ PlatformBootManagerAfterConsole (
   //
   // Register UEFI Shell
   //
+  PlatformRegisterFvBootOption (
+  &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE
+  );
    
-       
-   /*PlatformRegisterFvBootOption (
-       &gEfiAblFvNameGuid, L"Android Fastboot App", LOAD_OPTION_ACTIVE
-       );*/
-    PlatformRegisterFvBootOption (
-    &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE
-    );
-
+  //
+  // Register Mass Storage App
+  //
+  PlatformRegisterFvBootOption (
+  &gUsbfnMsdAppFileGuid, L"Mass Storage", LOAD_OPTION_ACTIVE
+  );
 }
 
 /**
@@ -778,7 +781,7 @@ PlatformBootManagerWaitCallback (
   Status = BootLogoUpdateProgress (
              White.Pixel,
              Black.Pixel,
-             L"Press ESCAPE for boot options",
+             L"Press a any side button for for boot options",
              White.Pixel,
              (Timeout - TimeoutRemain) * 100 / Timeout,
              0

diff --git a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index bde6c1a1551053731fddda8472e0479405556c91..ed079639059adabb8e3ea26dca9901729fffeb79 100644 (file)
--- a/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -33,6 +33,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   ShellPkg/ShellPkg.dec
+  sdm845Pkg/sdm845Pkg.dec
 
 [LibraryClasses]
   BaseLib
@@ -76,6 +77,7 @@
   gEfiEndOfDxeEventGroupGuid
   gEfiTtyTermGuid
   gUefiShellFileGuid
+  gUsbfnMsdAppFileGuid
 
 [Protocols]
   gEdkiiNonDiscoverableDeviceProtocolGuid

diff --git a/sdm845Pkg/sdm845Pkg.dec b/sdm845Pkg/sdm845Pkg.dec
index 70ecc658f4c502c264514ec6b1b4d878d0255dac..2dc23cf7eeae793e717fa24c7c2b2f4b778ec800 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dec
+++ b/sdm845Pkg/sdm845Pkg.dec
@@ -34,6 +34,8 @@
 [Protocols]
   gEFIDroidKeypadDeviceProtocolGuid = { 0xb27625b5, 0x0b6c, 0x4614, { 0xaa, 0x3c, 0x33, 0x13, 0xb5, 0x1d, 0x36, 0x46 } }
 
+[Guids]
+gUsbfnMsdAppFileGuid                = { 0x1C207232, 0x4086, 0x9BE7, { 0xDB, 0x16, 0x15, 0x9D, 0x66, 0xAB, 0x46, 0x6A } }
 
 [PcdsFixedAtBuild.common]
   # Simple FrameBuffer

diff --git a/sdm845Pkg/sdm845Pkg.dsc b/sdm845Pkg/sdm845Pkg.dsc
index bb953601dbddf180d411bb4c423017df437e0c09..2a21a9236d154ba1bfca5b2656ca19a45af52258 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dsc
+++ b/sdm845Pkg/sdm845Pkg.dsc
@@ -306,3 +306,6 @@
 !ifdef $(INCLUDE_TFTP_COMMAND)
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
+
+
+  sdm845Pkg/Binary/845/UsbfnMsdApp/UsbfnMsdApp.inf