mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-02 01:19:49 +00:00
832ce20278
Most boards currently use SPI_FLASH_MTD only in U-Boot proper, not in SPL. They often rely on hacks in the board header files to include this option conditionally. To be able to fix this, we previously introduced a separate option SPL_SPI_FLASH_MTD. Therefore we can now adjust the Makefile and change the code in sf_probe.c and sf_internal.h to use CONFIG_IS_ENABLED(SPI_FLASH_MTD). We also need to move all occurences of CONFIG_SPI_FLASH_MTD from the header files to the according defconfigs. The affected boards are socfpga, aristainetos, cm_fx6, display5, ventana, rcar-gen2, dh_imx6 and da850evm. We do this all in one patch to guarantee bisectibility. This change was tested with buildman to make sure it does not introduce any regressions by comparing the resulting binary sizes. Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Acked-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
55 lines
1.4 KiB
Text
55 lines
1.4 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_SOCFPGA=y
|
|
CONFIG_TARGET_SOCFPGA_IS1=y
|
|
CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
|
|
CONFIG_SPL_TEXT_BASE=0xFFFF0000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_USE_BOOTARGS=y
|
|
CONFIG_BOOTARGS="console=ttyS0,115200"
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
|
|
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
|
|
CONFIG_VERSION_VARIABLE=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
|
|
CONFIG_CMD_ASKENV=y
|
|
CONFIG_CMD_GREPENV=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_SF=y
|
|
CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),-@1536k(UBI)0"
|
|
CONFIG_CMD_UBI=y
|
|
# CONFIG_ISO_PARTITION is not set
|
|
# CONFIG_EFI_PARTITION is not set
|
|
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
|
|
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DWAPB_GPIO=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_DW=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD_DEVICE=y
|
|
CONFIG_SPI_FLASH=y
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_SPI_FLASH_MTD=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_ETH_DESIGNWARE=y
|
|
CONFIG_MII=y
|
|
CONFIG_DM_RESET=y
|
|
CONFIG_SPI=y
|
|
CONFIG_CADENCE_QSPI=y
|
|
# CONFIG_SPL_WDT is not set
|