summaryrefslogtreecommitdiff
path: root/configs/Mele_A1000_defconfig
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-05-12 14:46:24 -0500
committerTom Rini <trini@konsulko.com>2015-05-12 18:10:26 -0400
commitbd328eb38274ffaf04caaa8a6ecc09b7e19a650e (patch)
tree4326731b4b7fa3187bba919e10bbd2187c5c8781 /configs/Mele_A1000_defconfig
parenta26cd04920dc069fd6e91abb785426cf6c29f45f (diff)
downloadu-boot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.tar.gz
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_A1000_defconfig')
-rw-r--r--configs/Mele_A1000_defconfig11
1 files changed, 4 insertions, 7 deletions
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 32b20a78f0..6678e4c480 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"