diff options
| author | Ji Luo <ji.luo@nxp.com> | 2019-12-10 17:54:40 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2019-12-10 20:26:21 +0800 |
| commit | 7740677930170f694766ce4c8a4be231b8a7f937 (patch) | |
| tree | 55beb44e20ca879f35acdfdfc3da659128ad8811 /configs | |
| parent | ce15b01bac8f6a0cf9265eca913bf4560513c0af (diff) | |
MA-16048 Fix imx8q u-boot hang
Address 0x8880_0000 is reserved for M4 image on imx8q, which
leaves limited memory region for the malloc pool. The avb
will consume much heap memory to verify the kernel and dtbo
image, memory conflicts may happen as the kernel/dtbo image
size is getting larger.
As the avb will load kernel/dtbo in every avb_slot_verify(), but
will only free the memory after both slots are checked(if needed).
And for trusty enabled platforms, extra heap memory will be used
to do the hash calculation.
This commit will free the slot memory once it's marked as unbootable
and will use fixed memory started from CONFIG_FASTBOOT_BUF_ADDR to
help store the data to do the hash calculation. With above change,
we get a chance to decrease the malloc pool size.
Test: boot on imx8qxp and imx8mn.
Change-Id: Id95b9becf6fa7fae4f120a4dc9e9a3ba90da578c
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/imx8mq_aiy_android_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mq_aiy_android_trusty_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mq_aiy_android_trusty_dual_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mq_aiy_android_uuu_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mq_evk_android_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mq_evk_android_dual_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mq_evk_android_uuu_defconfig | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/configs/imx8mq_aiy_android_defconfig b/configs/imx8mq_aiy_android_defconfig index fc59c08be6..8a0819c739 100644 --- a/configs/imx8mq_aiy_android_defconfig +++ b/configs/imx8mq_aiy_android_defconfig @@ -54,7 +54,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 diff --git a/configs/imx8mq_aiy_android_trusty_defconfig b/configs/imx8mq_aiy_android_trusty_defconfig index b6abbc5534..f90fb6e1ce 100644 --- a/configs/imx8mq_aiy_android_trusty_defconfig +++ b/configs/imx8mq_aiy_android_trusty_defconfig @@ -54,7 +54,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 diff --git a/configs/imx8mq_aiy_android_trusty_dual_defconfig b/configs/imx8mq_aiy_android_trusty_dual_defconfig index 4987c0232f..10b13afab1 100644 --- a/configs/imx8mq_aiy_android_trusty_dual_defconfig +++ b/configs/imx8mq_aiy_android_trusty_dual_defconfig @@ -54,7 +54,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 diff --git a/configs/imx8mq_aiy_android_uuu_defconfig b/configs/imx8mq_aiy_android_uuu_defconfig index 0f1a88dc28..63abbb4ee4 100644 --- a/configs/imx8mq_aiy_android_uuu_defconfig +++ b/configs/imx8mq_aiy_android_uuu_defconfig @@ -54,7 +54,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig index 38705418ec..a6b2c0ee95 100644 --- a/configs/imx8mq_evk_android_defconfig +++ b/configs/imx8mq_evk_android_defconfig @@ -58,7 +58,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x40000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig index 70dedd9ed0..f0f5abf32e 100644 --- a/configs/imx8mq_evk_android_dual_defconfig +++ b/configs/imx8mq_evk_android_dual_defconfig @@ -58,7 +58,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x40000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 diff --git a/configs/imx8mq_evk_android_uuu_defconfig b/configs/imx8mq_evk_android_uuu_defconfig index 9bada1f002..892233c9c2 100644 --- a/configs/imx8mq_evk_android_uuu_defconfig +++ b/configs/imx8mq_evk_android_uuu_defconfig @@ -58,7 +58,7 @@ CONFIG_CMD_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FSL_FASTBOOT=y CONFIG_BCB_SUPPORT=y -CONFIG_FASTBOOT_BUF_ADDR=0x42800000 +CONFIG_FASTBOOT_BUF_ADDR=0x44800000 CONFIG_FASTBOOT_BUF_SIZE=0x40000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 |