4 files changed, 59 insertions, 53 deletions
diff --git a/src/commonlib/bsd/include/commonlib/bsd/stdlib.h b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h
new file mode 100644
index 0000000000..c497b5c7fd
--- /dev/null
+++ b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+#ifndef __COMMONLIB_STDLIB_H__
+#define __COMMONLIB_STDLIB_H__
+
+#include <stddef.h>
+#include <string.h>
+
+#ifdef __COREBOOT__
+#include <console/console.h>
+#else
+#include <stdio.h>
+#define printk(level, ...) printf(__VA_ARGS__)
+#endif
+
+void __noreturn abort(void);
+void free(void *ptr);
+void *malloc(size_t size);
+void *calloc(size_t nitems, size_t size);
+void *memalign(size_t align, size_t size);
+int dma_coherent(const void *ptr);
+
+static inline void *xmalloc_work(size_t size, const char *file, const char *func, int line)
+{
+	void *ret = malloc(size);
+	if (!ret && size) {
+		printk(BIOS_ERR, "%s:%d %s(): Failed to malloc %zu bytes\n",
+			file, line, func, size);
+		abort();
+	}
+	return ret;
+}
+#define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __LINE__)
+
+static inline void *xzalloc_work(size_t size, const char *file, const char *func, int line)
+{
+	void *ret = xmalloc_work(size, file, func, line);
+	memset(ret, 0, size);
+	return ret;
+}
+#define xzalloc(size) xzalloc_work((size), __FILE__, __func__, __LINE__)
+
+static inline void *xmemalign_work(size_t align, size_t size, const char *file,
+				  const char *func, int line)
+{
+	void *ret = memalign(align, size);
+	if (!ret && size) {
+		printk(BIOS_ERR, "%s:%d %s(): "
+				"Failed to memalign %zu bytes with %zu alignment.\n",
+			file, line, func, size, align);
+		abort();
+	}
+	return ret;
+}
+#define xmemalign(align, size) xmemalign_work((align), (size), __FILE__, __func__, __LINE__)
+
+#endif /* __COMMONLIB_STDLIB_H__ */
diff --git a/src/commonlib/include/commonlib/stdlib.h b/src/commonlib/include/commonlib/stdlib.h
deleted file mode 100644
index 374fe16dd9..0000000000
--- a/src/commonlib/include/commonlib/stdlib.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-
-#ifndef __COMMONLIB_STDLIB_H__
-#define __COMMONLIB_STDLIB_H__
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if CONFIG(COREBOOT_BUILD)
-#include <console/console.h>
-#include <halt.h>
-#define HALT(x)			halt()
-#else
-#include <stdio.h>
-#define printk(level, ...)	printf(__VA_ARGS__)
-#define HALT(x)			abort()
-#endif
-
-static inline void *xmalloc_work(size_t size, const char *file,
-				 const char *func, int line)
-{
-	void *ret = malloc(size);
-	if (!ret && size) {
-		printk(BIOS_ERR, "%s/%s/line %d: Failed to malloc %zu bytes\n",
-			file, func, line, size);
-		while (1)
-			HALT(1);
-	}
-	return ret;
-}
-#define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __LINE__)
-
-static inline void *xzalloc_work(size_t size, const char *file,
-				 const char *func, int line)
-{
-	void *ret = xmalloc_work(size, file, func, line);
-	memset(ret, 0, size);
-	return ret;
-}
-#define xzalloc(size) xzalloc_work((size), __FILE__, __func__, __LINE__)
-
-void *dma_malloc(size_t size);
-int dma_coherent(void *ptr);
-
-#endif /* __COMMONLIB_STDLIB_H__ */
diff --git a/src/commonlib/storage/bouncebuf.c b/src/commonlib/storage/bouncebuf.c
index 9edf41aed8..a0a379e1cd 100644
--- a/src/commonlib/storage/bouncebuf.c
+++ b/src/commonlib/storage/bouncebuf.c
@@ -7,7 +7,7 @@
 #include "bouncebuf.h"
 #include "storage.h"
 #include <string.h>
-#include <commonlib/stdlib.h>
+#include <commonlib/bsd/stdlib.h>
 
 static int addr_aligned(struct bounce_buffer *state)
 {
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index 410d4fcc85..fbc6c985a5 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -6,7 +6,7 @@
 #include "bouncebuf.h"
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/sdhci.h>
-#include <commonlib/stdlib.h>
+#include <commonlib/bsd/stdlib.h>
 #include <commonlib/storage.h>
 #include <delay.h>
 #include <endian.h>
@@ -21,11 +21,6 @@
 			|| (CONFIG(SDHCI_ADMA_IN_ROMSTAGE) && ENV_SEPARATE_ROMSTAGE) \
 			|| ENV_POSTCAR || ENV_RAMSTAGE)
 
-__weak void *dma_malloc(size_t length_in_bytes)
-{
-	return malloc(length_in_bytes);
-}
-
 void sdhci_reset(struct sdhci_ctrlr *sdhci_ctrlr, u8 mask)
 {
 	struct stopwatch sw;