summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:41 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:41 +0200
commitd2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (patch)
tree662664ac398af8749af7f3c69bb298394a0fc057 /common
parente9299c644a17b7ae6a91d3a4b6ccdd9acba443fe (diff)
parent8fc0a99f32ea083b2e0eee217c813cf36aa8c521 (diff)
downloadbarebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.gz
barebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.xz
Merge branch 'for-next/misc' into master
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig1
-rw-r--r--common/kallsyms.c4
-rw-r--r--common/misc.c3
-rw-r--r--common/startup.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 1a5bb53182..8c9fe8e788 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1292,7 +1292,6 @@ config DEBUG_IMX_UART_PORT
DEBUG_IMX51_UART || \
DEBUG_IMX53_UART || \
DEBUG_IMX6Q_UART || \
- DEBUG_IMX6SL_UART || \
DEBUG_IMX7D_UART || \
DEBUG_IMX8M_UART || \
DEBUG_VF610_UART
diff --git a/common/kallsyms.c b/common/kallsyms.c
index 2c16ab2884..f641903147 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -15,8 +15,8 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
static inline int is_kernel_text(unsigned long addr)
{
- if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
- return 1;
+ if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
+ return 1;
return 0;
}
diff --git a/common/misc.c b/common/misc.c
index cbee3b6e3e..323500dfa8 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -22,6 +22,7 @@
#include <led.h>
#include <of.h>
#include <restart.h>
+#include <linux/stringify.h>
int errno;
EXPORT_SYMBOL(errno);
@@ -29,7 +30,7 @@ EXPORT_SYMBOL(errno);
const char *strerror(int errnum)
{
- static char errno_string[10];
+ static char errno_string[sizeof("error -2147483648")];
#ifdef CONFIG_ERRNO_MESSAGES
char *str;
diff --git a/common/startup.c b/common/startup.c
index 848c0806e6..d9d79aef89 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -436,6 +436,8 @@ void shutdown_barebox(void)
pr_debug("exitcall-> %pS\n", *exitcall);
(*exitcall)();
}
+
+ console_flush();
}
BAREBOX_MAGICVAR(global.autoboot,