November 2019 - U-Boot

[U-Boot] [PATCH v5 00/26]MTD defconfigs/Kconfigs/Makefiles heavy cleanup
by Miquel Raynal 05 Dec '19

05 Dec '19

Hello, A year ago, while working on SPI-NAND support in U-Boot, I discovered when modifying Makefiles a confusing organization where: * Sub-directories/files are compiled from the root Makefile * Commands are at the root of everything First I sent a series to move Makefile entries in their respective directories. Then, I decided to continue working on the clarification of the Makefile hierarchy in MTD and I sent four iterations of this series which did not got merge at that time. Anyway, I revived this series by rebasing all my work and updating everything that needed an update. Here are the main points of the re-organization: * Rename CONFIG_MTD into CONFIG_DM_MTD to reserve CONFIG_MTD to what is called today CONFIG_MTD_DEVICE. * Fix build dependencies in defconfigs, like: "UBI and NAND depend on MTD". * Fix the Kconfig files to reflect these dependencies (as defconfigs have been updated, nothing should break). * Simplify the Makefiles: compiling the drivers/mtd/nand/raw/ sub-directory should just depend on MTD being compiled and the NAND core as well, there is absolutely no logic to make it depend on CMD_NAND. The New green Travis CI build for the fifth version of this series is there (yes, 53 iterations): Please note that the only red test fails because of timeout, not an actual error (at least I could not spot it). It is possible that this series will produce noticeable changes for the users. The only reason for that is because their configuration file was wrong. I have done my best to fix them one by one, but I am not omniscient. Thanks, Miquèl Note: as the number of Cc:'ed people reached 184 with get_maintainers.pl I decided to trim the list to: * People interested by the MTD subsystem. * A few maintainers: I had to tweak some defconfigs after more digging than with other boards (k2g, bcm11130, M54418TWR, ls104/108/208). Maintainers of these platforms are Cc:'ed. Changes since v4: ================= * Rebased on top of v2019.10-rc4. * Fixed tens of configurations that got broken since the last version of this series several months ago. * Added a specific commit for ls104/108/208 configurations. Changes since v3: ================= * As suggested by Vignesh, SPI_FLASH_MTD depends on MTD. Enforce this in Kconfig with a new patch. There is no defconfig to fix, all defconfigs with SPI_FLASH_MTD already use MTD. * s/coherent Makefile/appropriate Makefile/ in commit title of patch 1. * s/Kconfig/Makefile in commit message of "mtd: nand: remove dependency on commands in Kconfig" and "mtd: ubi: remove dependency on command in Kconfig". * Add Boris R-b tags. * Correct typos pointed by Boris. * Remove the if/endif in cmd/Kconfig about mtdparts, let the "depends on" that was already present. * Use an if/endif block to compile legacy-mtd-utils.c (to avoid failures when both 'sf' and 'nand' commands are compiled-in). * Merge all Makefile changes in one consistent commit as suggested by Boris. Changes since v2: ================= * Cleanup also applied to the SPL in an additional patch. * NOR dependency on MTD extracted from the patch adding MTD dependencies on commands only to do it in a separate change. * Typo s/copile/compile/ in "rename CONFIG_MTD_DEVICE..." commit log. * No more MTD depencency on SPI_FLASH, only kept on SPI_FLASH_MTD. * Same applies to the sf command. * Avoid compiling the NAND core while it is not needed (not speaking about the raw NAND core, really what is in drivers/mtd/nand:). * Last patch dropping CONFIG_MTD_PARTITIONS forgotten. We need them in order to reduce the final binary size. * Additional fixes in cmd/Kconfig. Changes since v1: ================= * Squashed both patches from the first series and included them in "mtd: simplify Makefiles". * Added all other patches. * Renamed CONFIG_NAND into CONFIG_MTD_RAW_NAND as suggested. Miquel Raynal (26): mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND mtd: rename CONFIG_MTD -> CONFIG_DM_MTD mtd: rename CONFIG_MTD_DEVICE -> CONFIG_MTD mtd: ensure MTD is compiled when there is a NOR flash mtd: ensure MTD/the raw NAND core are compiled when there is a NAND flash mtd: ensure MTD is compiled when there is a SPI NOR flash using MTD mtd: ensure UBI is compiled when using fastmap mtd: ensure MTD is compiled when UBI is used mtd: ensure UBI is compiled when CMD_UBI is selected mtd: ensure UBI is compiled when ENV_IS_IN_UBI is selected mtd: ensure MTD_RAW_NAND is compiled when ENV_IS_IN_NAND is selected mtd: ensure CMD_NAND is compiled when its options are selected mtd: ensure MTD is compiled when CMD_MTDPARTS is selected configs: move CONFIG_MTD in defconfigs when set in arch includes configs: remove raw NAND core from k2g defconfigs configs: remove MTD support from bcm11130 and M54418TWR defconfigs configs: socfpga: mcvevk: Remove useless UBI infos configs: ls104x/ls108x/ls208x: Build the raw NAND core with TFABOOT mtd: nand: add includes in NAND core to avoid warnings dfu: add dependency on the raw NAND core mtd: nor: NOR flashes depend on MTD mtd: spi: SPI_FLASH_MTD depends on MTD cmd: mtdparts: Kconfig: join mtdparts command entry with its options cmd: nand/sf: isolate legacy code cmd: make MTD commands depend on MTD mtd: Makefile: deep cleanup Makefile | 5 - arch/arm/mach-omap2/mem-common.c | 6 +- board/BuR/brppt1/board.c | 2 +- board/BuR/brppt1/mux.c | 6 +- board/birdland/bav335x/board.c | 2 +- board/bosch/shc/board.c | 2 +- board/freescale/ls2080aqds/ls2080aqds.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 2 +- board/phytec/pcm051/mux.c | 4 +- board/siemens/pxm2/mux.c | 4 +- board/sunxi/README.nand | 2 +- board/ti/am335x/board.c | 2 +- board/ti/am335x/mux.c | 8 +- board/ti/am43xx/mux.c | 8 +- board/ti/ti816x/evm.c | 2 +- board/vscom/baltos/board.c | 2 +- board/vscom/baltos/mux.c | 2 +- cmd/Kconfig | 34 ++++--- cmd/Makefile | 3 + cmd/legacy-mtd-utils.c | 99 +++++++++++++++++++ cmd/legacy-mtd-utils.h | 14 +++ cmd/nand.c | 2 + cmd/sf.c | 2 + configs/10m50_defconfig | 2 +- configs/3c120_defconfig | 1 + configs/B4420QDS_NAND_defconfig | 3 +- configs/B4420QDS_SPIFLASH_defconfig | 1 + configs/B4420QDS_defconfig | 1 + configs/B4860QDS_NAND_defconfig | 3 +- configs/B4860QDS_SECURE_BOOT_defconfig | 1 + configs/B4860QDS_SPIFLASH_defconfig | 1 + configs/B4860QDS_defconfig | 1 + configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 3 +- configs/BSC9131RDB_NAND_defconfig | 3 +- .../BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_defconfig | 1 + ...BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 2 + configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 3 +- ...BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 2 + configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 3 +- .../BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 1 + configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 1 + .../BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 1 + configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 1 + ...C9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 + configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 1 + ...C9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 + configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 1 + ...132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 + .../BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 1 + ...132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 + .../BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 1 + configs/C29XPCIE_NAND_defconfig | 3 +- configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CHIP_pro_defconfig | 5 +- configs/M5208EVBE_defconfig | 1 + configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M5235EVB_Flash32_defconfig | 1 + configs/M5235EVB_defconfig | 1 + configs/M5249EVB_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5272C3_defconfig | 1 + configs/M5275EVB_defconfig | 1 + configs/M5282EVB_defconfig | 1 + configs/M53017EVB_defconfig | 1 + configs/M5329AFEE_defconfig | 1 + configs/M5329BFEE_defconfig | 1 + configs/M5373EVB_defconfig | 1 + configs/M54418TWR_nand_mii_defconfig | 1 + configs/M54418TWR_nand_rmii_defconfig | 1 + configs/M54418TWR_nand_rmii_lowfreq_defconfig | 1 + configs/M54451EVB_defconfig | 1 + configs/M54451EVB_stmicro_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/M5475AFE_defconfig | 1 + configs/M5475BFE_defconfig | 1 + configs/M5475CFE_defconfig | 1 + configs/M5475DFE_defconfig | 1 + configs/M5475EFE_defconfig | 1 + configs/M5475FFE_defconfig | 1 + configs/M5475GFE_defconfig | 1 + configs/M5485AFE_defconfig | 1 + configs/M5485BFE_defconfig | 1 + configs/M5485CFE_defconfig | 1 + configs/M5485DFE_defconfig | 1 + configs/M5485EFE_defconfig | 1 + configs/M5485FFE_defconfig | 1 + configs/M5485GFE_defconfig | 1 + configs/M5485HFE_defconfig | 1 + configs/MCR3000_defconfig | 1 + configs/MPC8308RDB_defconfig | 1 + configs/MPC8313ERDB_33_defconfig | 1 + configs/MPC8313ERDB_66_defconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 3 +- configs/MPC8313ERDB_NAND_66_defconfig | 3 +- configs/MPC8315ERDB_defconfig | 1 + configs/MPC8323ERDB_defconfig | 1 + configs/MPC832XEMDS_ATM_defconfig | 1 + configs/MPC832XEMDS_HOST_33_defconfig | 1 + configs/MPC832XEMDS_HOST_66_defconfig | 1 + configs/MPC832XEMDS_SLAVE_defconfig | 1 + configs/MPC832XEMDS_defconfig | 1 + configs/MPC8349EMDS_PCI64_defconfig | 1 + configs/MPC8349EMDS_SDRAM_defconfig | 1 + configs/MPC8349EMDS_SLAVE_defconfig | 1 + configs/MPC8349EMDS_defconfig | 1 + configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MPC837XEMDS_HOST_defconfig | 1 + configs/MPC837XEMDS_defconfig | 1 + configs/MPC837XERDB_defconfig | 1 + configs/MPC8536DS_36BIT_defconfig | 1 + configs/MPC8536DS_SDCARD_defconfig | 1 + configs/MPC8536DS_SPIFLASH_defconfig | 1 + configs/MPC8536DS_defconfig | 1 + configs/MPC8541CDS_defconfig | 1 + configs/MPC8541CDS_legacy_defconfig | 1 + configs/MPC8544DS_defconfig | 1 + configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/MPC8555CDS_defconfig | 1 + configs/MPC8555CDS_legacy_defconfig | 1 + configs/MPC8568MDS_defconfig | 1 + configs/MPC8569MDS_ATM_defconfig | 1 + configs/MPC8569MDS_defconfig | 1 + configs/MPC8572DS_36BIT_defconfig | 1 + configs/MPC8572DS_defconfig | 1 + configs/MPC8610HPCD_defconfig | 1 + configs/MPC8641HPCN_36BIT_defconfig | 1 + configs/MPC8641HPCN_defconfig | 1 + configs/MigoR_defconfig | 1 + .../Nintendo_NES_Classic_Edition_defconfig | 3 +- .../P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_36BIT_NAND_defconfig | 3 +- .../P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 + configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 + ...010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 + configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_NAND_defconfig | 3 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_NOR_defconfig | 1 + configs/P1010RDB-PA_SDCARD_defconfig | 1 + .../P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_SPIFLASH_defconfig | 1 + .../P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_36BIT_NAND_defconfig | 3 +- .../P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 + configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 + ...010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 + configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_NAND_defconfig | 3 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_NOR_defconfig | 1 + configs/P1010RDB-PB_SDCARD_defconfig | 1 + .../P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_SPIFLASH_defconfig | 1 + configs/P1020MBG-PC_36BIT_SDCARD_defconfig | 1 + configs/P1020MBG-PC_36BIT_defconfig | 1 + configs/P1020MBG-PC_SDCARD_defconfig | 1 + configs/P1020MBG-PC_defconfig | 1 + configs/P1020RDB-PC_36BIT_NAND_defconfig | 3 +- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_36BIT_defconfig | 1 + configs/P1020RDB-PC_NAND_defconfig | 3 +- configs/P1020RDB-PC_SDCARD_defconfig | 1 + configs/P1020RDB-PC_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_defconfig | 1 + configs/P1020RDB-PD_NAND_defconfig | 3 +- configs/P1020RDB-PD_SDCARD_defconfig | 1 + configs/P1020RDB-PD_SPIFLASH_defconfig | 1 + configs/P1020RDB-PD_defconfig | 1 + configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 1 + configs/P1020UTM-PC_36BIT_defconfig | 1 + configs/P1020UTM-PC_SDCARD_defconfig | 1 + configs/P1020UTM-PC_defconfig | 1 + configs/P1021RDB-PC_36BIT_NAND_defconfig | 3 +- configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P1021RDB-PC_36BIT_defconfig | 1 + configs/P1021RDB-PC_NAND_defconfig | 3 +- configs/P1021RDB-PC_SDCARD_defconfig | 1 + configs/P1021RDB-PC_SPIFLASH_defconfig | 1 + configs/P1021RDB-PC_defconfig | 1 + configs/P1022DS_36BIT_NAND_defconfig | 3 +- configs/P1022DS_36BIT_SDCARD_defconfig | 1 + configs/P1022DS_36BIT_SPIFLASH_defconfig | 1 + configs/P1022DS_36BIT_defconfig | 1 + configs/P1022DS_NAND_defconfig | 3 +- configs/P1022DS_SDCARD_defconfig | 1 + configs/P1022DS_SPIFLASH_defconfig | 1 + configs/P1022DS_defconfig | 1 + configs/P1023RDB_defconfig | 1 + configs/P1024RDB_36BIT_defconfig | 1 + configs/P1024RDB_NAND_defconfig | 3 +- configs/P1024RDB_SDCARD_defconfig | 1 + configs/P1024RDB_SPIFLASH_defconfig | 1 + configs/P1024RDB_defconfig | 1 + configs/P1025RDB_36BIT_defconfig | 1 + configs/P1025RDB_NAND_defconfig | 3 +- configs/P1025RDB_SDCARD_defconfig | 1 + configs/P1025RDB_SPIFLASH_defconfig | 1 + configs/P1025RDB_defconfig | 1 + configs/P2020RDB-PC_36BIT_NAND_defconfig | 3 +- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P2020RDB-PC_36BIT_defconfig | 1 + configs/P2020RDB-PC_NAND_defconfig | 3 +- configs/P2020RDB-PC_SDCARD_defconfig | 1 + configs/P2020RDB-PC_SPIFLASH_defconfig | 1 + configs/P2020RDB-PC_defconfig | 1 + configs/P2041RDB_NAND_defconfig | 3 +- configs/P2041RDB_SDCARD_defconfig | 1 + configs/P2041RDB_SECURE_BOOT_defconfig | 1 + configs/P2041RDB_SPIFLASH_defconfig | 1 + configs/P2041RDB_defconfig | 1 + configs/P3041DS_NAND_SECURE_BOOT_defconfig | 3 +- configs/P3041DS_NAND_defconfig | 3 +- configs/P3041DS_SDCARD_defconfig | 1 + configs/P3041DS_SECURE_BOOT_defconfig | 1 + configs/P3041DS_SPIFLASH_defconfig | 1 + configs/P3041DS_defconfig | 1 + configs/P4080DS_SDCARD_defconfig | 1 + configs/P4080DS_SECURE_BOOT_defconfig | 1 + configs/P4080DS_SPIFLASH_defconfig | 1 + configs/P4080DS_defconfig | 1 + configs/P5020DS_NAND_SECURE_BOOT_defconfig | 3 +- configs/P5020DS_NAND_defconfig | 3 +- configs/P5020DS_SDCARD_defconfig | 1 + configs/P5020DS_SECURE_BOOT_defconfig | 1 + configs/P5020DS_SPIFLASH_defconfig | 1 + configs/P5020DS_defconfig | 1 + configs/P5040DS_NAND_SECURE_BOOT_defconfig | 3 +- configs/P5040DS_NAND_defconfig | 3 +- configs/P5040DS_SDCARD_defconfig | 1 + configs/P5040DS_SECURE_BOOT_defconfig | 1 + configs/P5040DS_SPIFLASH_defconfig | 1 + configs/P5040DS_defconfig | 1 + configs/T1023RDB_NAND_defconfig | 3 +- configs/T1023RDB_SDCARD_defconfig | 1 + configs/T1023RDB_SECURE_BOOT_defconfig | 1 + configs/T1023RDB_SPIFLASH_defconfig | 1 + configs/T1023RDB_defconfig | 1 + configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 1 + configs/T1024QDS_DDR4_defconfig | 1 + configs/T1024QDS_NAND_defconfig | 3 +- configs/T1024QDS_SDCARD_defconfig | 1 + configs/T1024QDS_SECURE_BOOT_defconfig | 1 + configs/T1024QDS_SPIFLASH_defconfig | 1 + configs/T1024QDS_defconfig | 1 + configs/T1024RDB_NAND_defconfig | 3 +- configs/T1024RDB_SDCARD_defconfig | 1 + configs/T1024RDB_SECURE_BOOT_defconfig | 1 + configs/T1024RDB_SPIFLASH_defconfig | 1 + configs/T1024RDB_defconfig | 1 + configs/T1040D4RDB_NAND_defconfig | 3 +- configs/T1040D4RDB_SDCARD_defconfig | 1 + configs/T1040D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1040D4RDB_SPIFLASH_defconfig | 1 + configs/T1040D4RDB_defconfig | 1 + configs/T1040QDS_DDR4_defconfig | 1 + configs/T1040QDS_SECURE_BOOT_defconfig | 1 + configs/T1040QDS_defconfig | 1 + configs/T1040RDB_NAND_defconfig | 3 +- configs/T1040RDB_SDCARD_defconfig | 1 + configs/T1040RDB_SECURE_BOOT_defconfig | 1 + configs/T1040RDB_SPIFLASH_defconfig | 1 + configs/T1040RDB_defconfig | 1 + configs/T1042D4RDB_NAND_defconfig | 3 +- configs/T1042D4RDB_SDCARD_defconfig | 1 + configs/T1042D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1042D4RDB_SPIFLASH_defconfig | 1 + configs/T1042D4RDB_defconfig | 1 + .../T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 3 +- configs/T1042RDB_PI_NAND_defconfig | 3 +- configs/T1042RDB_PI_SDCARD_defconfig | 1 + configs/T1042RDB_PI_SPIFLASH_defconfig | 1 + configs/T1042RDB_PI_defconfig | 1 + configs/T1042RDB_SECURE_BOOT_defconfig | 1 + configs/T1042RDB_defconfig | 1 + configs/T2080QDS_NAND_defconfig | 3 +- configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/T2080RDB_NAND_defconfig | 3 +- configs/T2080RDB_SDCARD_defconfig | 1 + configs/T2080RDB_SECURE_BOOT_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 1 + configs/T2080RDB_defconfig | 1 + configs/T2081QDS_NAND_defconfig | 3 +- configs/T2081QDS_SDCARD_defconfig | 1 + configs/T2081QDS_SPIFLASH_defconfig | 1 + configs/T2081QDS_defconfig | 1 + configs/T4160QDS_NAND_defconfig | 3 +- configs/T4160QDS_SDCARD_defconfig | 1 + configs/T4160QDS_SECURE_BOOT_defconfig | 1 + configs/T4160QDS_defconfig | 1 + configs/T4160RDB_defconfig | 1 + configs/T4240QDS_NAND_defconfig | 3 +- configs/T4240QDS_SDCARD_defconfig | 1 + configs/T4240QDS_SECURE_BOOT_defconfig | 1 + configs/T4240QDS_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 1 + configs/T4240RDB_defconfig | 1 + configs/TQM834x_defconfig | 2 +- configs/TWR-P1025_defconfig | 2 +- configs/UCP1020_defconfig | 1 + configs/adp-ae3xx_defconfig | 3 +- configs/adp-ag101p_defconfig | 1 + configs/ae350_rv32_defconfig | 1 + configs/alt_defconfig | 2 +- configs/am335x_baltos_defconfig | 4 +- configs/am335x_evm_defconfig | 3 +- configs/am335x_guardian_defconfig | 3 +- configs/am335x_hs_evm_defconfig | 3 +- configs/am335x_hs_evm_uart_defconfig | 3 +- configs/am335x_igep003x_defconfig | 4 +- configs/am3517_crane_defconfig | 3 +- configs/am3517_evm_defconfig | 4 +- configs/am43xx_evm_defconfig | 3 +- configs/am43xx_evm_rtconly_defconfig | 3 +- configs/am43xx_evm_usbhost_boot_defconfig | 3 +- configs/am43xx_hs_evm_defconfig | 3 +- configs/amcore_defconfig | 1 + configs/ap121_defconfig | 1 + configs/ap143_defconfig | 1 + configs/apf27_defconfig | 5 +- configs/apx4devkit_defconfig | 4 +- configs/aristainetos2_defconfig | 5 +- configs/aristainetos2b_defconfig | 5 +- configs/aristainetos_defconfig | 5 +- configs/astro_mcf5373l_defconfig | 1 + configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 3 +- configs/at91sam9260ek_dataflash_cs1_defconfig | 3 +- configs/at91sam9260ek_nandflash_defconfig | 3 +- configs/at91sam9261ek_dataflash_cs0_defconfig | 3 +- configs/at91sam9261ek_dataflash_cs3_defconfig | 3 +- configs/at91sam9261ek_nandflash_defconfig | 3 +- configs/at91sam9263ek_dataflash_cs0_defconfig | 3 +- configs/at91sam9263ek_dataflash_defconfig | 3 +- configs/at91sam9263ek_nandflash_defconfig | 3 +- configs/at91sam9263ek_norflash_boot_defconfig | 3 +- configs/at91sam9263ek_norflash_defconfig | 3 +- configs/at91sam9g10ek_dataflash_cs0_defconfig | 3 +- configs/at91sam9g10ek_dataflash_cs3_defconfig | 3 +- configs/at91sam9g10ek_nandflash_defconfig | 3 +- configs/at91sam9g20ek_2mmc_defconfig | 3 +- .../at91sam9g20ek_2mmc_nandflash_defconfig | 3 +- configs/at91sam9g20ek_dataflash_cs0_defconfig | 3 +- configs/at91sam9g20ek_dataflash_cs1_defconfig | 3 +- configs/at91sam9g20ek_nandflash_defconfig | 3 +- configs/at91sam9m10g45ek_mmc_defconfig | 3 +- configs/at91sam9m10g45ek_nandflash_defconfig | 2 + configs/at91sam9n12ek_mmc_defconfig | 3 +- configs/at91sam9n12ek_nandflash_defconfig | 2 + configs/at91sam9n12ek_spiflash_defconfig | 3 +- configs/at91sam9rlek_dataflash_defconfig | 3 +- configs/at91sam9rlek_mmc_defconfig | 3 +- configs/at91sam9rlek_nandflash_defconfig | 3 +- configs/at91sam9x5ek_dataflash_defconfig | 4 +- configs/at91sam9x5ek_mmc_defconfig | 4 +- configs/at91sam9x5ek_nandflash_defconfig | 3 + configs/at91sam9x5ek_spiflash_defconfig | 4 +- configs/at91sam9xeek_dataflash_cs0_defconfig | 3 +- configs/at91sam9xeek_dataflash_cs1_defconfig | 3 +- configs/at91sam9xeek_nandflash_defconfig | 3 +- configs/axm_defconfig | 3 +- configs/bcm11130_nand_defconfig | 1 - configs/bcm963158_ram_defconfig | 3 +- configs/bcm968380gerg_ram_defconfig | 3 +- configs/bcm968580xref_ram_defconfig | 3 +- configs/bg0900_defconfig | 4 +- configs/bitmain_antminer_s9_defconfig | 7 +- configs/bk4r1_defconfig | 6 +- configs/blanche_defconfig | 1 + configs/boston32r2_defconfig | 1 + configs/boston32r2el_defconfig | 1 + configs/boston32r6_defconfig | 1 + configs/boston32r6el_defconfig | 1 + configs/boston64r2_defconfig | 1 + configs/boston64r2el_defconfig | 1 + configs/boston64r6_defconfig | 1 + configs/boston64r6el_defconfig | 1 + configs/brppt1_nand_defconfig | 3 +- configs/brppt1_spi_defconfig | 2 +- configs/caddy2_defconfig | 1 + configs/cairo_defconfig | 3 +- configs/chiliboard_defconfig | 3 +- configs/clearfog_defconfig | 1 + configs/cm_fx6_defconfig | 3 +- configs/cm_t335_defconfig | 3 +- configs/cm_t35_defconfig | 3 +- configs/cm_t43_defconfig | 3 +- configs/cobra5272_defconfig | 1 + configs/colibri-imx6ull_defconfig | 7 +- configs/colibri_imx7_defconfig | 5 +- configs/colibri_pxa270_defconfig | 1 + configs/colibri_t20_defconfig | 3 + configs/colibri_vf_defconfig | 5 +- configs/comtrend_ar5315u_ram_defconfig | 1 + configs/comtrend_ar5387un_ram_defconfig | 1 + configs/comtrend_ct5361_ram_defconfig | 1 + configs/comtrend_wap5813n_ram_defconfig | 1 + configs/corvus_defconfig | 3 +- configs/crs305-1g-4s_defconfig | 2 +- configs/da850evm_defconfig | 1 - configs/da850evm_nand_defconfig | 2 +- configs/db-88f6820-amc_defconfig | 3 +- configs/db-mv784mp-gp_defconfig | 3 +- configs/db-xc3-24g4xg_defconfig | 4 +- configs/devkit3250_defconfig | 3 +- configs/devkit8000_defconfig | 3 +- configs/display5_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- configs/dns325_defconfig | 3 + configs/dockstar_defconfig | 3 + configs/dra7xx_evm_defconfig | 3 +- configs/dra7xx_hs_evm_defconfig | 3 +- configs/draco_defconfig | 4 +- configs/ds414_defconfig | 3 +- configs/eb_cpu5282_defconfig | 1 + configs/eb_cpu5282_internal_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/etamin_defconfig | 4 +- configs/ethernut5_defconfig | 4 +- configs/evb-rv1108_defconfig | 1 + configs/flea3_defconfig | 3 +- .../gardena-smart-gateway-at91sam_defconfig | 2 + ...gardena-smart-gateway-mt7688-ram_defconfig | 2 + .../gardena-smart-gateway-mt7688_defconfig | 2 + configs/gazerbeam_defconfig | 1 + configs/goflexhome_defconfig | 3 + configs/gose_defconfig | 2 +- configs/gurnard_defconfig | 3 +- configs/guruplug_defconfig | 3 + configs/gwventana_emmc_defconfig | 3 +- configs/gwventana_gw5904_defconfig | 3 +- configs/gwventana_nand_defconfig | 5 +- configs/harmony_defconfig | 3 + configs/helios4_defconfig | 1 + configs/hrcon_defconfig | 1 + configs/hrcon_dh_defconfig | 1 + configs/huawei_hg556a_ram_defconfig | 1 + configs/ib62x0_defconfig | 3 + configs/iconnect_defconfig | 3 + configs/ids8313_defconfig | 3 + configs/igep00x0_defconfig | 4 +- configs/imx6dl_icore_nand_defconfig | 4 +- configs/imx6q_icore_nand_defconfig | 4 +- configs/imx6q_logic_defconfig | 5 +- configs/imx6qdl_icore_mmc_defconfig | 4 +- configs/imx6qdl_icore_nand_defconfig | 4 +- configs/imx6ul_geam_nand_defconfig | 4 +- configs/imx6ul_isiot_nand_defconfig | 4 +- configs/integratorap_cm720t_defconfig | 1 + configs/integratorap_cm920t_defconfig | 1 + configs/integratorap_cm926ejs_defconfig | 1 + configs/integratorap_cm946es_defconfig | 1 + configs/integratorcp_cm1136_defconfig | 1 + configs/integratorcp_cm920t_defconfig | 1 + configs/integratorcp_cm926ejs_defconfig | 1 + configs/integratorcp_cm946es_defconfig | 1 + configs/k2e_evm_defconfig | 4 +- configs/k2e_hs_evm_defconfig | 4 +- configs/k2g_evm_defconfig | 5 +- configs/k2g_hs_evm_defconfig | 5 +- configs/k2hk_evm_defconfig | 4 +- configs/k2hk_hs_evm_defconfig | 4 +- configs/k2l_evm_defconfig | 4 +- configs/k2l_hs_evm_defconfig | 4 +- configs/khadas-vim2_defconfig | 2 +- configs/km_kirkwood_128m16_defconfig | 3 + configs/km_kirkwood_defconfig | 3 + configs/km_kirkwood_pci_defconfig | 3 + configs/kmcoge4_defconfig | 2 + configs/kmcoge5ne_defconfig | 2 + configs/kmcoge5un_defconfig | 3 + configs/kmeter1_defconfig | 3 +- configs/kmnusa_defconfig | 3 + configs/kmopti2_defconfig | 3 +- configs/kmsugp1_defconfig | 3 + configs/kmsupx5_defconfig | 3 +- configs/kmsuv31_defconfig | 3 + configs/kmtegr1_defconfig | 2 + configs/kmtepr2_defconfig | 3 +- configs/koelsch_defconfig | 2 +- configs/kzm9g_defconfig | 1 + configs/lager_defconfig | 2 +- configs/libretech-ac_defconfig | 2 +- configs/linkit-smart-7688-ram_defconfig | 1 + configs/linkit-smart-7688_defconfig | 1 + configs/lion-rk3368_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 2 + configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 1 + configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_nor_defconfig | 1 + configs/ls1021atwr_nor_lpuart_defconfig | 1 + ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 2 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 2 + configs/ls1043aqds_tfa_defconfig | 2 + configs/ls1043ardb_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_defconfig | 1 + configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 2 + configs/ls1043ardb_nand_defconfig | 2 + .../ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 2 + configs/ls1043ardb_tfa_defconfig | 2 + configs/ls1046afrwy_tfa_defconfig | 2 + configs/ls1046aqds_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_defconfig | 2 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 2 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 2 + configs/ls1046aqds_tfa_defconfig | 2 + configs/ls1046ardb_emmc_defconfig | 2 + configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1046ardb_qspi_defconfig | 2 + configs/ls1046ardb_qspi_spl_defconfig | 2 + .../ls1046ardb_sdcard_SECURE_BOOT_defconfig | 2 + configs/ls1046ardb_sdcard_defconfig | 2 + configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 2 + configs/ls1046ardb_tfa_defconfig | 2 + configs/ls1088aqds_defconfig | 2 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1088aqds_qspi_defconfig | 2 + configs/ls1088aqds_sdcard_ifc_defconfig | 2 + configs/ls1088aqds_sdcard_qspi_defconfig | 2 + configs/ls1088aqds_tfa_defconfig | 2 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1088ardb_qspi_defconfig | 2 + ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1088ardb_sdcard_qspi_defconfig | 2 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 2 + configs/ls1088ardb_tfa_defconfig | 2 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 2 + configs/ls2080aqds_qspi_defconfig | 2 + configs/ls2080aqds_sdcard_defconfig | 2 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 2 + configs/ls2088aqds_tfa_defconfig | 1 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + configs/m53menlo_defconfig | 5 +- configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/mccmon6_nor_defconfig | 4 +- configs/mccmon6_sd_defconfig | 4 +- configs/medcom-wide_defconfig | 2 + configs/meesc_defconfig | 3 +- configs/mgcoge3un_defconfig | 3 + configs/microblaze-generic_defconfig | 2 +- configs/mpc8308_p1m_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 5 +- configs/mx28evk_defconfig | 5 +- configs/mx28evk_nand_defconfig | 5 +- configs/mx28evk_spi_defconfig | 5 +- configs/mx31pdk_defconfig | 3 +- configs/mx35pdk_defconfig | 3 +- configs/mx53ard_defconfig | 3 +- configs/mx6sabreauto_defconfig | 4 +- configs/mx6sxsabreauto_defconfig | 4 +- configs/nas220_defconfig | 3 + configs/netgear_cg3100d_ram_defconfig | 1 + configs/nsa310s_defconfig | 3 + configs/omap35_logic_defconfig | 4 +- configs/omap35_logic_somlv_defconfig | 4 +- configs/omap3_beagle_defconfig | 4 +- configs/omap3_evm_defconfig | 4 +- configs/omap3_ha_defconfig | 4 +- configs/omap3_logic_defconfig | 4 +- configs/omap3_logic_somlv_defconfig | 4 +- configs/omap3_overo_defconfig | 4 +- configs/omap3_pandora_defconfig | 4 +- configs/omap3_zoom1_defconfig | 3 +- configs/omapl138_lcdk_defconfig | 3 +- configs/openrd_base_defconfig | 3 + configs/openrd_client_defconfig | 3 + configs/openrd_ultimate_defconfig | 3 + configs/pcm052_defconfig | 4 + configs/pcm058_defconfig | 5 +- configs/pengwyn_defconfig | 3 +- configs/pfla02_defconfig | 4 +- configs/phycore-am335x-r2-wega_defconfig | 2 +- configs/phycore_pcl063_defconfig | 3 +- configs/platinum_picon_defconfig | 5 +- configs/platinum_titanium_defconfig | 5 +- configs/plutux_defconfig | 2 + configs/pm9261_defconfig | 3 +- configs/pm9263_defconfig | 3 +- configs/pm9g45_defconfig | 2 + configs/pogo_e02_defconfig | 3 + configs/porter_defconfig | 2 +- configs/pxm2_defconfig | 4 +- configs/qemu_arm64_defconfig | 2 +- configs/qemu_arm_defconfig | 2 +- configs/qemu_mips64_defconfig | 1 + configs/qemu_mips64el_defconfig | 1 + configs/qemu_mips_defconfig | 1 + configs/qemu_mipsel_defconfig | 1 + configs/r2dplus_defconfig | 1 + configs/r7780mp_defconfig | 1 + configs/r8a77995_draak_defconfig | 2 +- configs/rastaban_defconfig | 4 +- configs/rut_defconfig | 4 +- configs/s5pc210_universal_defconfig | 2 +- configs/sagem_f@st1704_ram_defconfig | 1 + configs/sama5d2_ptc_ek_mmc_defconfig | 3 +- configs/sama5d2_ptc_ek_nandflash_defconfig | 2 + configs/sama5d36ek_cmp_mmc_defconfig | 3 +- configs/sama5d36ek_cmp_nandflash_defconfig | 2 + configs/sama5d36ek_cmp_spiflash_defconfig | 3 +- configs/sama5d3_xplained_mmc_defconfig | 4 +- configs/sama5d3_xplained_nandflash_defconfig | 3 + configs/sama5d3xek_mmc_defconfig | 3 +- configs/sama5d3xek_nandflash_defconfig | 2 + configs/sama5d3xek_spiflash_defconfig | 3 +- configs/sama5d4_xplained_mmc_defconfig | 3 +- configs/sama5d4_xplained_nandflash_defconfig | 2 + configs/sama5d4_xplained_spiflash_defconfig | 3 +- configs/sama5d4ek_mmc_defconfig | 3 +- configs/sama5d4ek_nandflash_defconfig | 2 + configs/sama5d4ek_spiflash_defconfig | 3 +- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sbc8349_PCI_33_defconfig | 1 + configs/sbc8349_PCI_66_defconfig | 1 + configs/sbc8349_defconfig | 1 + configs/sbc8548_PCI_33_PCIE_defconfig | 1 + configs/sbc8548_PCI_33_defconfig | 1 + configs/sbc8548_PCI_66_PCIE_defconfig | 1 + configs/sbc8548_PCI_66_defconfig | 1 + configs/sbc8548_defconfig | 1 + configs/sbc8641d_defconfig | 1 + configs/seaboard_defconfig | 2 + configs/sfr_nb4-ser_ram_defconfig | 1 + configs/sh7763rdp_defconfig | 1 + configs/sheevaplug_defconfig | 3 + configs/silk_defconfig | 2 +- configs/smartweb_defconfig | 3 +- configs/smdkc100_defconfig | 2 +- configs/snapper9260_defconfig | 3 +- configs/snapper9g20_defconfig | 3 +- configs/socfpga_arria10_defconfig | 2 +- configs/socfpga_arria5_defconfig | 3 +- configs/socfpga_cyclone5_defconfig | 3 +- configs/socfpga_dbm_soc1_defconfig | 2 +- configs/socfpga_de0_nano_soc_defconfig | 3 +- configs/socfpga_de10_nano_defconfig | 2 +- configs/socfpga_de1_soc_defconfig | 2 +- configs/socfpga_is1_defconfig | 3 +- configs/socfpga_mcvevk_defconfig | 3 - configs/socfpga_sockit_defconfig | 3 +- configs/socfpga_socrates_defconfig | 3 +- configs/socfpga_sr1500_defconfig | 3 +- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 3 +- configs/socrates_defconfig | 1 + configs/spear300_defconfig | 2 +- configs/spear300_nand_defconfig | 4 +- configs/spear300_usbtty_defconfig | 2 +- configs/spear300_usbtty_nand_defconfig | 4 +- configs/spear310_defconfig | 2 +- configs/spear310_nand_defconfig | 4 +- configs/spear310_pnor_defconfig | 2 +- configs/spear310_usbtty_defconfig | 2 +- configs/spear310_usbtty_nand_defconfig | 4 +- configs/spear310_usbtty_pnor_defconfig | 2 +- configs/spear320_defconfig | 2 +- configs/spear320_nand_defconfig | 4 +- configs/spear320_pnor_defconfig | 2 +- configs/spear320_usbtty_defconfig | 2 +- configs/spear320_usbtty_nand_defconfig | 4 +- configs/spear320_usbtty_pnor_defconfig | 2 +- configs/spear600_defconfig | 2 +- configs/spear600_nand_defconfig | 4 +- configs/spear600_usbtty_defconfig | 2 +- configs/spear600_usbtty_nand_defconfig | 4 +- configs/stm32f429-discovery_defconfig | 1 + configs/stm32f429-evaluation_defconfig | 1 + configs/stm32f469-discovery_defconfig | 2 +- configs/stm32f746-disco_defconfig | 3 +- configs/stm32mp15_basic_defconfig | 3 +- configs/stm32mp15_trusted_defconfig | 3 +- configs/stmark2_defconfig | 2 +- configs/stout_defconfig | 2 +- configs/strider_con_defconfig | 1 + configs/strider_con_dp_defconfig | 1 + configs/strider_cpu_defconfig | 1 + configs/strider_cpu_dp_defconfig | 1 + configs/suvd3_defconfig | 3 +- configs/tao3530_defconfig | 4 +- configs/taurus_defconfig | 3 +- configs/tec_defconfig | 2 + configs/thuban_defconfig | 4 +- configs/ti816x_evm_defconfig | 3 +- configs/titanium_defconfig | 5 +- configs/tplink_wdr4300_defconfig | 1 + configs/tricorder_defconfig | 4 +- configs/tricorder_flash_defconfig | 4 +- configs/tuge1_defconfig | 3 +- configs/turris_mox_defconfig | 1 + configs/tuxx1_defconfig | 3 +- configs/uDPU_defconfig | 2 +- configs/uniphier_ld4_sld8_defconfig | 4 +- configs/uniphier_v7_defconfig | 4 +- configs/uniphier_v8_defconfig | 4 +- configs/usb_a9263_dataflash_defconfig | 3 +- configs/vct_platinum_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 3 +- configs/vct_platinum_onenand_small_defconfig | 3 +- configs/vct_platinum_small_defconfig | 1 + configs/vct_platinumavc_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 3 +- .../vct_platinumavc_onenand_small_defconfig | 3 +- configs/vct_platinumavc_small_defconfig | 1 + configs/vct_premium_defconfig | 1 + configs/vct_premium_onenand_defconfig | 3 +- configs/vct_premium_onenand_small_defconfig | 3 +- configs/vct_premium_small_defconfig | 1 + configs/ve8313_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 2 +- configs/vexpress_aemv8a_semi_defconfig | 2 +- configs/vexpress_ca15_tc2_defconfig | 2 +- configs/vexpress_ca5x2_defconfig | 2 +- configs/vexpress_ca9x4_defconfig | 2 +- configs/vf610twr_defconfig | 4 + configs/vf610twr_nand_defconfig | 4 + configs/vme8349_defconfig | 1 + configs/wb45n_defconfig | 3 +- configs/wb50n_defconfig | 3 +- configs/woodburn_defconfig | 3 +- configs/woodburn_sd_defconfig | 4 +- configs/work_92105_defconfig | 2 + configs/x530_defconfig | 3 +- configs/x600_defconfig | 3 + configs/xilinx_zynqmp_mini_nand_defconfig | 3 +- .../xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 5 +- .../xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 4 +- configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + configs/xtfpga_defconfig | 1 + configs/zmx25_defconfig | 1 + configs/zynq_cse_nand_defconfig | 4 +- configs/zynq_cse_nor_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 5 +- configs/zynq_zc770_xm011_x16_defconfig | 5 +- configs/zynq_zc770_xm012_defconfig | 1 + drivers/Makefile | 7 +- drivers/dfu/Kconfig | 1 + drivers/mtd/Kconfig | 13 +-- drivers/mtd/Makefile | 50 +++++++--- drivers/mtd/mtd_uboot.c | 96 +----------------- drivers/mtd/nand/Makefile | 5 + drivers/mtd/nand/bbt.c | 1 + drivers/mtd/nand/core.c | 1 + drivers/mtd/nand/raw/Kconfig | 4 +- drivers/mtd/nand/raw/nand.c | 2 +- drivers/mtd/onenand/onenand_uboot.c | 2 +- drivers/mtd/spi/Kconfig | 2 +- env/Kconfig | 2 + include/configs/B4860QDS.h | 10 +- include/configs/BSC9131RDB.h | 4 +- include/configs/BSC9132QDS.h | 8 +- include/configs/C29XPCIE.h | 8 +- include/configs/P1010RDB.h | 12 +-- include/configs/P1022DS.h | 10 +- include/configs/P2041RDB.h | 6 +- include/configs/T102xQDS.h | 8 +- include/configs/T102xRDB.h | 8 +- include/configs/T1040QDS.h | 6 +- include/configs/T104xRDB.h | 12 +-- include/configs/T208xQDS.h | 8 +- include/configs/T208xRDB.h | 8 +- include/configs/T4240QDS.h | 10 +- include/configs/T4240RDB.h | 6 +- include/configs/am335x_evm.h | 6 +- include/configs/am335x_guardian.h | 4 +- include/configs/am3517_evm.h | 6 +- include/configs/am43xx_evm.h | 6 +- include/configs/baltos.h | 6 +- include/configs/bav335x.h | 8 +- include/configs/broadcom_bcm963158.h | 4 +- include/configs/broadcom_bcm968380gerg.h | 4 +- include/configs/broadcom_bcm968580xref.h | 4 +- include/configs/brppt1.h | 16 +-- include/configs/corenet_ds.h | 8 +- include/configs/da850evm.h | 4 +- include/configs/dra7xx_evm.h | 4 +- include/configs/ls2080ardb.h | 2 +- include/configs/mvebu_armada-37xx.h | 1 - include/configs/omap3_beagle.h | 10 +- include/configs/omap3_evm.h | 10 +- include/configs/omap3_logic.h | 2 +- include/configs/omap3_overo.h | 6 +- include/configs/omap3_pandora.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/p1_p2_rdb_pc.h | 8 +- include/configs/phycore_am335x_r2.h | 6 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/socfpga_stratix10_socdk.h | 1 - include/configs/ti_armv7_common.h | 2 +- include/configs/ti_armv7_omap.h | 2 +- include/configs/ti_omap3_common.h | 2 +- include/configs/x530.h | 1 - include/env_internal.h | 4 +- include/environment/ti/dfu.h | 2 +- include/environment/ti/nand.h | 2 +- include/flash.h | 2 +- include/linux/mtd/mtd.h | 6 -- 849 files changed, 1591 insertions(+), 640 deletions(-) create mode 100644 cmd/legacy-mtd-utils.c create mode 100644 cmd/legacy-mtd-utils.h -- 2.20.1

4 66

[U-Boot] [PATCH] arm64: zynqmp: Point zcu216 defconfig to correct dts file
by Michal Simek 04 Dec '19

04 Dec '19

Defconfig is pointing to incorrect DT file which needs to be fix. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_zcu216_revA_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/xilinx_zynqmp_zcu216_revA_defconfig b/configs/xilinx_zynqmp_zcu216_revA_defconfig index ccc5303c2f83..74a8eec40cbd 100644 --- a/configs/xilinx_zynqmp_zcu216_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu216_revA_defconfig @@ -33,7 +33,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu111-revA" +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu216-revA" CONFIG_ENV_IS_IN_FAT=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y -- 2.17.1

2 1

[U-Boot] [PATCH 0/4] cmd: dtimg: Enhance with --id and --rev options (take #1)
by Eugeniu Rosca 04 Dec '19

04 Dec '19

Dear U-Boot community, As summarized in the title, the motivation behind the series is to primarly allow the Android "dtimg" command (credits to Sam for having it) to actually leverage the specification described in [*]. There are a few collateral improvements and optimizations added as well. The individual patches should be verbose and descriptive enough. The series has been tested on R-Car H3ULCB. All available static analysis tools [**] have been silenced. Your comments would be highly appreciated. [*] https://source.android.com/devices/architecture/dto/partitions [**] smatch, cppecheck, sparse, make W=1 Eugeniu Rosca (4): cmd: dtimg: Report invalid index argument cmd: dtimg: Merge duplicated prints cmd: dtimg: Make <varname> an optional argument cmd: dtimg: Get start and size based on --id and --rev cmd/dtimg.c | 133 +++++++++++++++++++++++++++++-------- common/image-android-dt.c | 64 ++++++++++++++++-- include/image-android-dt.h | 5 +- 3 files changed, 169 insertions(+), 33 deletions(-) -- 2.24.0

2 8

Re: [U-Boot] [RFC PATCH] spi: spi-nor: Add dual flash support in spi-nor framework
by Michal Simek 04 Dec '19

04 Dec '19

On 19. 11. 19 15:20, Ashok Reddy Soma wrote: > Add dual parallel and dual stacked support in spi-nor framework. > Add dual flash support for nor-scan, read and write. > > Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> > --- > Hi, > > I have added dual parallel and dual stacked related changes to the > spi-nor framework. I have tested this for dual parallel configuration > on zynqmp platform. I am in process of testing dual stacked > configuration. > > Please let me know if my approach is correct. If it is okay, i will > split this in to meaningful patches and send. > > Thanks in advance, > Ashok Reddy Soma > --- > drivers/mtd/spi/sf_internal.h | 9 + > drivers/mtd/spi/spi-nor-core.c | 363 ++++++++++++++++++++++++++++----- > drivers/spi/spi-mem.c | 19 +- > include/linux/mtd/spi-nor.h | 4 + > include/spi.h | 9 + > 5 files changed, 351 insertions(+), 53 deletions(-) > > diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h > index 5c643034c6..d836261f01 100644 > --- a/drivers/mtd/spi/sf_internal.h > +++ b/drivers/mtd/spi/sf_internal.h > @@ -15,6 +15,15 @@ > #define SPI_NOR_MAX_ID_LEN 6 > #define SPI_NOR_MAX_ADDR_WIDTH 4 > > +/* Dual SPI flash memories - see SPI_COMM_DUAL_... */ > +enum spi_dual_flash { > + SF_SINGLE_FLASH = 0, > + SF_DUAL_STACKED_FLASH = BIT(0), > + SF_DUAL_PARALLEL_FLASH = BIT(1), > +}; > + > +#define SPI_FLASH_16MB_BOUN 0x1000000 > + > struct flash_info { > #if !CONFIG_IS_ENABLED(SPI_FLASH_TINY) > char *name; > diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c > index 5a8c084255..a53c78ff22 100644 > --- a/drivers/mtd/spi/spi-nor-core.c > +++ b/drivers/mtd/spi/spi-nor-core.c > @@ -21,6 +21,7 @@ > #include <spi-mem.h> > #include <spi.h> > > +#include <linux/mtd/spi-nor.h> > #include "sf_internal.h" > > /* Define max times to check status register before we give up. */ > @@ -34,6 +35,11 @@ > > #define DEFAULT_READY_WAIT_JIFFIES (40UL * HZ) > > +#define SPI_MASTER_QUAD_MODE BIT(6) /* support quad mode */ > +#define SPI_MASTER_DATA_STRIPE BIT(7) /* support data stripe */ > +#define SPI_MASTER_BOTH_CS BIT(8) /* assert both chip selects */ > +#define SPI_MASTER_U_PAGE BIT(9) /* select upper flash */ > + > static int spi_nor_read_write_reg(struct spi_nor *nor, struct spi_mem_op > *op, void *buf) > { > @@ -146,15 +152,24 @@ static ssize_t spi_nor_write_data(struct spi_nor *nor, loff_t to, size_t len, > static int read_sr(struct spi_nor *nor) > { > int ret; > - u8 val; > + u8 val[2]; > > - ret = nor->read_reg(nor, SPINOR_OP_RDSR, &val, 1); > - if (ret < 0) { > + if (nor->isparallel) { > + ret = nor->read_reg(nor, SPINOR_OP_RDSR, &val[0], 2); > + if (ret < 0) { > + pr_debug("error %d reading SR\n", (int)ret); > + return ret; > + } > + val[0] |= val[1]; > + } else { > + ret = nor->read_reg(nor, SPINOR_OP_RDSR, &val[0], 1); > + if (ret < 0) { > pr_debug("error %d reading SR\n", (int)ret); > return ret; > + } > } > > - return val; > + return val[0]; > } > > /* > @@ -165,15 +180,24 @@ static int read_sr(struct spi_nor *nor) > static int read_fsr(struct spi_nor *nor) > { > int ret; > - u8 val; > + u8 val[2]; > > - ret = nor->read_reg(nor, SPINOR_OP_RDFSR, &val, 1); > - if (ret < 0) { > + if (nor->isparallel) { > + ret = nor->read_reg(nor, SPINOR_OP_RDFSR, &val[0], 2); > + if (ret < 0) { > + pr_debug("error %d reading SR\n", (int)ret); > + return ret; > + } > + val[0] &= val[1]; > + } else { > + ret = nor->read_reg(nor, SPINOR_OP_RDFSR, &val[0], 1); > + if (ret < 0) { > pr_debug("error %d reading FSR\n", ret); > return ret; > + } > } > > - return val; > + return val[0]; > } > > /* > @@ -288,12 +312,17 @@ static u8 spi_nor_convert_3to4_erase(u8 opcode) > static void spi_nor_set_4byte_opcodes(struct spi_nor *nor, > const struct flash_info *info) > { > + bool shift = 0; > + > + if (nor->isparallel) > + shift = 1; > + > /* Do some manufacturer fixups first */ > switch (JEDEC_MFR(info)) { > case SNOR_MFR_SPANSION: > /* No small sector erase for 4-byte command set */ > nor->erase_opcode = SPINOR_OP_SE; > - nor->mtd.erasesize = info->sector_size; > + nor->mtd.erasesize = info->sector_size << shift; > break; > > default: > @@ -465,12 +494,19 @@ static int clean_bar(struct spi_nor *nor) > > static int write_bar(struct spi_nor *nor, u32 offset) > { > - u8 cmd, bank_sel; > + u8 cmd, bank_sel, upage_curr; > int ret; > > - bank_sel = offset / SZ_16M; > - if (bank_sel == nor->bank_curr) > - goto bar_end; > + bank_sel = offset / (SZ_16M << nor->shift); > + > + upage_curr = nor->spi->flags & SPI_XFER_U_PAGE; > + > + if ((!nor->isstacked) || (nor->upage_prev == upage_curr)) { > + if (bank_sel == nor->bank_curr) > + goto bar_end; > + } else { > + nor->upage_prev = upage_curr; > + } > > cmd = nor->bank_write_cmd; > write_enable(nor); > @@ -488,8 +524,12 @@ bar_end: > static int read_bar(struct spi_nor *nor, const struct flash_info *info) > { > u8 curr_bank = 0; > + u8 curr_bank_up = 0; > int ret; > > + if (nor->size <= SPI_FLASH_16MB_BOUN) > + goto bar_end; > + > switch (JEDEC_MFR(info)) { > case SNOR_MFR_SPANSION: > nor->bank_read_cmd = SPINOR_OP_BRRD; > @@ -500,12 +540,31 @@ static int read_bar(struct spi_nor *nor, const struct flash_info *info) > nor->bank_write_cmd = SPINOR_OP_WREAR; > } > > - ret = nor->read_reg(nor, nor->bank_read_cmd, > + if (nor->isparallel) { > + nor->spi->flags |= SPI_XFER_LOWER; > + ret = nor->read_reg(nor, nor->bank_read_cmd, > &curr_bank, 1); > - if (ret) { > - debug("SF: fail to read bank addr register\n"); > - return ret; > + if (ret) > + return ret; > + > + nor->spi->flags |= SPI_XFER_UPPER; > + ret = nor->read_reg(nor, nor->bank_read_cmd, > + &curr_bank_up, 1); > + if (ret) > + return ret; > + if (curr_bank != curr_bank_up) { > + printf("Incorrect Bank selections Dual parallel\n"); > + return -EINVAL; > + } > + } else { > + ret = nor->read_reg(nor, nor->bank_read_cmd, > + &curr_bank, 1); > + if (ret) { > + debug("SF: fail to read bank addr register\n"); > + return ret; > + } > } > +bar_end: > nor->bank_curr = curr_bank; > > return 0; > @@ -540,7 +599,7 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr) > static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) > { > struct spi_nor *nor = mtd_to_spi_nor(mtd); > - u32 addr, len, rem; > + u32 addr, len, rem, offset; > int ret; > > dev_dbg(nor->dev, "at 0x%llx, len %lld\n", (long long)instr->addr, > @@ -554,14 +613,37 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) > len = instr->len; > > while (len) { > + write_enable(nor); > + offset = addr; > + if (nor->isparallel) { > + offset /= 2; > + nor->spi->flags |= SPI_XFER_STRIPE; > + } > + > + if (nor->isstacked) { > + if (offset >= (mtd->size / 2)) { > + offset = offset - (mtd->size / 2); > + nor->spi->flags |= SPI_MASTER_U_PAGE; > + } else { > + nor->spi->flags &= ~SPI_MASTER_U_PAGE; > + } > + } > + if (nor->addr_width == 3) { > #ifdef CONFIG_SPI_FLASH_BAR > - ret = write_bar(nor, addr); > - if (ret < 0) > - return ret; > + /* Update Extended Address Register */ > + ret = write_bar(nor, offset); > + if (ret) > + goto erase_err; > #endif > + } > + > + ret = spi_nor_wait_till_ready(nor); > + if (ret) > + goto erase_err; > + > write_enable(nor); > > - ret = spi_nor_erase_sector(nor, addr); > + ret = spi_nor_erase_sector(nor, offset); > if (ret) > goto erase_err; > > @@ -861,12 +943,33 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) > static int stm_is_locked(struct spi_nor *nor, loff_t ofs, uint64_t len) > { > int status; > + u8 sr; > + int status_up; > + u8 sr_up; > + > + if (nor->isparallel) { > + nor->spi->flags |= SPI_XFER_LOWER; > + sr = read_sr(nor); > + if (sr < 0) > + return 0; > + status = stm_is_locked_sr(nor, ofs, len, sr); > + > + nor->spi->flags |= SPI_XFER_UPPER; > + sr_up = read_sr(nor); > + if (sr_up < 0) > + return sr_up; > + status_up = stm_is_locked_sr(nor, ofs, len, sr_up); > + status = status && status_up; > + > + return status; > + } else { > > status = read_sr(nor); > if (status < 0) > return status; > > return stm_is_locked_sr(nor, ofs, len, status); > + } > } > #endif /* CONFIG_SPI_FLASH_STMICRO */ > > @@ -876,6 +979,9 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor) > u8 id[SPI_NOR_MAX_ID_LEN]; > const struct flash_info *info; > > + if (nor->isparallel) > + nor->spi->flags |= SPI_XFER_LOWER; > + > tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN); > if (tmp < 0) { > dev_dbg(nor->dev, "error %d reading JEDEC ID\n", tmp); > @@ -900,28 +1006,98 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, > { > struct spi_nor *nor = mtd_to_spi_nor(mtd); > int ret; > + u32 offset = from; > + u32 stack_shift = 0; > + u32 read_len = 0; > + u32 rem_bank_len = 0; > + u8 bank; > + u8 is_ofst_odd = 0; > + u8 cur_bank; > + u8 nxt_bank; > + u32 bank_size; > + > +#define OFFSET_16_MB 0x1000000 > > dev_dbg(nor->dev, "from 0x%08x, len %zd\n", (u32)from, len); > > + if ((nor->isparallel) && (offset & 1)) { > + /* We can hit this case when we use file system like ubifs */ > + from = (loff_t)(from - 1); > + len = (size_t)(len + 1); > + is_ofst_odd = 1; > + } > + > while (len) { > - loff_t addr = from; > - size_t read_len = len; > + if (nor->addr_width == 3) { > + bank = (u32)from / (OFFSET_16_MB << nor->shift); > + rem_bank_len = ((OFFSET_16_MB << nor->shift) * > + (bank + 1)) - from; > + } > + offset = from; > > -#ifdef CONFIG_SPI_FLASH_BAR > - u32 remain_len; > + if (nor->isparallel) { > + offset /= 2; > + nor->spi->flags = SPI_XFER_STRIPE; > + } > > - ret = write_bar(nor, addr); > - if (ret < 0) > - return log_ret(ret); > - remain_len = (SZ_16M * (nor->bank_curr + 1)) - addr; > + if (nor->isstacked) { > + stack_shift = 1; > + if (offset >= (mtd->size / 2)) { > + offset = offset - (mtd->size / 2); > + nor->spi->flags |= SPI_MASTER_U_PAGE; > + } else { > + nor->spi->flags &= ~SPI_MASTER_U_PAGE; > + } > + } > > - if (len < remain_len) > - read_len = len; > - else > - read_len = remain_len; > + if (nor->addr_width == 4) { > + /* > + * Some flash devices like N25Q512 have multiple dies > + * in it. Read operation in these devices is bounded > + * by its die segment. In a continuous read, across > + * multiple dies, when the last byte of the selected > + * die segment is read, the next byte read is the > + * first byte of the same die segment. This is Die > + * cross over issue. So to handle this issue, split > + * a read transaction, that spans across multiple > + * banks, into one read per bank. Bank size is 16MB > + * for single and dual stacked mode and 32MB for dual > + * parallel mode. > + */ > + if (nor->spi && nor->spi->multi_die) { > + bank_size = (OFFSET_16_MB << nor->shift); > + cur_bank = offset / bank_size; > + nxt_bank = (offset + len) / bank_size; > + if (cur_bank != nxt_bank) > + rem_bank_len = (bank_size * > + (cur_bank + 1)) - > + offset; > + else > + rem_bank_len = (mtd->size >> > + stack_shift) - > + (offset << nor->shift); > + } else { > + rem_bank_len = (mtd->size >> stack_shift) - > + (offset << nor->shift); > + } > + } > + > + if (nor->addr_width == 3) { > +#ifdef CONFIG_SPI_FLASH_BAR > + write_bar(nor, offset); > #endif > + } > + > + if (len < rem_bank_len) > + read_len = len; > + else > + read_len = rem_bank_len; > > - ret = nor->read(nor, addr, read_len, buf); > + ret = spi_nor_wait_till_ready(nor); > + if (ret) > + goto read_err; > + > + ret = nor->read(nor, offset, read_len, buf); > if (ret == 0) { > /* We shouldn't see 0-length reads */ > ret = -EIO; > @@ -930,7 +1106,12 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, > if (ret < 0) > goto read_err; > > - *retlen += ret; > + if (is_ofst_odd == 1) { > + memcpy(buf, (buf + 1), (len - 1)); > + *retlen += (ret - 1); > + } else { > + *retlen += ret; > + } > buf += ret; > from += ret; > len -= ret; > @@ -1223,12 +1404,41 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, > struct spi_nor *nor = mtd_to_spi_nor(mtd); > size_t page_offset, page_remain, i; > ssize_t ret; > + ssize_t written; > + loff_t addr; > + u8 bank = 0; > + u32 offset, stack_shift = 0; > + u32 rem_bank_len = 0; > > dev_dbg(nor->dev, "to 0x%08x, len %zd\n", (u32)to, len); > > + /* > + * Cannot write to odd offset in parallel mode, > + * so write 2 bytes first > + */ > + if ((nor->isparallel) && (to & 1)) { > + > + u8 two[2] = {0xff, buf[0]}; > + size_t local_retlen; > + > + ret = spi_nor_write(mtd, to & ~1, 2, &local_retlen, two); > + if (ret < 0) > + return ret; > + > + *retlen += 1; /* We've written only one actual byte */ > + ++buf; > + --len; > + ++to; > + } > + > for (i = 0; i < len; ) { > - ssize_t written; > - loff_t addr = to + i; > + addr = to + i; > + > + if (nor->addr_width == 3) { > + bank = (u32)to / (OFFSET_16_MB << nor->shift); > + rem_bank_len = ((OFFSET_16_MB << nor->shift) * > + (bank + 1)) - to; > + } > > /* > * If page_size is a power of two, the offset can be quickly > @@ -1245,17 +1455,51 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, > > page_offset = do_div(aux, nor->page_size); > } > - /* the size of data remaining on the first page */ > - page_remain = min_t(size_t, > - nor->page_size - page_offset, len - i); > > + offset = (to + i); > + if (nor->isparallel) { > + offset /= 2; > + nor->spi->flags |= SPI_XFER_STRIPE; > + } > + > + if (nor->isstacked) { > + stack_shift = 1; > + if (offset >= (mtd->size / 2)) { > + offset = offset - (mtd->size / 2); > + nor->spi->flags |= SPI_MASTER_U_PAGE; > + } else { > + nor->spi->flags &= ~SPI_MASTER_U_PAGE; > + } > + } > + > + /* Die cross over issue is not handled */ > + if (nor->addr_width == 4) > + rem_bank_len = (mtd->size >> stack_shift) - offset; > + if (nor->addr_width == 3) { > #ifdef CONFIG_SPI_FLASH_BAR > - ret = write_bar(nor, addr); > - if (ret < 0) > - return ret; > + write_bar(nor, offset); > #endif > + } > + if (nor->isstacked) { > + if (len <= rem_bank_len) { > + page_remain = min_t(size_t, nor->page_size - > + page_offset, len - i); > + } else { > + /* size of data remaining on the first page */ > + page_remain = rem_bank_len; > + } > + } else { > + page_remain = min_t(size_t, nor->page_size - > + page_offset, len - i); > + } > + > + ret = spi_nor_wait_till_ready(nor); > + if (ret) > + goto write_err; > + > + > write_enable(nor); > - ret = nor->write(nor, addr, page_remain, buf + i); > + ret = nor->write(nor, offset, page_remain, buf + i); > if (ret < 0) > goto write_err; > written = ret; > @@ -1265,6 +1509,13 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, > goto write_err; > *retlen += written; > i += written; > + if (written != page_remain) { > + dev_err(nor->dev, > + "While writing %zu bytes written %zd bytes\n", > + page_remain, written); > + ret = -EIO; > + goto write_err; > + } > } > > write_err: > @@ -2094,6 +2345,12 @@ static int spi_nor_init_params(struct spi_nor *nor, > params->size = info->sector_size * info->n_sectors; > params->page_size = info->page_size; > > + if (nor->isparallel) > + params->page_size <<= nor->shift; > + > + if (nor->isparallel || nor->isstacked) > + params->size <<= nor->shift; > + > /* (Fast) Read settings. */ > params->hwcaps.mask |= SNOR_HWCAPS_READ; > spi_nor_set_read_settings(&params->reads[SNOR_CMD_READ], > @@ -2280,24 +2537,27 @@ static int spi_nor_select_erase(struct spi_nor *nor, > const struct flash_info *info) > { > struct mtd_info *mtd = &nor->mtd; > + bool shift = 0; > > /* Do nothing if already configured from SFDP. */ > if (mtd->erasesize) > return 0; > > + if (nor->isparallel) > + shift = 1; > #ifdef CONFIG_SPI_FLASH_USE_4K_SECTORS > /* prefer "small sector" erase if possible */ > if (info->flags & SECT_4K) { > nor->erase_opcode = SPINOR_OP_BE_4K; > - mtd->erasesize = 4096; > + mtd->erasesize = 4096 << shift; > } else if (info->flags & SECT_4K_PMC) { > nor->erase_opcode = SPINOR_OP_BE_4K_PMC; > - mtd->erasesize = 4096; > + mtd->erasesize = 4096 << shift; > } else > #endif > { > nor->erase_opcode = SPINOR_OP_SE; > - mtd->erasesize = info->sector_size; > + mtd->erasesize = info->sector_size << shift; > } > return 0; > } > @@ -2442,9 +2702,14 @@ int spi_nor_scan(struct spi_nor *nor) > hwcaps.mask |= SNOR_HWCAPS_READ_1_2_2; > } > > - info = spi_nor_read_id(nor); > + nor->isparallel = (spi->option == SF_DUAL_PARALLEL_FLASH) ? 1 : 0; > + nor->isstacked = (spi->option == SF_DUAL_STACKED_FLASH) ? 1 : 0; > + nor->shift = (nor->isparallel || nor->isstacked) ? 1 : 0; > + > + info = (struct flash_info *)spi_nor_read_id(nor); > if (IS_ERR_OR_NULL(info)) > return -ENOENT; > + > /* Parse the Serial Flash Discoverable Parameters table. */ > ret = spi_nor_init_params(nor, info, &params); > if (ret) > diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c > index 7788ab9953..2471132f41 100644 > --- a/drivers/spi/spi-mem.c > +++ b/drivers/spi/spi-mem.c > @@ -202,7 +202,7 @@ int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) > const u8 *tx_buf = NULL; > u8 *rx_buf = NULL; > int op_len; > - u32 flag; > + u32 flag = 0; > int ret; > int i; > > @@ -362,24 +362,35 @@ int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) > if (op->dummy.nbytes) > memset(op_buf + pos, 0xff, op->dummy.nbytes); > > + if (slave->flags & SPI_XFER_U_PAGE) > + flag |= SPI_XFER_U_PAGE; > + > + if (slave->flags & SPI_XFER_LOWER) > + flag |= SPI_XFER_LOWER; > + if (slave->flags & SPI_XFER_UPPER) > + flag |= SPI_XFER_UPPER; > + if (slave->flags & SPI_XFER_STRIPE) > + flag |= SPI_XFER_STRIPE; > + > /* 1st transfer: opcode + address + dummy cycles */ > - flag = SPI_XFER_BEGIN; > /* Make sure to set END bit if no tx or rx data messages follow */ > if (!tx_buf && !rx_buf) > flag |= SPI_XFER_END; > > - ret = spi_xfer(slave, op_len * 8, op_buf, NULL, flag); > + ret = spi_xfer(slave, op_len * 8, op_buf, NULL, flag | SPI_XFER_BEGIN); > if (ret) > return ret; > > /* 2nd transfer: rx or tx data path */ > if (tx_buf || rx_buf) { > ret = spi_xfer(slave, op->data.nbytes * 8, tx_buf, > - rx_buf, SPI_XFER_END); > + rx_buf, flag | SPI_XFER_END); > if (ret) > return ret; > } > > + slave->flags &= ~SPI_XFER_MASK; > + > spi_release_bus(slave); > > for (i = 0; i < pos; i++) > diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h > index f9964a7664..c7475e7a12 100644 > --- a/include/linux/mtd/spi-nor.h > +++ b/include/linux/mtd/spi-nor.h > @@ -309,11 +309,15 @@ struct spi_nor { > u8 bank_read_cmd; > u8 bank_write_cmd; > u8 bank_curr; > + u8 upage_prev; > #endif > enum spi_nor_protocol read_proto; > enum spi_nor_protocol write_proto; > enum spi_nor_protocol reg_proto; > bool sst_write_second; > + bool shift; > + bool isparallel; > + bool isstacked; > u32 flags; > u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE]; > > diff --git a/include/spi.h b/include/spi.h > index 6fbb4336ce..69f69e590c 100644 > --- a/include/spi.h > +++ b/include/spi.h > @@ -31,6 +31,12 @@ > #define SPI_RX_DUAL BIT(12) /* receive with 2 wires */ > #define SPI_RX_QUAD BIT(13) /* receive with 4 wires */ > > +/* SPI transfer flags */ > +#define SPI_XFER_STRIPE (1 << 6) > +#define SPI_XFER_MASK (3 << 8) > +#define SPI_XFER_LOWER (1 << 8) > +#define SPI_XFER_UPPER (2 << 8) > + > /* Header byte that marks the start of the message */ > #define SPI_PREAMBLE_END_BYTE 0xec > > @@ -108,13 +114,16 @@ struct spi_slave { > unsigned int max_read_size; > unsigned int max_write_size; > void *memory_map; > + u8 option; > > u8 flags; > + bool multi_die; /* flash with multiple dies*/ > #define SPI_XFER_BEGIN BIT(0) /* Assert CS before transfer */ > #define SPI_XFER_END BIT(1) /* Deassert CS after transfer */ > #define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) > #define SPI_XFER_MMAP BIT(2) /* Memory Mapped start */ > #define SPI_XFER_MMAP_END BIT(3) /* Memory Mapped End */ > +#define SPI_XFER_U_PAGE BIT(4) > }; > > /** > Jagan: any comment? M

4 4

[U-Boot] [PATCH] ARC: enable unit tests on development platforms
by Eugeniy Paltsev 04 Dec '19

04 Dec '19

Enable unit tests on HSDK and AXS103 development platforms to run it in verification flow. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- configs/axs103_defconfig | 2 ++ configs/hsdk_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index 8255d9fa068..73a224fa145 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -59,3 +59,5 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_USE_PRIVATE_LIBGCC=y +CONFIG_UNIT_TEST=y +CONFIG_UT_TIME=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index e28ceae289c..c0b45513afd 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -63,3 +63,5 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_PANIC_HANG=y +CONFIG_UNIT_TEST=y +CONFIG_UT_TIME=y -- 2.21.0

2 3

Re: [U-Boot] [PATCH v1 1/2] common: fdt_support: add support for setting usable memory
by Igor Opaniuk 04 Dec '19

04 Dec '19

Hi Stefano, On Mon, Oct 14, 2019 at 3:40 PM <sbabic(a)denx.de> wrote: > > > From: Igor Opaniuk <igor.opaniuk(a)toradex.com> > > Add support for setting linux,usable-memory property in the memory > > node of device tree for the kernel [1]. > > This property holds a base address and size, describing a > > limited region in which memory may be considered available for use by > > the kernel. Memory outside of this range is not available for use. > > [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt > > Signed-off-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> > > Signed-off-by: Sanchayan Maity <maitysanchayan(a)gmail.com> > > Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> > > Signed-off-by: Igor Opaniuk <igor.opaniuk(a)gmail.com> > > Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> > > Applied to u-boot-imx, master, thanks ! Unfortunately I can't find this commit neither in u-boot-imx/next neither in u-boot-imx/master. > > Best regards, > Stefano Babic > > -- > ===================================================================== > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de > ===================================================================== > -- Best regards - Freundliche Grüsse - Meilleures salutations Igor Opaniuk mailto: igor.opaniuk(a)gmail.com skype: igor.opanyuk +380 (93) 836 40 67 http://ua.linkedin.com/in/iopaniuk

2 2

[U-Boot] [PATCH v1] MAINTAINERS: Add info for bcm283x
by matthias.bgg＠kernel.org 04 Dec '19

04 Dec '19

From: Matthias Brugger <mbrugger(a)suse.com> The bcm283x has grown in files, which was not reflected in the MAINTAINERS file. Fix this by adding the missing entries. Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 332fd9d74c..8d588b7d64 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -150,7 +150,9 @@ N: meson ARM BROADCOM BCM283X M: Matthias Brugger <mbrugger(a)suse.com> S: Maintained +F: arch/arm/dts/bcm283* F: arch/arm/mach-bcm283x/ +F: board/raspberrypi/ F: drivers/gpio/bcm2835_gpio.c F: drivers/mmc/bcm2835_sdhci.c F: drivers/mmc/bcm2835_sdhost.c @@ -158,6 +160,7 @@ F: drivers/serial/serial_bcm283x_mu.c F: drivers/serial/serial_bcm283x_pl011.c F: drivers/video/bcm2835.c F: include/dm/platform_data/serial_bcm283x_mu.h +F: include/dt-bindings/pinctrl/bcm2835.h F: drivers/pinctrl/broadcom/ ARM BROADCOM BCMSTB -- 2.24.0

2 1

[U-Boot] [PATCH] tbs2910: Disable VxWorks image booting support
by Tom Rini 04 Dec '19

04 Dec '19

There are currently no known users of this functionality on this platform, disable it to prepare for additional VxWorks functionality that would cause this platform to fail to link. Cc: Soeren Moch <smoch(a)web.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/tbs2910_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index ffe043678cdf..22fa0e138441 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -21,6 +21,7 @@ CONFIG_SYS_PROMPT="Matrix U-Boot> " CONFIG_CMD_BOOTZ=y # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set # CONFIG_CMD_FDT is not set CONFIG_CMD_MEMTEST=y # CONFIG_CMD_FLASH is not set -- 2.17.1

2 2

[U-Boot] [PATCH 1/2] pci: Only link pci_rom.o in some cases
by Tom Rini 04 Dec '19

04 Dec '19

The content of pci_rom.c is only used in a few cases. Only build and link in these cases to avoid a global variable as gcc doesn't always discard those when they are unused. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- drivers/pci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 219473aa7924..da8b826d69c3 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -4,12 +4,12 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. ifneq ($(CONFIG_DM_PCI),) -obj-y += pci_rom.o +obj-$(CONFIG_DM_VIDEO) += pci_rom.o obj-$(CONFIG_PCI) += pci-uclass.o pci_auto.o obj-$(CONFIG_DM_PCI_COMPAT) += pci_compat.o obj-$(CONFIG_PCI_SANDBOX) += pci_sandbox.o obj-$(CONFIG_SANDBOX) += pci-emul-uclass.o -obj-$(CONFIG_X86) += pci_x86.o +obj-$(CONFIG_X86) += pci_x86.o pci_rom.o else obj-$(CONFIG_PCI) += pci.o pci_auto_old.o endif -- 2.17.1

1 3

[U-Boot] [PATCH 1/2] Convert CONFIG_PHY_CORTINA to Kconfig
by Tom Rini 04 Dec '19

04 Dec '19

This converts the following to Kconfig: CONFIG_PHY_CORTINA Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/T2080RDB_NAND_defconfig | 1 + configs/T2080RDB_SDCARD_defconfig | 1 + configs/T2080RDB_SECURE_BOOT_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 1 + configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080RDB_defconfig | 1 + configs/T4160RDB_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 1 + configs/T4240RDB_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/ls2081ardb_defconfig | 1 + configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_qspi_defconfig | 1 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/ls2080ardb.h | 1 - 20 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index 3d4e0eb397fb..a8fc78850eeb 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -62,6 +62,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_MII=y diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index 1a3a6a37334e..97043dcab60f 100644 --- a/configs/T2080RDB_SDCARD_defconfig +++ b/configs/T2080RDB_SDCARD_defconfig @@ -59,6 +59,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_MII=y diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig index 5c256f8261ec..65522f79391f 100644 --- a/configs/T2080RDB_SECURE_BOOT_defconfig +++ b/configs/T2080RDB_SECURE_BOOT_defconfig @@ -43,6 +43,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_MII=y diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index 01723c63d00e..380037ff017e 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -62,6 +62,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_MII=y diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig index d29c147ece15..838d12515dcb 100644 --- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig @@ -35,6 +35,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_MII=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 71a95599d11a..400c4c18101f 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -47,6 +47,7 @@ CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_FMAN_ENET=y CONFIG_MII=y diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig index 986539ad8454..b0a661bfa853 100644 --- a/configs/T4160RDB_defconfig +++ b/configs/T4160RDB_defconfig @@ -36,6 +36,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_CORTINA=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig index b5d306171044..15ecd01a6783 100644 --- a/configs/T4240RDB_SDCARD_defconfig +++ b/configs/T4240RDB_SDCARD_defconfig @@ -52,6 +52,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_CORTINA=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 0e926df4fad7..3b3f86a8b796 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -40,6 +40,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_PHY_CORTINA=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_FMAN_ENET=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index d231c235f023..bc42a542290e 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -42,6 +42,7 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index 484030495506..be06206fbe6d 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -45,6 +45,7 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 49bdd587ac84..bd5a953182c7 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -54,6 +54,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2081ardb_defconfig b/configs/ls2081ardb_defconfig index 01288a7be7f3..d8204f16db92 100644 --- a/configs/ls2081ardb_defconfig +++ b/configs/ls2081ardb_defconfig @@ -41,6 +41,7 @@ CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig index 8894df5d31b0..c6327e4bd510 100644 --- a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig @@ -37,6 +37,7 @@ CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig index d230000e1925..ae7700610305 100644 --- a/configs/ls2088ardb_qspi_defconfig +++ b/configs/ls2088ardb_qspi_defconfig @@ -43,6 +43,7 @@ CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig index db253d1ce957..c5339e50ba7e 100644 --- a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig @@ -52,6 +52,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig index 1730c9a5eab1..ed7ef439af63 100644 --- a/configs/ls2088ardb_tfa_defconfig +++ b/configs/ls2088ardb_tfa_defconfig @@ -59,6 +59,7 @@ CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y CONFIG_E1000=y CONFIG_MII=y CONFIG_PCI=y diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index b64bafdb330e..748a7a0afe0b 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -541,7 +541,6 @@ unsigned long get_board_ddr_clk(void); #endif /* CONFIG_NOBQFMAN */ #ifdef CONFIG_SYS_DPAA_FMAN -#define CONFIG_PHY_CORTINA #define CONFIG_PHY_REALTEK #define CONFIG_CORTINA_FW_LENGTH 0x40000 #define RGMII_PHY1_ADDR 0x01 /* RealTek RTL8211E */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index fc2aed335688..bbb4ca9b906b 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -548,7 +548,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_PHYLIB_10G #define CONFIG_PHY_VITESSE -#define CONFIG_PHY_CORTINA #define CONFIG_SYS_CORTINA_FW_IN_NOR #define CONFIG_CORTINA_FW_ADDR 0xefe00000 #define CONFIG_CORTINA_FW_LENGTH 0x40000 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index c5d57cfdd43b..02f6cd43d3b1 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -560,7 +560,6 @@ unsigned long get_board_sys_clk(void); /* MAC/PHY configuration */ #ifdef CONFIG_FSL_MC_ENET -#define CONFIG_PHY_CORTINA #define CONFIG_SYS_CORTINA_FW_IN_NOR #ifdef CONFIG_QSPI_BOOT #define CONFIG_CORTINA_FW_ADDR 0x20980000 -- 2.17.1

1 3