diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-16 10:29:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-16 10:29:40 -0400 |
| commit | 6674edaabfd271471608146806f5b6540bc76a1b (patch) | |
| tree | 574f8b5265002ad046aa1b81725a9483feb48a8d /configs/malta64_defconfig | |
| parent | 4f8bf67f9c7fec8c5c1ae57c6ba24d337a19c578 (diff) | |
| parent | bb92678ced0b1594b93ab2f10b2c17750c789c96 (diff) | |
| download | u-boot-6674edaabfd271471608146806f5b6540bc76a1b.tar.gz u-boot-6674edaabfd271471608146806f5b6540bc76a1b.tar.bz2 u-boot-6674edaabfd271471608146806f5b6540bc76a1b.zip | |
Merge tag 'v2021.10-rc4' into next
Prepare v2021.10-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
# gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# board/Arcturus/ucp1020/spl.c
# cmd/mvebu/Kconfig
# common/Kconfig.boot
# common/image-fit.c
# configs/UCP1020_defconfig
# configs/sifive_unmatched_defconfig
# drivers/pci/Kconfig
# include/configs/UCP1020.h
# include/configs/sifive-unmatched.h
# lib/Makefile
# scripts/config_whitelist.txt
Diffstat (limited to 'configs/malta64_defconfig')
| -rw-r--r-- | configs/malta64_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index 6888dbd55d..a6fe5c1bca 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -30,6 +30,5 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_PCNET=y -CONFIG_PCI=y CONFIG_RTC_MC146818=y CONFIG_SYS_NS16550=y |