mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 00:47:26 +00:00
fc0a7431e1
When booting Android with AVB enabled, an OOM is observed:
=> avb init ${mmcdev}
=> avb verify _a
## Android Verified Boot 2.0 version 1.1.0
read_is_device_unlocked not supported yet
read_rollback_index not supported yet
avb_util.c:182: ERROR: Failed to allocate memory.
OOM error occurred during verification
A custom malloc length of 128MB is required as documented in
commit 285a83b12b ("configs: meson64_android: increase SYS_MALLOC_LEN to 128M for AVB")
However, this 128M custom malloc length was not ported to Kconfig in
commit 7cfbba36e9 ("Convert CONFIG_SYS_MALLOC_LEN to Kconfig")
Add it back to fix AVB verification on VIM3/VIM3L.
Fixes: 7cfbba36e9 ("Convert CONFIG_SYS_MALLOC_LEN to Kconfig")
Co-developed-by: Guillaume La Roque <glaroque@baylibre.com>
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
Link: https://lore.kernel.org/r/20240209-vim3-avb-malloc-v1-1-91427d8c19ab@baylibre.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
121 lines
2.9 KiB
Text
121 lines
2.9 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_SYS_BOARD="vim3"
|
|
CONFIG_SYS_CONFIG_NAME="khadas-vim3_android"
|
|
CONFIG_ARCH_MESON=y
|
|
CONFIG_TEXT_BASE=0x01000000
|
|
CONFIG_SYS_MALLOC_LEN=0x08000000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
|
|
CONFIG_ENV_SIZE=0x10000
|
|
CONFIG_ENV_OFFSET=0x0
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3"
|
|
CONFIG_OF_LIBFDT_OVERLAY=y
|
|
CONFIG_DM_RESET=y
|
|
CONFIG_MESON_G12A=y
|
|
CONFIG_DEBUG_UART_BASE=0xff803000
|
|
CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_IDENT_STRING=" khadas-vim3"
|
|
CONFIG_SYS_LOAD_ADDR=0x1000000
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_REMAKE_ELF=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_SIGNATURE=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
CONFIG_MISC_INIT_R=y
|
|
CONFIG_AVB_VERIFY=y
|
|
CONFIG_ANDROID_AB=y
|
|
CONFIG_SYS_MAXARGS=32
|
|
# CONFIG_CMD_BDI is not set
|
|
CONFIG_CMD_ADTIMG=y
|
|
CONFIG_CMD_ABOOTIMG=y
|
|
# CONFIG_CMD_IMI is not set
|
|
CONFIG_CMD_BCB=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_I2C=y
|
|
# CONFIG_CMD_LOADS is not set
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_SF_TEST=y
|
|
CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_AB_SELECT=y
|
|
CONFIG_CMD_REGULATOR=y
|
|
CONFIG_CMD_AVB=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_SYS_MMC_ENV_DEV=2
|
|
CONFIG_SYS_MMC_ENV_PART=2
|
|
CONFIG_ADC=y
|
|
CONFIG_SARADC_MESON=y
|
|
CONFIG_BUTTON=y
|
|
CONFIG_BUTTON_ADC=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_BUF_ADDR=0x6000000
|
|
CONFIG_FASTBOOT_FLASH=y
|
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=2
|
|
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_MESON=y
|
|
CONFIG_MMC_MESON_GX=y
|
|
CONFIG_MTD=y
|
|
CONFIG_DM_MTD=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SPI_FLASH_WINBOND=y
|
|
CONFIG_PHY_REALTEK=y
|
|
CONFIG_DM_MDIO=y
|
|
CONFIG_DM_MDIO_MUX=y
|
|
CONFIG_ETH_DESIGNWARE_MESON8B=y
|
|
CONFIG_MDIO_MUX_MESON_G12A=y
|
|
CONFIG_NVME_PCI=y
|
|
CONFIG_PCIE_DW_MESON=y
|
|
CONFIG_MESON_G12A_USB_PHY=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_MESON_G12A=y
|
|
CONFIG_POWER_DOMAIN=y
|
|
CONFIG_MESON_EE_POWER_DOMAIN=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DEBUG_UART_ANNOUNCE=y
|
|
CONFIG_DEBUG_UART_SKIP_INIT=y
|
|
CONFIG_MESON_SERIAL=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_MESON_SPIFC=y
|
|
CONFIG_SYSINFO=y
|
|
CONFIG_SYSINFO_SMBIOS=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB_GADGET=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_XHCI_DWC3=y
|
|
CONFIG_USB_DWC3=y
|
|
# CONFIG_USB_DWC3_GADGET is not set
|
|
CONFIG_USB_DWC3_MESON_G12A=y
|
|
CONFIG_USB_KEYBOARD=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
|
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
|
CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
|
|
CONFIG_VIDEO=y
|
|
# CONFIG_VIDEO_BPP8 is not set
|
|
# CONFIG_VIDEO_BPP16 is not set
|
|
CONFIG_SYS_WHITE_ON_BLACK=y
|
|
CONFIG_VIDEO_MESON=y
|
|
CONFIG_VIDEO_DT_SIMPLEFB=y
|
|
CONFIG_SPLASH_SCREEN=y
|
|
CONFIG_SPLASH_SCREEN_ALIGN=y
|
|
CONFIG_VIDEO_BMP_RLE8=y
|
|
CONFIG_BMP_16BPP=y
|
|
CONFIG_BMP_24BPP=y
|
|
CONFIG_BMP_32BPP=y
|
|
CONFIG_LIBAVB=y
|