diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2018-02-08 10:59:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 10:59:50 +0800 |
| commit | 69a8c5fc495a5fd524c7187382c2b82bc253b2ad (patch) | |
| tree | 6fddac5087d566ef541f5727a190a38e3109ddce | |
| parent | 7bd1f0a7fa79db09cf9564c14a4fe3843a88e455 (diff) | |
| parent | f9b1e032239ca4f7977c44018f7fd7c116377af8 (diff) | |
| download | OpenPlatformPkg-69a8c5fc495a5fd524c7187382c2b82bc253b2ad.tar.gz | |
Merge pull request #91 from hzhuang1/topic/sd_boot_v1
Topic/sd boot v1
| -rw-r--r-- | Platforms/Hisilicon/HiKey/HiKey.dsc | 4 | ||||
| -rw-r--r-- | Platforms/Hisilicon/HiKey/HiKey.fdf | 2 | ||||
| -rw-r--r-- | Platforms/Hisilicon/HiKey960/HiKey960.dsc | 2 | ||||
| -rw-r--r-- | Platforms/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c | 16 |
4 files changed, 4 insertions, 20 deletions
diff --git a/Platforms/Hisilicon/HiKey/HiKey.dsc b/Platforms/Hisilicon/HiKey/HiKey.dsc index e9d033a..1e18c51 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.dsc +++ b/Platforms/Hisilicon/HiKey/HiKey.dsc @@ -360,7 +360,7 @@ # Android Loader
#
gEmbeddedTokenSpaceGuid.PcdAndroidBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00D023F70000000000)/eMMC(0x0)/Ctrl(0x0)/HD(6,GPT,5C0F213C-17E1-4149-88C8-8B50FB4EC70E,0x7000,0x20000)"
- gEmbeddedTokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00E023F70000000000)/SD(0x0)/HD(1,MBR,0x263000B1,0x3F,0x21FC0)"
+ gEmbeddedTokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00E023F70000000000)/SD(0x0)"
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|1
@@ -429,7 +429,7 @@ MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
OpenPlatformPkg/Drivers/SdMmc/DwMmcHcDxe/DwMmcHcDxe.inf
MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
- #MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
diff --git a/Platforms/Hisilicon/HiKey/HiKey.fdf b/Platforms/Hisilicon/HiKey/HiKey.fdf index 56d6913..634a6a5 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.fdf +++ b/Platforms/Hisilicon/HiKey/HiKey.fdf @@ -132,7 +132,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
INF OpenPlatformPkg/Drivers/SdMmc/DwMmcHcDxe/DwMmcHcDxe.inf
INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
- #INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+ INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
INF OpenPlatformPkg/Platforms/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
diff --git a/Platforms/Hisilicon/HiKey960/HiKey960.dsc b/Platforms/Hisilicon/HiKey960/HiKey960.dsc index 6c28c92..dd9a40e 100644 --- a/Platforms/Hisilicon/HiKey960/HiKey960.dsc +++ b/Platforms/Hisilicon/HiKey960/HiKey960.dsc @@ -370,7 +370,7 @@ # Android Loader
#
gEmbeddedTokenSpaceGuid.PcdAndroidBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00003BFF0000000000)/UFS(0x0,0x3)/HD(7,GPT,D3340696-9B95-4C64-8DF6-E6D4548FBA41,0x12100,0x4000)"
- gEmbeddedTokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00F037FF0000000000)/SD(0x0)/HD(1,MBR,0x263000B1,0x3F,0x21FC0)"
+ gEmbeddedTokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00F037FF0000000000)/SD(0x0)"
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|1
diff --git a/Platforms/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c b/Platforms/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c index b1586a8..5c59846 100644 --- a/Platforms/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Platforms/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c @@ -341,9 +341,6 @@ PlatformRegisterBootSd ( CHAR16 *BootPathStr;
EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *EfiDevicePathFromTextProtocol;
EFI_DEVICE_PATH *DevicePath;
- EFI_DEVICE_PATH *FileDevicePath;
- FILEPATH_DEVICE_PATH *FilePath;
- UINTN Size;
EFI_BOOT_MANAGER_LOAD_OPTION NewOption;
EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
UINTN BootOptionCount;
@@ -359,19 +356,6 @@ PlatformRegisterBootSd ( DevicePath = (EFI_DEVICE_PATH *)EfiDevicePathFromTextProtocol->ConvertTextToDevicePath (BootPathStr);
ASSERT (DevicePath != NULL);
- Size = StrSize (SD_FILE_NAME);
- FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + END_DEVICE_PATH_LENGTH);
- if (FileDevicePath != NULL) {
- FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;
- FilePath->Header.Type = MEDIA_DEVICE_PATH;
- FilePath->Header.SubType = MEDIA_FILEPATH_DP;
- CopyMem (&FilePath->PathName, SD_FILE_NAME, Size);
- SetDevicePathNodeLength (&FilePath->Header, Size + SIZE_OF_FILEPATH_DEVICE_PATH);
- SetDevicePathEndNode (NextDevicePathNode (&FilePath->Header));
-
- DevicePath = AppendDevicePath (DevicePath, FileDevicePath);
- FreePool (FileDevicePath);
- }
Status = EfiBootManagerInitializeLoadOption (
&NewOption,
LoadOptionNumberUnassigned,
|