From bd328eb38274ffaf04caaa8a6ecc09b7e19a650e Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Tue, 12 May 2015 14:46:24 -0500 Subject: 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 Cc: Masahiro Yamada Acked-by: Stephen Warren Cc: Tom Rini --- configs/Bananapi_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'configs/Bananapi_defconfig') diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 8dcf4a71b5..904d27d825 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -1,11 +1,9 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi" -CONFIG_GMAC_TX_DELAY=3 CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_DRAM_ZQ=127 -CONFIG_DRAM_EMR1=4 +CONFIG_GMAC_TX_DELAY=3 +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" CONFIG_ETH_DESIGNWARE=y -- cgit v1.2.1