projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
configs
/
Colombus_defconfig
diff --git
a/configs/Colombus_defconfig
b/configs/Colombus_defconfig
index e95deb16a06d35a996e1877ce822fa84e8024751..feaeb9855ee1eca597ebe9fa83780be32cfc3e74 100644
(file)
--- a/
configs/Colombus_defconfig
+++ b/
configs/Colombus_defconfig
@@
-24,5
+24,4
@@
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
CONFIG_CMD_GPIO=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO1_VOLT=3300
-CONFIG_SYS_NS16550=y
CONFIG_USB_EHCI_HCD=y