ARM: uniphier: merge two defconfig files

[oweals/u-boot.git] / configs / Bananapro_defconfig

diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 08fca2f174b22afd5de55dccf962434b259964e2..4f4a07be56a7dd048d86cb18d07cf05669d0aaa5 100644 (file)
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -16,5 +16,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
 CONFIG_CMD_GPIO=y
 CONFIG_NETCONSOLE=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_SYS_NS16550=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_AXP_ALDO4_VOLT=2500