summaryrefslogtreecommitdiff
path: root/configs/i12-tvbox_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/i12-tvbox_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/i12-tvbox_defconfig')
-rw-r--r--configs/i12-tvbox_defconfig8
1 files changed, 3 insertions, 5 deletions
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index e579fdeb75..c8ccf45ea6 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -1,10 +1,8 @@
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
-CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384
-CONFIG_DRAM_ZQ=127
-CONFIG_DRAM_EMR1=4
+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
CONFIG_ETH_DESIGNWARE=y