diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-07 21:12:07 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-07 21:29:37 +0300 |
| commit | ea92f95d630cba9c3a324d250258ad2e35d9c997 (patch) | |
| tree | 68ad93bb452ccf3873a9b457a8cca9ea7e3c1916 /configs/sam9x60ek_mmc_defconfig | |
| parent | cb9843bda3e500eb4add1927be4ed72077a69774 (diff) | |
| parent | c45568cc4e51b7bbe2f3ce28d8f2566048aeebf3 (diff) | |
| download | u-boot-ea92f95d630cba9c3a324d250258ad2e35d9c997.tar.xz | |
Merge branch '2022-07-07-Kconfig-migrations-dead-code-removal' into next
- Migrate more CONFIG options to Kconfig and remove some unused code
while we're at it.
Diffstat (limited to 'configs/sam9x60ek_mmc_defconfig')
| -rw-r--r-- | configs/sam9x60ek_mmc_defconfig | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig index 718db00a11..c50aa6b5c5 100644 --- a/configs/sam9x60ek_mmc_defconfig +++ b/configs/sam9x60ek_mmc_defconfig @@ -37,9 +37,9 @@ CONFIG_CMD_DM=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_SF_TEST=y CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y @@ -68,12 +68,17 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ATMEL=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y -CONFIG_SF_DEFAULT_MODE=0x0 -CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_NAND_ATMEL=y CONFIG_ATMEL_NAND_HW_PMECC=y CONFIG_PMECC_CAP=8 CONFIG_SYS_NAND_ONFI_DETECTION=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SF_DEFAULT_SPEED=50000000 +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_MTD=y CONFIG_PHY_MICREL=y CONFIG_DM_ETH=y CONFIG_MACB=y @@ -82,6 +87,9 @@ CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_ATMEL_QSPI=y CONFIG_SYSRESET=y CONFIG_SYSRESET_AT91=y CONFIG_TIMER=y @@ -91,13 +99,3 @@ CONFIG_W1_GPIO=y CONFIG_W1_EEPROM=y CONFIG_W1_EEPROM_DS24XXX=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_SPI=y -CONFIG_DM_SPI=y -CONFIG_SPI_FLASH=y -CONFIG_DM_SPI_FLASH=y -CONFIG_ATMEL_QSPI=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_SST=y -CONFIG_SPI_FLASH_MTD=y |