Fix trigger fw update fail through fastboot binary in SPI

Change-Id: I2a792c87ea4d1f38f6fb2b698082252c48f39952
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-67513
Signed-off-by: sunxunou <[email protected]>
Reviewed-on: https://android.intel.com:443/635430

Author: GraspEmpty

drivers/abl/capsule_msg.c

@@ -168,17 +168,6 @@ static unsigned heci_send_user_command(uint8_t *data, uint8_t length)
 }
 
 #ifdef CAPSULE4SBL
-typedef enum {
-	OsBootDeviceSata,
-	OsBootDeviceSd,
-	OsBootDeviceEmmc,
-	OsBootDeviceUfs,
-	OsBootDeviceSpi,
-	OsBootDeviceUsb,
-	OsBootDeviceNvme,
-	OsBootDeviceMax
-} SBL_OS_BOOT_MEDIUM_TYPE;
-
 typedef enum  {
 	EnumFileSystemTypeFat,
 	EnumFileSystemTypeExt2,

include/libefiwrapper/storage.h

@@ -58,6 +58,18 @@ enum storage_type {
 	STORAGE_ALL
 };
 
+typedef enum {
+	OsBootDeviceSata,
+	OsBootDeviceSd,
+	OsBootDeviceEmmc,
+	OsBootDeviceUfs,
+	OsBootDeviceSpi,
+	OsBootDeviceUsb,
+	OsBootDeviceNvme,
+	OsBootDeviceMemory,
+	OsBootDeviceMax
+} SBL_OS_BOOT_MEDIUM_TYPE;
+
 typedef struct boot_dev {
 	enum storage_type type;
 	UINT32 diskbus;

libefiwrapper/storage.c

@@ -92,17 +92,6 @@ typedef struct {
 	OS_BOOT_DEVICE	BootDevice[0];
 }__attribute__((__packed__))  OS_BOOT_DEVICE_LIST;
 
-typedef enum {
-	OsBootDeviceSata,
-	OsBootDeviceSd,
-	OsBootDeviceEmmc,
-	OsBootDeviceUfs,
-	OsBootDeviceSpi,
-	OsBootDeviceUsb,
-	OsBootDeviceNvme,
-	OsBootDeviceMax
-} SBL_OS_BOOT_MEDIUM_TYPE;
-
 static EFI_STATUS dp_init(EFI_SYSTEM_TABLE *st, media_t *media,
 			  EFI_HANDLE *handle)
 {
@@ -257,7 +246,7 @@ EFI_STATUS identify_flash_media(boot_dev_t* pdev)
 
 	type = (SBL_OS_BOOT_MEDIUM_TYPE)(plist->BootDevice[0].DevType);
 
-	if (type != OsBootDeviceSpi) {
+	if ((type != OsBootDeviceSpi) && (type != OsBootDeviceMemory)) {
 		ewdbg("Select 1st boot dev");
 		pdev->type = convert_sbl_dev_type(type);
 		pdev->diskbus = plist->BootDevice[0].DevAddr;
@@ -297,7 +286,7 @@ EFI_STATUS identify_boot_media()
 		boot_dev.type = STORAGE_NVME;
 	else if (!strncmp(val, "VIRTUAL", len))
 		boot_dev.type = STORAGE_VIRTUAL;
-	else if (!strncmp(val, "SPI", len)) //Fastboot case
+	else if ((!strncmp(val, "SPI", len)) || (!strncmp(val, "MEM", len))) //Fastboot case
 		identify_flash_media(&boot_dev);
 
 	//if diskbus is already get from boot option list