projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: uniphier: merge two defconfig files
[oweals/u-boot.git]
/
configs
/
Lamobo_R1_defconfig
diff --git
a/configs/Lamobo_R1_defconfig
b/configs/Lamobo_R1_defconfig
index c98221f589faeee72c47f783cfe250039d18428d..d460c3270b6433ac55528005d23fcdfd65e71362 100644
(file)
--- a/
configs/Lamobo_R1_defconfig
+++ b/
configs/Lamobo_R1_defconfig
@@
-13,5
+13,4
@@
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,SATAPWR=SUN
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
CONFIG_ETH_DESIGNWARE=y
-CONFIG_SYS_NS16550=y
CONFIG_USB_EHCI_HCD=y