Commit b614b067 authored by topjohnwu's avatar topjohnwu

Search for dtb only if not existed

parent 7a376c9e
...@@ -92,7 +92,8 @@ int parse_img(void *orig, size_t size, boot_img *boot) { ...@@ -92,7 +92,8 @@ int parse_img(void *orig, size_t size, boot_img *boot) {
boot->extra = base + pos; boot->extra = base + pos;
} }
// Linear search in kernel for DTB // Search for dtb in kernel if not found
if (boot->hdr.dt_size == 0) {
for (int i = 0; i < boot->hdr.kernel_size; ++i) { for (int i = 0; i < boot->hdr.kernel_size; ++i) {
if (memcmp(boot->kernel + i, DTB_MAGIC, 4) == 0) { if (memcmp(boot->kernel + i, DTB_MAGIC, 4) == 0) {
boot->flags |= APPEND_DTB; boot->flags |= APPEND_DTB;
...@@ -102,6 +103,7 @@ int parse_img(void *orig, size_t size, boot_img *boot) { ...@@ -102,6 +103,7 @@ int parse_img(void *orig, size_t size, boot_img *boot) {
fprintf(stderr, "APPEND_DTB [%d]\n", boot->hdr.dt_size); fprintf(stderr, "APPEND_DTB [%d]\n", boot->hdr.dt_size);
} }
} }
}
boot->ramdisk_type = check_type(boot->ramdisk); boot->ramdisk_type = check_type(boot->ramdisk);
boot->kernel_type = check_type(boot->kernel); boot->kernel_type = check_type(boot->kernel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment