summaryrefslogtreecommitdiff
path: root/src/commonlib
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-05-16 16:22:18 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-05-23 08:42:57 +0000
commit2b6da7f326bf84a8eab3684edf5e5814e9c23385 (patch)
treebbc2b1cfae10c39906a917e12123ca3c8db14874 /src/commonlib
parente8e92d60c4e2a17542a98bdfb3a533060d26a281 (diff)
commonlib/stdlib.h: Remove printf() from coreboot
coreboot should not have a definition of printf() anywhere -- it's too easy to accidentally sneak it into code otherwise. Where that is needed in code shared with userspace utilities, we should instead use printk() and define a shim for that for the userspace side. Change-Id: Iaa459df7122c88beb56695eee7c252d90bbde861 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32857 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/commonlib')
-rw-r--r--src/commonlib/include/commonlib/stdlib.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/commonlib/include/commonlib/stdlib.h b/src/commonlib/include/commonlib/stdlib.h
index 1a05eebd55..4a3671c7ab 100644
--- a/src/commonlib/include/commonlib/stdlib.h
+++ b/src/commonlib/include/commonlib/stdlib.h
@@ -38,11 +38,11 @@
#if CONFIG(COREBOOT_BUILD)
#include <console/console.h>
#include <halt.h>
-#define printf(...) printk(BIOS_ERR, __VA_ARGS__)
#define HALT(x) halt()
#else
#include <stdio.h>
-#define HALT(x)
+#define printk(level, ...) printf(__VA_ARGS__)
+#define HALT(x) abort()
#endif
static inline void *xmalloc_work(size_t size, const char *file,
@@ -50,7 +50,7 @@ static inline void *xmalloc_work(size_t size, const char *file,
{
void *ret = malloc(size);
if (!ret && size) {
- printf("%s/%s/line %d: Failed to malloc %zu bytes\n",
+ printk(BIOS_ERR, "%s/%s/line %d: Failed to malloc %zu bytes\n",
file, func, line, size);
while (1)
HALT(1);