diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-29 21:50:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-29 21:50:06 +0300 |
| commit | 79382e97663c82dabe28e69ff0aa2d2f12131792 (patch) | |
| tree | 486a33a76338e968e18cef06f626f1c7b45aba9a /configs | |
| parent | 07394fb05e4d48fee360ef38c96b3ef0576b7352 (diff) | |
| parent | 7fd892b21530a60753c48db22f64e3415216faf6 (diff) | |
| download | u-boot-79382e97663c82dabe28e69ff0aa2d2f12131792.tar.xz | |
Merge branch '2021-01-29-assorted-fixes'
- Assorted test fixes
- Assorted minor FAT fixes
- Assorted Kconfig dependency fixes
- MediaTek, vexpress_aemv8a improvements
- Other assorted minor fixes
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mt7622_rfb_defconfig | 3 | ||||
| -rw-r--r-- | configs/mt7629_rfb_defconfig | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig index ccf926e104..347f5f6b12 100644 --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig @@ -49,7 +49,8 @@ CONFIG_DM_SERIAL=y CONFIG_MTK_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y -CONFIG_MTK_SNFI_SPI=y +# CONFIG_MTK_SNFI_SPI is not set +CONFIG_MTK_SNOR=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_TIMER=y CONFIG_MTK_TIMER=y diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index d9032d4493..3691223510 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -75,7 +75,8 @@ CONFIG_DM_SERIAL=y CONFIG_MTK_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y -CONFIG_MTK_SNFI_SPI=y +# CONFIG_MTK_SNFI_SPI is not set +CONFIG_MTK_SNOR=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_WATCHDOG=y |