summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-19 19:42:55 +0900
committerTom Rini <trini@konsulko.com>2015-03-28 09:03:09 -0400
commit326a682358c16afcf2c7a9617e9811e72a1f0929 (patch)
treeace15e23b53dad25225f15f46b5bb3ab4561b30b /board
parent91405b7fa9a7e53f238d55a17730933f43871fc1 (diff)
downloadtalos-obmc-uboot-326a682358c16afcf2c7a9617e9811e72a1f0929.tar.gz
talos-obmc-uboot-326a682358c16afcf2c7a9617e9811e72a1f0929.zip
malloc_f: enable SYS_MALLOC_F by default if DM is on
This option has a bool type, not hex. Fix it and enable it if CONFIG_DM is on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation. CONFIG_SYS_MALLOC_F should be enabled to use malloc memory before relocation. As it is board-independent, handle it globally. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Robert Baldyga <r.baldyga@samsung.com>
Diffstat (limited to 'board')
-rw-r--r--board/amcc/canyonlands/Kconfig4
-rw-r--r--board/ti/am335x/Kconfig3
2 files changed, 0 insertions, 7 deletions
diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
index c0dbd1829b..46efa7a79f 100644
--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
@@ -39,8 +39,4 @@ config DM
config DM_SERIAL
default y
-config SYS_MALLOC_F
- bool
- default y
-
endif
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index 8c45892cfa..7cb006f99c 100644
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -47,7 +47,4 @@ config DM_GPIO
config DM_SERIAL
default y if DM
-config SYS_MALLOC_F
- default y if DM
-
endif
OpenPOWER on IntegriCloud