diff options
author | Joe Hershberger <joe.hershberger@ni.com> | 2015-05-12 14:46:24 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-12 18:10:26 -0400 |
commit | bd328eb38274ffaf04caaa8a6ecc09b7e19a650e (patch) | |
tree | 4326731b4b7fa3187bba919e10bbd2187c5c8781 /configs/Colombus_defconfig | |
parent | a26cd04920dc069fd6e91abb785426cf6c29f45f (diff) |
Clean all defconfigs with savedefconfig
In order to reduce merge conflicts and to maintain the simplest possible
defconfig files, we should be using the savedefconfig feature of Kconfig
every time a new feature is added. This keeps the defconfig settings to
a minimum (only those things not default) and keeps them in the same
order as the Kconfig options.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/Colombus_defconfig')
-rw-r--r-- | configs/Colombus_defconfig | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index c7efabc9b6..e6bed2d432 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -1,13 +1,11 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" -CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_CLK=240 CONFIG_DRAM_ZQ=251 -# Wifi power -CONFIG_AXP221_ALDO1_VOLT=3300 -# No Vbus gpio for usb1 CONFIG_USB1_VBUS_PIN="" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_ETH_DESIGNWARE=y +CONFIG_AXP221_ALDO1_VOLT=3300 |