summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2021-09-16 10:30:19 +0530
committerAmit Pundir <amit.pundir@linaro.org>2021-09-16 10:30:19 +0530
commita35fad1d511d93b74cf91a07a67425b7842cb8c9 (patch)
treec8b83523ff661c1908000dfa17692c9d779cb7da
parent5d06caf8bbaf4d11f1bd278bb5aae2a5b72bbf86 (diff)
Revert "QcomModulePkg: BootLib: skip dtbo image loading"for-rb5
This reverts commit 7f138de40241cf151e69d85e71ac76683927ddee.
-rw-r--r--QcomModulePkg/Library/BootLib/BootLinux.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/QcomModulePkg/Library/BootLib/BootLinux.c b/QcomModulePkg/Library/BootLib/BootLinux.c
index 7be53bf567..290c119109 100644
--- a/QcomModulePkg/Library/BootLib/BootLinux.c
+++ b/QcomModulePkg/Library/BootLib/BootLinux.c
@@ -498,26 +498,7 @@ DTBImgCheckAndAppendDT (BootInfo *Info, BootParamlist *BootParamlistPtr)
SingleDtHdr, fdt_totalsize (SingleDtHdr));
} else {
DEBUG ((EFI_D_ERROR, "Error: Device Tree blob not found\n"));
-
- /* Get the Soc specific dtb in case of boot image header v2
- * with dtb.img at an offset and missing DTBO partition */
- SocDtb = GetSocDtb (ImageBuffer,
- DtbSize,
- BootParamlistPtr->DtbOffset,
- (VOID *)BootParamlistPtr->DeviceTreeLoadAddr);
- if (!SocDtb) {
- DEBUG ((EFI_D_ERROR,
- "Error: Appended Soc Device Tree blob not found\n"));
- return EFI_NOT_FOUND;
- }
-
- Status = ApplyOverlay (BootParamlistPtr,
- SocDtb,
- DtsList);
- if (Status != EFI_SUCCESS) {
- DEBUG ((EFI_D_ERROR, "Error: Dtb overlay failed\n"));
- return Status;
- }
+ return EFI_NOT_FOUND;
}
}
} else {