arm: socfpga: cyclone5_socdk: Consolidate SDMMC environment

[u-boot] / include / malloc.h

diff --git a/include/malloc.h b/include/malloc.h
index 5df634873f147f93fb444b9621abf07e1e6e21e1..f20e4d3d2a6b90a80a1f3957c93e14b121909bfe 100644 (file)
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -872,7 +872,7 @@ extern Void_t*     sbrk();
 
 #else
 
-#ifdef CONFIG_SYS_MALLOC_SIMPLE
+#if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
 #define malloc malloc_simple
 #define realloc realloc_simple
 #define memalign memalign_simple
@@ -906,6 +906,9 @@ void *realloc_simple(void *ptr, size_t size);
 
 #endif
 
+/* Set up pre-relocation malloc() ready for use */
+int initf_malloc(void);
+
 /* Public routines */
 
 /* Simple versions which can be used when space is tight */