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/Mele_M9_defconfig | |
| parent | a26cd04920dc069fd6e91abb785426cf6c29f45f (diff) | |
| download | talos-obmc-uboot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.tar.gz talos-obmc-uboot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.zip | |
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/Mele_M9_defconfig')
| -rw-r--r-- | configs/Mele_M9_defconfig | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index ea35024c1b..47081339ca 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -1,21 +1,14 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" -CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y -CONFIG_DRAM_CLK=312 CONFIG_DRAM_ZQ=120 -# The Mele M9 uses 3.3V for general IO +CONFIG_USB1_VBUS_PIN="PC27" +CONFIG_USB2_VBUS_PIN="" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" +CONFIG_ETH_DESIGNWARE=y CONFIG_AXP221_DCDC1_VOLT=3300 -# Ethernet phy power CONFIG_AXP221_DLDO1_VOLT=3300 -# USB hub power CONFIG_AXP221_DLDO4_VOLT=3300 -# Wifi power CONFIG_AXP221_ALDO1_VOLT=3300 -# Vbus gpio for usb1 -CONFIG_USB1_VBUS_PIN="PC27" -# No Vbus gpio for usb2 -CONFIG_USB2_VBUS_PIN="" -CONFIG_ETH_DESIGNWARE=y |
