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/Mele_A1000_defconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'configs/Mele_A1000_defconfig') diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index 32b20a7..6678e4c 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -1,10 +1,7 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" -CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000" -CONFIG_VIDEO_VGA=y CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y -CONFIG_DRAM_CLK=360 -CONFIG_DRAM_ZQ=123 -CONFIG_DRAM_EMR1=0 +CONFIG_VIDEO_VGA=y +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" -- cgit v1.1