Hello Frieder,

Am 14.09.2019 um 00:44 schrieb Schrempf Frieder:
From: Frieder Schrempf <frieder.schre...@kontron.de>

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.schre...@kontron.de>
---
  configs/aristainetos2_defconfig        |  1 +
  configs/aristainetos2b_defconfig       |  1 +
  configs/aristainetos_defconfig         |  1 +
  configs/cm_fx6_defconfig               |  1 +
  configs/display5_defconfig             |  1 +
  configs/display5_factory_defconfig     |  1 +
  configs/socfpga_arria5_defconfig       |  1 +
  configs/socfpga_cyclone5_defconfig     |  1 +
  configs/socfpga_dbm_soc1_defconfig     |  1 +
  configs/socfpga_de0_nano_soc_defconfig |  1 +
  configs/socfpga_de10_nano_defconfig    |  1 +
  configs/socfpga_is1_defconfig          |  1 +
  configs/socfpga_mcvevk_defconfig       |  1 +
  configs/socfpga_sockit_defconfig       |  1 +
  configs/socfpga_socrates_defconfig     |  1 +
  configs/socfpga_sr1500_defconfig       |  1 +
  configs/socfpga_vining_fpga_defconfig  |  1 +
  drivers/mtd/spi/Makefile               |  2 +-
  drivers/mtd/spi/sf_internal.h          |  2 +-
  drivers/mtd/spi/sf_probe.c             |  6 +++---
  include/configs/aristainetos-common.h  |  1 -
  include/configs/cm_fx6.h               |  7 -------
  include/configs/da850evm.h             |  7 +------
  include/configs/dh_imx6.h              |  1 -
  include/configs/display5.h             |  4 ----
  include/configs/gw_ventana.h           | 10 +---------
  include/configs/rcar-gen2-common.h     |  4 +---
  include/configs/socfpga_common.h       |  4 ----
  28 files changed, 25 insertions(+), 40 deletions(-)

Reviewed-by: Heiko Schocher <h...@denx.de>

bye,
Heiko
--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: h...@denx.de
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to