br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Support boot_img_hdr_v2

Browse Source
This commit is contained in:
topjohnwu
2019-03-13 16:51:22 -04:00
parent 650b2ce6b1
commit b7e2e972c7
5 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/jni/magiskboot/bootimg.cpp
+23 -8
View File
@@ -149,6 +149,10 @@ int boot_img::parse_image(uint8_t *head) {
pos += hdr.recovery_dtbo_size();
pos_align();
dtb = head + pos;
pos += hdr.dtb_size();
pos_align();
if (head + pos < map_addr + map_size) {
tail = head + pos;
tail_size = map_size - (tail - map_addr);
@@ -227,10 +231,10 @@ void boot_img::find_dtb() {
continue;
}
dtb = kernel + i;
dt_size = hdr->kernel_size - i;
kernel_dtb = kernel + i;
kernel_dt_size = hdr->kernel_size - i;
hdr->kernel_size = i;
fprintf(stderr, "DTB [%u]\n", dt_size);
fprintf(stderr, "KERNEL_DTB [%u]\n", kernel_dt_size);
break;
}
}
@@ -242,6 +246,7 @@ void boot_img::print_hdr() {
fprintf(stderr, "SECOND_SZ [%u]\n", hdr->second_size);
fprintf(stderr, "EXTRA_SZ [%u]\n", hdr.extra_size());
fprintf(stderr, "RECOV_DTBO_SZ [%u]\n", hdr.recovery_dtbo_size());
fprintf(stderr, "DTB [%u]\n", hdr.dtb_size());
uint32_t ver = hdr.os_version();
if (ver) {
@@ -308,7 +313,7 @@ int unpack(const char *image, bool hdr) {
}
// Dump dtb
dump(boot.dtb, boot.dt_size, DTB_FILE);
dump(boot.kernel_dtb, boot.kernel_dt_size, KER_DTB_FILE);
// Dump ramdisk
if (COMPRESSED(boot.r_fmt)) {
@@ -327,6 +332,9 @@ int unpack(const char *image, bool hdr) {
// Dump recovery_dtbo
dump(boot.recov_dtbo, boot.hdr.recovery_dtbo_size(), RECV_DTBO_FILE);
// Dump dtb
dump(boot.dtb, boot.hdr.dtb_size(), DTB_FILE);
return ret;
}
@@ -343,7 +351,8 @@ void repack(const char* orig_image, const char* out_image) {
boot.hdr->kernel_size = 0;
boot.hdr->ramdisk_size = 0;
boot.hdr->second_size = 0;
boot.dt_size = 0;
boot.hdr.dtb_size() = 0;
boot.kernel_dt_size = 0;
fprintf(stderr, "Repack to boot image: [%s]\n", out_image);
@@ -417,9 +426,9 @@ void repack(const char* orig_image, const char* out_image) {
munmap(raw_buf, raw_size);
}
// dtb
if (access(DTB_FILE, R_OK) == 0)
boot.hdr->kernel_size += restore(DTB_FILE, fd);
// kernel dtb
if (access(KER_DTB_FILE, R_OK) == 0)
boot.hdr->kernel_size += restore(KER_DTB_FILE, fd);
file_align();
// ramdisk
@@ -462,6 +471,12 @@ void repack(const char* orig_image, const char* out_image) {
file_align();
}
// dtb
if (access(DTB_FILE, R_OK) == 0) {
boot.hdr.dtb_size() = restore(DTB_FILE, fd);
file_align();
}
// Append tail info
if (boot.flags & SEANDROID_FLAG) {
restore_buf(fd, SEANDROID_MAGIC "\xFF\xFF\xFF\xFF", 20);