summaryrefslogtreecommitdiff
path: root/configs/mx6slevk_defconfig
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-05-12 19:46:24 (GMT)
committerTom Rini <trini@konsulko.com>2015-05-12 22:10:26 (GMT)
commitbd328eb38274ffaf04caaa8a6ecc09b7e19a650e (patch)
tree4326731b4b7fa3187bba919e10bbd2187c5c8781 /configs/mx6slevk_defconfig
parenta26cd04920dc069fd6e91abb785426cf6c29f45f (diff)
downloadu-boot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.tar.xz
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/mx6slevk_defconfig')
-rw-r--r--configs/mx6slevk_defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index c6b3108..ed9f836 100644
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -1,7 +1,5 @@
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
CONFIG_ARM=y
CONFIG_TARGET_MX6SLEVK=y
-CONFIG_SYS_MALLOC_F=y
-CONFIG_SYS_MALLOC_F_LEN=0x400
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
CONFIG_DM=y
CONFIG_DM_THERMAL=y