diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-04-10 14:22:23 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-04-10 14:22:23 +0200 |
commit | b491d9757d14415edcb1468ed896a704d0f0cfe7 (patch) | |
tree | 477707170048989accc9ea69cd6ac5edae7b1aec /configs/mx6dlsabreauto_defconfig | |
parent | 79d75d752717fb4106ec49abaddbd7744c775a35 (diff) | |
parent | 385a08a60f042061b004642d6b9bb6cfb794ad5a (diff) | |
download | u-boot-imx-b491d9757d14415edcb1468ed896a704d0f0cfe7.zip u-boot-imx-b491d9757d14415edcb1468ed896a704d0f0cfe7.tar.gz u-boot-imx-b491d9757d14415edcb1468ed896a704d0f0cfe7.tar.bz2 |
Merge branch 'u-boot/master'
Diffstat (limited to 'configs/mx6dlsabreauto_defconfig')
-rw-r--r-- | configs/mx6dlsabreauto_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 47f3f87..8bc5e8b 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -1,7 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y -CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=y |