meizu-m86/multirom_m86
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm64: add more logging for loading dtb.img and exclude more places

Browse Source 
where --dtb is passed with no parameter.

this causes arm64 kexec to error out.
This commit is contained in:
oshmoun
2016-06-20 22:41:36 +02:00
committed by Myself5
parent 6b293c0d53
commit ed44721421
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
multirom.c
View File

@@ -1686,12 +1686,16 @@ int multirom_fill_kexec_android(struct multirom_status *s, struct multirom_rom *
kexec_add_arg(kexec, "--initrd=/initrd.img");
#ifdef MR_KEXEC_DTB
if(libbootimg_dump_dtb(&img, "/dtb.img") >= 0)
if(libbootimg_dump_dtb(&img, "/dtb.img") >= 0) {
printf("DTB: dtb image found!");
kexec_add_arg(kexec, "--dtb=/dtb.img");
}
else {
printf("DTB: no dtb image found!");
#ifdef MR_NOT_64BIT
else
kexec_add_arg(kexec, "--dtb");
#endif
}
#endif
char cmdline[1536];
@@ -1851,11 +1855,15 @@ int multirom_fill_kexec_linux(struct multirom_status *s, struct multirom_rom *ro
}
else
{
printf("DTB: dtb image found!");
str = find_boot_file("%r/dtb.img", root_path, rom->base_path);
}
if(!str)
printf("DTB: no dtb image found!");
#ifdef MR_NOT_64BIT
kexec_add_arg(kexec, "--dtb");
#endif
else
{
kexec_add_arg_prefix(kexec, "--dtb=", str);