Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 832ce20278db00aeeed5576f1296a6d905d31563

Authored by Frieder Schrempf
Committed by Jagan Teki
1 parent 73d74b5881
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 26 changed files with 23 additions and 37 deletions Side-by-side Diff

configs/aristainetos2_defconfig
Diff comments   View file @ 832ce20
... ... @@ -44,6 +44,7 @@
44 44 CONFIG_SF_DEFAULT_MODE=0
45 45 CONFIG_SF_DEFAULT_SPEED=20000000
46 46 CONFIG_SPI_FLASH_STMICRO=y
  47 +CONFIG_SPI_FLASH_MTD=y
47 48 CONFIG_MTD_UBI_FASTMAP=y
48 49 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
49 50 CONFIG_PHYLIB=y
configs/aristainetos2b_defconfig
Diff comments   View file @ 832ce20
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_SF_DEFAULT_MODE=0
43 43 CONFIG_SF_DEFAULT_SPEED=20000000
44 44 CONFIG_SPI_FLASH_STMICRO=y
  45 +CONFIG_SPI_FLASH_MTD=y
45 46 CONFIG_MTD_UBI_FASTMAP=y
46 47 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
47 48 CONFIG_PHYLIB=y
configs/aristainetos_defconfig
Diff comments   View file @ 832ce20
... ... @@ -43,6 +43,7 @@
43 43 CONFIG_SF_DEFAULT_MODE=0
44 44 CONFIG_SF_DEFAULT_SPEED=20000000
45 45 CONFIG_SPI_FLASH_STMICRO=y
  46 +CONFIG_SPI_FLASH_MTD=y
46 47 CONFIG_MTD_UBI_FASTMAP=y
47 48 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
48 49 CONFIG_PHYLIB=y
configs/cm_fx6_defconfig
Diff comments   View file @ 832ce20
... ... @@ -72,6 +72,7 @@
72 72 CONFIG_SPI_FLASH_STMICRO=y
73 73 CONFIG_SPI_FLASH_SST=y
74 74 CONFIG_SPI_FLASH_WINBOND=y
  75 +CONFIG_SPI_FLASH_MTD=y
75 76 CONFIG_PHYLIB=y
76 77 CONFIG_MII=y
77 78 CONFIG_DM_PMIC=y
configs/socfpga_arria5_defconfig
Diff comments   View file @ 832ce20
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_SPI_FLASH_SPANSION=y
48 48 CONFIG_SPI_FLASH_STMICRO=y
49 49 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  50 +CONFIG_SPI_FLASH_MTD=y
50 51 CONFIG_PHY_MICREL=y
51 52 CONFIG_PHY_MICREL_KSZ90X1=y
52 53 CONFIG_DM_ETH=y
configs/socfpga_cyclone5_defconfig
Diff comments   View file @ 832ce20
... ... @@ -48,6 +48,7 @@
48 48 CONFIG_SPI_FLASH_SPANSION=y
49 49 CONFIG_SPI_FLASH_STMICRO=y
50 50 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  51 +CONFIG_SPI_FLASH_MTD=y
51 52 CONFIG_PHY_MICREL=y
52 53 CONFIG_PHY_MICREL_KSZ90X1=y
53 54 CONFIG_DM_ETH=y
configs/socfpga_dbm_soc1_defconfig
Diff comments   View file @ 832ce20
... ... @@ -46,6 +46,7 @@
46 46 CONFIG_DM_MMC=y
47 47 CONFIG_MMC_DW=y
48 48 CONFIG_MTD_DEVICE=y
  49 +CONFIG_SPI_FLASH_MTD=y
49 50 CONFIG_DM_ETH=y
50 51 CONFIG_PHY_GIGE=y
51 52 CONFIG_ETH_DESIGNWARE=y
configs/socfpga_de0_nano_soc_defconfig
Diff comments   View file @ 832ce20
... ... @@ -43,6 +43,7 @@
43 43 CONFIG_DM_MMC=y
44 44 CONFIG_MMC_DW=y
45 45 CONFIG_MTD_DEVICE=y
  46 +CONFIG_SPI_FLASH_MTD=y
46 47 CONFIG_PHY_MICREL=y
47 48 CONFIG_PHY_MICREL_KSZ90X1=y
48 49 CONFIG_DM_ETH=y
configs/socfpga_de10_nano_defconfig
Diff comments   View file @ 832ce20
... ... @@ -39,6 +39,7 @@
39 39 CONFIG_DM_MMC=y
40 40 CONFIG_MMC_DW=y
41 41 CONFIG_MTD_DEVICE=y
  42 +CONFIG_SPI_FLASH_MTD=y
42 43 CONFIG_PHY_MICREL=y
43 44 CONFIG_PHY_MICREL_KSZ90X1=y
44 45 CONFIG_DM_ETH=y
configs/socfpga_is1_defconfig
Diff comments   View file @ 832ce20
... ... @@ -43,6 +43,7 @@
43 43 CONFIG_MTD_DEVICE=y
44 44 CONFIG_SPI_FLASH=y
45 45 CONFIG_SPI_FLASH_STMICRO=y
  46 +CONFIG_SPI_FLASH_MTD=y
46 47 CONFIG_PHY_MICREL=y
47 48 CONFIG_PHY_MICREL_KSZ90X1=y
48 49 CONFIG_DM_ETH=y
configs/socfpga_mcvevk_defconfig
Diff comments   View file @ 832ce20
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_SYS_I2C_DW=y
43 43 CONFIG_DM_MMC=y
44 44 CONFIG_MMC_DW=y
  45 +CONFIG_SPI_FLASH_MTD=y
45 46 CONFIG_DM_ETH=y
46 47 CONFIG_PHY_GIGE=y
47 48 CONFIG_ETH_DESIGNWARE=y
configs/socfpga_sockit_defconfig
Diff comments   View file @ 832ce20
... ... @@ -48,6 +48,7 @@
48 48 CONFIG_SPI_FLASH_SPANSION=y
49 49 CONFIG_SPI_FLASH_STMICRO=y
50 50 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  51 +CONFIG_SPI_FLASH_MTD=y
51 52 CONFIG_PHY_MICREL=y
52 53 CONFIG_PHY_MICREL_KSZ90X1=y
53 54 CONFIG_DM_ETH=y
configs/socfpga_socrates_defconfig
Diff comments   View file @ 832ce20
... ... @@ -48,6 +48,7 @@
48 48 CONFIG_SPI_FLASH_MACRONIX=y
49 49 CONFIG_SPI_FLASH_SPANSION=y
50 50 CONFIG_SPI_FLASH_STMICRO=y
  51 +CONFIG_SPI_FLASH_MTD=y
51 52 CONFIG_PHY_MICREL=y
52 53 CONFIG_PHY_MICREL_KSZ90X1=y
53 54 CONFIG_DM_ETH=y
configs/socfpga_sr1500_defconfig
Diff comments   View file @ 832ce20
... ... @@ -49,6 +49,7 @@
49 49 CONFIG_SF_DEFAULT_SPEED=100000000
50 50 CONFIG_SPI_FLASH_STMICRO=y
51 51 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  52 +CONFIG_SPI_FLASH_MTD=y
52 53 CONFIG_PHY_MARVELL=y
53 54 CONFIG_DM_ETH=y
54 55 CONFIG_PHY_GIGE=y
configs/socfpga_vining_fpga_defconfig
Diff comments   View file @ 832ce20
... ... @@ -72,6 +72,7 @@
72 72 CONFIG_SPI_FLASH_SPANSION=y
73 73 CONFIG_SPI_FLASH_STMICRO=y
74 74 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  75 +CONFIG_SPI_FLASH_MTD=y
75 76 CONFIG_MTD_UBI_FASTMAP=y
76 77 CONFIG_PHY_MICREL=y
77 78 CONFIG_PHY_MICREL_KSZ90X1=y
drivers/mtd/spi/Makefile
Diff comments   View file @ 832ce20
... ... @@ -19,6 +19,6 @@
19 19  
20 20 obj-$(CONFIG_SPI_FLASH) += spi-nor.o
21 21 obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o
22   -obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o
  22 +obj-$(CONFIG_$(SPL_)SPI_FLASH_MTD) += sf_mtd.o
23 23 obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
drivers/mtd/spi/sf_internal.h
Diff comments   View file @ 832ce20
... ... @@ -77,7 +77,7 @@
77 77 int spi_flash_cmd_get_sw_write_prot(struct spi_flash *flash);
78 78  
79 79  
80   -#ifdef CONFIG_SPI_FLASH_MTD
  80 +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD)
81 81 int spi_flash_mtd_register(struct spi_flash *flash);
82 82 void spi_flash_mtd_unregister(void);
83 83 #endif
drivers/mtd/spi/sf_probe.c
Diff comments   View file @ 832ce20
... ... @@ -44,7 +44,7 @@
44 44 if (ret)
45 45 goto err_read_id;
46 46  
47   -#ifdef CONFIG_SPI_FLASH_MTD
  47 +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD)
48 48 ret = spi_flash_mtd_register(flash);
49 49 #endif
50 50  
... ... @@ -83,7 +83,7 @@
83 83  
84 84 void spi_flash_free(struct spi_flash *flash)
85 85 {
86   -#ifdef CONFIG_SPI_FLASH_MTD
  86 +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD)
87 87 spi_flash_mtd_unregister();
88 88 #endif
89 89 spi_free_slave(flash->spi);
... ... @@ -152,7 +152,7 @@
152 152  
153 153 static int spi_flash_std_remove(struct udevice *dev)
154 154 {
155   -#ifdef CONFIG_SPI_FLASH_MTD
  155 +#if CONFIG_IS_ENABLED(SPI_FLASH_MTD)
156 156 spi_flash_mtd_unregister();
157 157 #endif
158 158 return 0;
include/configs/aristainetos-common.h
Diff comments   View file @ 832ce20
... ... @@ -30,7 +30,6 @@
30 30 #define CONFIG_ETHPRIME "FEC"
31 31 #define CONFIG_FEC_MXC_PHYADDR 0
32 32  
33   -#define CONFIG_SPI_FLASH_MTD
34 33 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
35 34  
36 35 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/cm_fx6.h
Diff comments   View file @ 832ce20
... ... @@ -38,13 +38,6 @@
38 38 #define CONFIG_MXC_UART_BASE UART4_BASE
39 39 #define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
40 40  
41   -/* SPI flash */
42   -
43   -/* MTD support */
44   -#ifndef CONFIG_SPL_BUILD
45   -#define CONFIG_SPI_FLASH_MTD
46   -#endif
47   -
48 41 /* Environment */
49 42 #define CONFIG_ENV_SECT_SIZE (64 * 1024)
50 43 #define CONFIG_ENV_SIZE (8 * 1024)
include/configs/da850evm.h
Diff comments   View file @ 832ce20
... ... @@ -190,15 +190,10 @@
190 190 #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ
191 191 #endif
192 192  
193   -#ifdef CONFIG_USE_SPIFLASH
194   -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
  193 +#if defined(CONFIG_USE_SPIFLASH) && defined(CONFIG_ENV_IS_IN_SPI_FLASH)
195 194 #define CONFIG_ENV_SIZE (64 << 10)
196 195 #define CONFIG_ENV_OFFSET (512 << 10)
197 196 #define CONFIG_ENV_SECT_SIZE (64 << 10)
198   -#endif
199   -#ifdef CONFIG_SPL_BUILD
200   -#undef CONFIG_SPI_FLASH_MTD
201   -#endif
202 197 #endif
203 198  
204 199 /*
include/configs/dh_imx6.h
Diff comments   View file @ 832ce20
... ... @@ -59,7 +59,6 @@
59 59 #if defined(CONFIG_SPL_BUILD)
60 60 #undef CONFIG_DM_SPI
61 61 #undef CONFIG_DM_SPI_FLASH
62   -#undef CONFIG_SPI_FLASH_MTD
63 62 #endif
64 63  
65 64 /* UART */
include/configs/display5.h
Diff comments   View file @ 832ce20
... ... @@ -39,7 +39,6 @@
39 39 #if defined(CONFIG_SPL_BUILD)
40 40 #undef CONFIG_DM_SPI
41 41 #undef CONFIG_DM_SPI_FLASH
42   -#undef CONFIG_SPI_FLASH_MTD
43 42 #endif
44 43  
45 44 /* Below values are "dummy" - only to avoid build break */
include/configs/gw_ventana.h
Diff comments   View file @ 832ce20
... ... @@ -47,15 +47,7 @@
47 47 #define CONFIG_MXC_UART
48 48 #define CONFIG_MXC_UART_BASE UART2_BASE
49 49  
50   -#ifdef CONFIG_SPI_FLASH
51   -
52   -/* SPI */
53   -#ifdef CONFIG_CMD_SF
54   - #define CONFIG_SPI_FLASH_MTD
55   - /* GPIO 3-19 (21248) */
56   -#endif
57   -
58   -#elif defined(CONFIG_SPL_NAND_SUPPORT)
  50 +#if !defined(CONFIG_SPI_FLASH) && defined(CONFIG_SPL_NAND_SUPPORT)
59 51 /* Enable NAND support */
60 52 #ifdef CONFIG_CMD_NAND
61 53 #define CONFIG_SYS_MAX_NAND_DEVICE 1
include/configs/rcar-gen2-common.h
Diff comments   View file @ 832ce20
... ... @@ -46,11 +46,9 @@
46 46 #define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)
47 47  
48 48 /* SF MTD */
49   -#if defined(CONFIG_SPI_FLASH_MTD) && !defined(CONFIG_SPL_BUILD)
50   -#else
  49 +#ifdef CONFIG_SPL_BUILD
51 50 #undef CONFIG_DM_SPI
52 51 #undef CONFIG_DM_SPI_FLASH
53   -#undef CONFIG_SPI_FLASH_MTD
54 52 #endif
55 53  
56 54 /* Timer */
include/configs/socfpga_common.h
Diff comments   View file @ 832ce20
... ... @@ -132,10 +132,6 @@
132 132 /*
133 133 * QSPI support
134 134 */
135   -/* Enable multiple SPI NOR flash manufacturers */
136   -#ifndef CONFIG_SPL_BUILD
137   -#define CONFIG_SPI_FLASH_MTD
138   -#endif
139 135 /* QSPI reference clock */
140 136 #ifndef __ASSEMBLY__
141 137 unsigned int cm_get_qspi_controller_clk_hz(void);