mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD
authorFrieder Schrempf <frieder.schrempf@kontron.de>
Wed, 23 Oct 2019 07:41:20 +0000 (07:41 +0000)
committerJagan Teki <jagan@amarulasolutions.com>
Thu, 24 Oct 2019 19:18:32 +0000 (00:48 +0530)
commit832ce20278db00aeeed5576f1296a6d905d31563
tree52d24fa8f3dc40c446d28cf4babd65bcd231af9a
parent73d74b58812373b4973d1fd38fc37f4e6083ab91
mtd: spi: Clean up usage of CONFIG_SPI_FLASH_MTD

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>
26 files changed:
configs/aristainetos2_defconfig
configs/aristainetos2b_defconfig
configs/aristainetos_defconfig
configs/cm_fx6_defconfig
configs/socfpga_arria5_defconfig
configs/socfpga_cyclone5_defconfig
configs/socfpga_dbm_soc1_defconfig
configs/socfpga_de0_nano_soc_defconfig
configs/socfpga_de10_nano_defconfig
configs/socfpga_is1_defconfig
configs/socfpga_mcvevk_defconfig
configs/socfpga_sockit_defconfig
configs/socfpga_socrates_defconfig
configs/socfpga_sr1500_defconfig
configs/socfpga_vining_fpga_defconfig
drivers/mtd/spi/Makefile
drivers/mtd/spi/sf_internal.h
drivers/mtd/spi/sf_probe.c
include/configs/aristainetos-common.h
include/configs/cm_fx6.h
include/configs/da850evm.h
include/configs/dh_imx6.h
include/configs/display5.h
include/configs/gw_ventana.h
include/configs/rcar-gen2-common.h
include/configs/socfpga_common.h