From fd1d763e36c2c70d4032d02e7ccaa429004a3059 Mon Sep 17 00:00:00 2001 From: Freak2112 <64154433+mhtygt211227@users.noreply.github.com> Date: Thu, 26 Aug 2021 17:15:45 +0300 Subject: [PATCH] Add Mass Storage Uefi Application,Set PlatformBootTimeOut to 3s and Remove some useless drivers --- sdm845Pkg/CommonDsc.dsc.inc | 2 +- sdm845Pkg/Devices/845.fdf | 31 +++++------------ sdm845Pkg/Devices/beryllium.fdf | 30 +++++------------ sdm845Pkg/Devices/dipper.fdf | 32 +++++------------- sdm845Pkg/Devices/enchilada.fdf | 33 ++++++------------- sdm845Pkg/Devices/fajita.fdf | 29 ++++------------ sdm845Pkg/Devices/perseus.fdf | 31 +++++------------ sdm845Pkg/Devices/polaris.fdf | 32 ++++++------------ .../PlatformBootManagerLib/PlatformBm.c | 23 +++++++------ .../PlatformBootManagerLib.inf | 2 ++ sdm845Pkg/sdm845Pkg.dec | 2 ++ sdm845Pkg/sdm845Pkg.dsc | 3 ++ 12 files changed, 81 insertions(+), 169 deletions(-) diff --git a/sdm845Pkg/CommonDsc.dsc.inc b/sdm845Pkg/CommonDsc.dsc.inc index 9e9cff0..da55e3e 100644 --- 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 69f99db..cf953f6 100644 --- 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 83c5e22..648a3ec 100644 --- 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 409b319..8af2e05 100644 --- 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 7fd321a..25f18a6 100644 --- 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 8d6062f..6b8dc63 100644 --- 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 6eac1df..4ce1a1e 100644 --- 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 e959ded..4742cb9 100644 --- a/sdm845Pkg/Devices/polaris.fdf +++ b/sdm845Pkg/Devices/polaris.fdf @@ -484,33 +484,19 @@ 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 @@ -566,6 +552,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/Library/PlatformBootManagerLib/PlatformBm.c b/sdm845Pkg/Library/PlatformBootManagerLib/PlatformBm.c index 0854c91..318456f 100644 --- 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 bde6c1a..ed07963 100644 --- 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 70ecc65..2dc23cf 100644 --- 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 bb95360..2a21a92 100644 --- 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 -- 2.45.2