diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
| commit | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (patch) | |
| tree | 92db8fda09396081f58a0c5fb182e72fbc3fdd50 /configs/mt7629_rfb_defconfig | |
| parent | 9a06eb800c1bdc68aa81fcad6d4f404e12dfff33 (diff) | |
| parent | bf88d2b023063a0c46d7617a4f6897d5d561662d (diff) | |
| download | u-boot-0de815356474912ef5bef9a69f0327a5a93bb2c2.tar.gz | |
Merge branch '2019-07-17-master-imports'
- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
Diffstat (limited to 'configs/mt7629_rfb_defconfig')
| -rw-r--r-- | configs/mt7629_rfb_defconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index 0dceafdaa6..d6a7c84df3 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_ARCH_TIMER=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MEDIATEK=y CONFIG_SYS_TEXT_BASE=0x41e00000 @@ -67,9 +68,6 @@ CONFIG_MTK_QSPI=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_WATCHDOG=y -CONFIG_TIMER=y -CONFIG_SPL_TIMER=y -CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y CONFIG_LZMA=y # CONFIG_EFI_LOADER is not set |