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

multirom: don't use --boardname and empty --dtb for arm64 devices

Browse Source
This commit is contained in:
Christian Oder
2016-06-20 18:38:45 +02:00
committed by Myself5
parent 3020a819e8
commit 6b293c0d53
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@@ -72,6 +72,11 @@ else
include $(multirom_local_path)/kexec-tools/Android.mk
endif
# Make code aware of the Arch
ifneq ($(TARGET_ARCH),arm64)
LOCAL_CFLAGS += -DMR_NOT_64BIT
endif
# adbd
include $(multirom_local_path)/adbd/Android.mk

4
multirom.c
View File

@@ -1615,7 +1615,9 @@ int multirom_load_kexec(struct multirom_status *s, struct multirom_rom *rom)
kexec_init(&kexec, kexec_path);
kexec_add_arg(&kexec, "--mem-min="MR_KEXEC_MEM_MIN);
#ifdef MR_KEXEC_DTB
#ifdef MR_NOT_64BIT
kexec_add_arg_prefix(&kexec, "--boardname=", TARGET_DEVICE);
#endif
#endif
switch(rom->type)
@@ -1686,8 +1688,10 @@ int multirom_fill_kexec_android(struct multirom_status *s, struct multirom_rom *
#ifdef MR_KEXEC_DTB
if(libbootimg_dump_dtb(&img, "/dtb.img") >= 0)
kexec_add_arg(kexec, "--dtb=/dtb.img");
#ifdef MR_NOT_64BIT
else
kexec_add_arg(kexec, "--dtb");
#endif
#endif
char cmdline[1536];