]> git.sur5r.net Git - u-boot/commitdiff
Make export interface support CONFIG_SYS_MALLOC_SIMPLE
authorSimon Glass <sjg@chromium.org>
Tue, 3 Mar 2015 15:03:01 +0000 (08:03 -0700)
committerTom Rini <trini@konsulko.com>
Wed, 4 Mar 2015 19:55:04 +0000 (14:55 -0500)
When CONFIG_SYS_MALLOC_SIMPLE is defined, free() is a static inline. Make
sure that the export interface still builds in this case.

Signed-off-by: Simon Glass <sjg@chromium.org>
include/_exports.h
include/exports.h

index 594470328ea8a7aca5b83e359457410806eaf2c3..279017e87f6fd0a2d568af05345000ddd7045d7f 100644 (file)
@@ -23,7 +23,9 @@
        EXPORT_FUNC(dummy, void, free_hdlr, void)
 #endif
        EXPORT_FUNC(malloc, void *, malloc, size_t)
+#ifndef CONFIG_SYS_MALLOC_SIMPLE
        EXPORT_FUNC(free, void, free, void *)
+#endif
        EXPORT_FUNC(udelay, void, udelay, unsigned long)
        EXPORT_FUNC(get_timer, unsigned long, get_timer, unsigned long)
        EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list)
index 205affe72d701d087107b21a818daf974422d8f8..1a01e430bbc60cac93c7dd6e4ca05a22364bff86 100644 (file)
@@ -15,7 +15,9 @@ int printf(const char* fmt, ...);
 void install_hdlr(int, interrupt_handler_t, void*);
 void free_hdlr(int);
 void *malloc(size_t);
+#ifndef CONFIG_SYS_MALLOC_SIMPLE
 void free(void*);
+#endif
 void __udelay(unsigned long);
 unsigned long get_timer(unsigned long);
 int vprintf(const char *, va_list);