projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git]
/
configs
/
at91sam9260ek_nandflash_defconfig
diff --git
a/configs/at91sam9260ek_nandflash_defconfig
b/configs/at91sam9260ek_nandflash_defconfig
index
e82ee5b
..
27d4a4a
100644
(file)
--- a/
configs/at91sam9260ek_nandflash_defconfig
+++ b/
configs/at91sam9260ek_nandflash_defconfig
@@
-50,7
+50,6
@@
CONFIG_MACB=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y
-CONFIG_DEBUG_UART_ATMEL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y