diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 6 | ||||
| -rw-r--r-- | boot/image-android.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 2993cd7f9ba..eff05948b3a 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1056,7 +1056,7 @@ config SYS_BOOTM_LEN hex "Maximum size of a decompresed OS image" depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \ LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT - default 0x4000000 if PPC || ARM64 || RISCV + default 0x8000000 if PPC || ARM64 || RISCV default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7 default 0x800000 help @@ -1093,6 +1093,7 @@ config SYS_RAMBOOT config RAMBOOT_PBL bool "Freescale PBL(pre-boot loader) image format support" + depends on ARCH_LS1021A || PPC select SYS_RAMBOOT if PPC help Some SoCs use PBL to load RCW and/or pre-initialization instructions. @@ -1162,6 +1163,7 @@ config DISTRO_DEFAULTS select CMD_SYSBOOT select HUSH_PARSER select SYS_LONGHELP + select LEGACY_IMAGE_FORMAT help Note: These scripts have been replaced by Standard Boot. Do not use them on new boards. See 'Migrating from distro_boot' at @@ -1851,6 +1853,7 @@ config OF_BOARD_SETUP config OF_BOARD_SETUP_EXTENDED bool "Set up latest board-specific details in device tree before boot" + depends on !COMPILE_TEST imply OF_BOARD_SETUP help This causes U-Boot to call ft_board_setup_ex() before booting into @@ -1861,6 +1864,7 @@ config OF_BOARD_SETUP_EXTENDED config OF_SYSTEM_SETUP bool "Set up system-specific details in device tree before boot" + depends on !COMPILE_TEST help This causes U-Boot to call ft_system_setup() before booting into the Operating System. This function can set up various diff --git a/boot/image-android.c b/boot/image-android.c index 1cd2060bb3f..e46dee0d9b3 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -107,7 +107,12 @@ static void android_vendor_boot_image_v3_v4_parse_hdr(const struct andr_vnd_boot data->dtb_load_addr = hdr->dtb_addr; data->bootconfig_size = hdr->bootconfig_size; end = (ulong)hdr; - end += hdr->page_size; + + if (hdr->header_version > 3) + end += ALIGN(ANDR_VENDOR_BOOT_V4_SIZE, hdr->page_size); + else + end += ALIGN(ANDR_VENDOR_BOOT_V3_SIZE, hdr->page_size); + if (hdr->vendor_ramdisk_size) { data->vendor_ramdisk_ptr = end; data->vendor_ramdisk_size = hdr->vendor_ramdisk_size; |