diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-29 15:58:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-29 15:58:38 -0400 |
commit | 50c9b0e1ddce280823484579c4ecc1f069e7833b (patch) | |
tree | 16908165e841adefa0e68693bf07a7fdb67084ab /configs/taurus_defconfig | |
parent | 04f005d552eb748582678a45119b55a99f75748e (diff) | |
parent | 28964227069d3f0ff3110b8064d547f6cd9fcfa6 (diff) |
Merge branch '2020-06-26-more-Kconfig-migration' into next
- Bring in the first pass at cleaning up config headers that reference
symbols that already have Kconfig symbols.
- In order to do that, bring in the small series that adds
CONFIG_SPL_DM_SPI_FLASH and makes more use of CONFIG_$(SPL_TPL_)DM_SPI
in order to allow for disabling those features in SPL stuff but using
them in full U-Boot
Diffstat (limited to 'configs/taurus_defconfig')
-rw-r--r-- | configs/taurus_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index d9a2d61ecb..229c97ead5 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_OFFSET=0x100000 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y @@ -66,11 +67,14 @@ CONFIG_BLK=y CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y +CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y +CONFIG_SPL_DM_SPI=y +CONFIG_SPL_DM_SPI_FLASH=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y |