mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
ab12179b3e
Make sure we have an IMX header before calling spl_load_imx_container,
since if we don't it will fail with -ENOENT. This allows us to fall back to
legacy/raw images if they are also enabled.
This is a functional change, one which likely should have been in place
from the start, but a functional change nonetheless. Previously, all
non-IMX8 images (except FITs without FIT_FULL) would be optimized out if
the only image load method enabled supported IMX8 images. With this change,
support for other image types now has an effect.
There are seven boards with SPL_LOAD_IMX_CONTAINER enabled: three with
SPL_BOOTROM_SUPPORT:
imx93_11x11_evk_ld imx93_11x11_evk imx8ulp_evk
and four with SPL_MMC:
deneb imx8qxp_mek giedi imx8qm_mek
All of these boards also have SPL_RAW_IMAGE_SUPPORT and
SPL_LEGACY_IMAGE_FORMAT enabled as well. However, none have FIT support
enabled. Of the six load methods affected by this patch, only SPL_MMC and
SPL_BOOTROM_SUPPORT are enabled with SPL_LOAD_IMX_CONTAINER.
spl_romapi_load_image_seekable does not support legacy or raw images, so
there is no growth. However, mmc_load_image_raw_sector does support loading
legacy/raw images. Since these images could not have been booted before, I
have disabled support for legacy/raw images on these four boards. This
reduces bloat from around 800 bytes to around 200.
There are no in-tree boards with SPL_LOAD_IMX_CONTAINER and AHAB_BOOT both
enabled, so we do not need to worry about potentially falling back to
legacy images in a secure boot scenario.
Future work could include merging imx_container.h with imx8image.h, since
they appear to define mostly the same structures.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
134 lines
3.5 KiB
Text
134 lines
3.5 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_IMX8=y
|
|
CONFIG_TEXT_BASE=0x80020000
|
|
CONFIG_SYS_MALLOC_LEN=0x2800000
|
|
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
|
CONFIG_SPL_GPIO=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_NR_DRAM_BANKS=3
|
|
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
|
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0x0
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx8-giedi"
|
|
CONFIG_SPL_TEXT_BASE=0x100000
|
|
CONFIG_TARGET_GIEDI=y
|
|
CONFIG_SPL_MMC=y
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_SPL_DRIVERS_MISC=y
|
|
CONFIG_SPL_STACK=0x13e000
|
|
CONFIG_SPL=y
|
|
CONFIG_ENV_OFFSET_REDUND=0x2000
|
|
CONFIG_IDENT_STRING=" ##v01.07"
|
|
CONFIG_SPL_LOAD_IMX_CONTAINER=y
|
|
CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg"
|
|
CONFIG_SYS_LOAD_ADDR=0x80280000
|
|
CONFIG_REMAKE_ELF=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_EXTERNAL_OFFSET=0x3000
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_AUTOBOOT_KEYED=y
|
|
CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
|
|
CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
|
|
CONFIG_AUTOBOOT_KEYED_CTRLC=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_OF_SYSTEM_SETUP=y
|
|
CONFIG_USE_BOOTCOMMAND=y
|
|
CONFIG_BOOTCOMMAND="if usrbutton; then run flash_self_test; reset; fi;run flash_self;reset;"
|
|
CONFIG_LOG=y
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_SPL_MAX_SIZE=0x1f000
|
|
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
|
|
CONFIG_SPL_BSS_START_ADDR=0x128000
|
|
CONFIG_SPL_BSS_MAX_SIZE=0x1000
|
|
CONFIG_SPL_BOARD_INIT=y
|
|
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
|
|
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
|
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
|
CONFIG_SPL_SYS_MALLOC=y
|
|
CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
|
|
CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x120000
|
|
CONFIG_SPL_SYS_MALLOC_SIZE=0x3000
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800
|
|
CONFIG_SPL_POWER_DOMAIN=y
|
|
CONFIG_SPL_WATCHDOG=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_SYS_PROMPT="U-Boot# "
|
|
CONFIG_SYS_MAXARGS=64
|
|
CONFIG_SYS_CBSIZE=2048
|
|
CONFIG_SYS_PBSIZE=2073
|
|
CONFIG_CMD_CPU=y
|
|
# CONFIG_BOOTM_NETBSD is not set
|
|
CONFIG_SYS_BOOTM_LEN=0x800000
|
|
# CONFIG_CMD_EXPORTENV is not set
|
|
# CONFIG_CMD_IMPORTENV is not set
|
|
# CONFIG_CMD_CRC32 is not set
|
|
CONFIG_CMD_CLK=y
|
|
CONFIG_CMD_DM=y
|
|
CONFIG_CMD_FUSE=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_READ=y
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_EXT2=y
|
|
CONFIG_CMD_EXT4=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_CMD_FS_GENERIC=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_SYS_MMC_ENV_PART=2
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_USE_ETHPRIME=y
|
|
CONFIG_ETHPRIME="eth1"
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_SPL_DM=y
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
|
CONFIG_BOOTCOUNT_ENV=y
|
|
CONFIG_SPL_CLK=y
|
|
CONFIG_CLK_IMX8=y
|
|
CONFIG_CPU=y
|
|
CONFIG_MXC_GPIO=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_IMX_LPI2C=y
|
|
CONFIG_LED=y
|
|
CONFIG_LED_GPIO=y
|
|
CONFIG_MISC=y
|
|
CONFIG_SUPPORT_EMMC_BOOT=y
|
|
CONFIG_MMC_IO_VOLTAGE=y
|
|
CONFIG_MMC_UHS_SUPPORT=y
|
|
CONFIG_MMC_HS400_SUPPORT=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_MV88E61XX_SWITCH=y
|
|
CONFIG_MV88E61XX_CPU_PORT=5
|
|
CONFIG_MV88E61XX_PHY_PORTS=0x7
|
|
CONFIG_FEC_MXC_SHARE_MDIO=y
|
|
CONFIG_FEC_MXC_MDIO_BASE=0x5B050000
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_SPL_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX8=y
|
|
CONFIG_POWER_DOMAIN=y
|
|
CONFIG_IMX8_POWER_DOMAIN=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_REGULATOR_GPIO=y
|
|
CONFIG_SPL_DM_REGULATOR_GPIO=y
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_FSL_LPUART=y
|
|
CONFIG_DM_THERMAL=y
|
|
CONFIG_IMX_SCU_THERMAL=y
|
|
# CONFIG_SPL_WDT is not set
|
|
CONFIG_SPL_TINY_MEMSET=y
|
|
# CONFIG_EFI_LOADER is not set
|