2226ca1734
Now that proper load and execution addresses are set in v1 kwbimage we can use it for loading and booting U-Boot proper. Use the new spl_parse_board_header() function to implement parsing the kwbimage v1 header. Use information from this header to locate offset and size of the U-Boot proper binary, instead of using the legacy U-Boot header which is prepended to the U-Boot proper binary stored at fixed offset. This has the advantage that we do not need to relay on legacy U-Boot header anymore and therefore U-Boot proper binary can be stored at any offset, as is the case when loading & booting U-Boot proper by BootROM. The CONFIG_SYS_U_BOOT_OFFS option is therefore not used by SPL code anymore. Also allow to compile U-Boot SPL without CONFIG_SPL_SPI_FLASH_SUPPORT, CONFIG_SPL_MMC_SUPPORT or CONFIG_SPL_SATA_SUPPORT set. In this case BootROM is used for loading and executing U-Boot proper. This reduces the size of U-Boot's SPL image. By default these config options are enabled and so BootROM loading is not used. In some cases BootROM reads from SPI NOR at lower speed than U-Boot SPL. So people can decide whether they want to have smaller SPL binary at the cost of slower boot. Therefore dependency on CONFIG_SPL_DM_SPI, CONFIG_SPL_SPI_FLASH_SUPPORT, CONFIG_SPL_SPI_LOAD, CONFIG_SPL_SPI_SUPPORT, CONFIG_SPL_DM_GPIO, CONFIG_SPL_DM_MMC, CONFIG_SPL_GPIO_SUPPORT, CONFIG_SPL_LIBDISK_SUPPORT, CONFIG_SPL_MMC_SUPPORT, CONFIG_SPL_SATA_SUPPORT and CONFIG_SPL_LIBDISK_SUPPORT is changed from strict to related "imply" (which can be selectivelly turned off and causes booting via BootROM). Options CONFIG_SYS_SPI_U_BOOT_OFFS, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR and CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET have to to be set to zero as they define the location where kwbimage header starts. It is the location where BootROM expects start of the kwbimage from which it reads, parses and executes SPL part. The same applies to option CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR, which has to be set to one. Update all config files to set correct values of these options and set CONFIG_SYS_U_BOOT_OFFS to the correct value - the offset where U-Boot proper starts. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de>
71 lines
1.6 KiB
Plaintext
71 lines
1.6 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_ARCH_MVEBU=y
|
|
CONFIG_SYS_TEXT_BASE=0x00800000
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_TARGET_DB_MV784MP_GP=y
|
|
CONFIG_ENV_SIZE=0x10000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_ENV_SECT_SIZE=0x10000
|
|
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
|
|
CONFIG_SPL_TEXT_BASE=0x40004030
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_SPL=y
|
|
CONFIG_DEBUG_UART_BASE=0xd0012000
|
|
CONFIG_DEBUG_UART_CLOCK=250000000
|
|
CONFIG_DEBUG_UART=y
|
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_I2C=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_TFTPPUT=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_EXT2=y
|
|
CONFIG_CMD_EXT4=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_CMD_FS_GENERIC=y
|
|
CONFIG_EFI_PARTITION=y
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_USE_ENV_SPI_MAX_HZ=y
|
|
CONFIG_ENV_SPI_MAX_HZ=50000000
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_SPL_OF_TRANSLATE=y
|
|
CONFIG_SATA_MV=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_SYS_NAND_USE_FLASH_BBT=y
|
|
CONFIG_NAND_PXA3XX=y
|
|
CONFIG_SPI_FLASH_MACRONIX=y
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_PHY_GIGE=y
|
|
CONFIG_MVNETA=y
|
|
CONFIG_MII=y
|
|
CONFIG_PCI=y
|
|
CONFIG_PCI_MVEBU=y
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_KIRKWOOD_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|