summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-12-10 05:41:34 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-12-10 05:41:34 +0100
commit77d783a5170896aea021ec180e16751a0a249627 (patch)
treef61e969576c736cdd4d06f89bf8b8dae22093298 /common
parent293e981e7452511a876431aa076c0eb256623124 (diff)
parentaf86e3a0548e16dc9cef13debd3d64d9091ba473 (diff)
downloadbarebox-77d783a5170896aea021ec180e16751a0a249627.tar.gz
Merge branch 'for-next/randfixes'
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig2
-rw-r--r--common/console_simple.c11
-rw-r--r--common/ratp/Kconfig1
3 files changed, 2 insertions, 12 deletions
diff --git a/common/Kconfig b/common/Kconfig
index d397d8b..60237d3 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1309,7 +1309,7 @@ config DEBUG_INITCALLS
config PBL_BREAK
bool "Execute software break on pbl start"
- depends on ARM
+ depends on ARM && (!CPU_32v4T && !ARCH_TEGRA)
help
If this enabled, barebox will be compiled with BKPT instruction
on early pbl init. This option should be used only with JTAG debugger!
diff --git a/common/console_simple.c b/common/console_simple.c
index 6d293b2..4222484 100644
--- a/common/console_simple.c
+++ b/common/console_simple.c
@@ -64,9 +64,6 @@ void console_flush(void)
}
EXPORT_SYMBOL(console_flush);
-void ctrlc_handled(void)
-{
-}
/* test if ctrl-c was pressed */
int ctrlc (void)
{
@@ -81,14 +78,6 @@ int ctrlc (void)
}
EXPORT_SYMBOL(ctrlc);
-void console_ctrlc_allow(void)
-{
-}
-
-void console_ctrlc_forbid(void)
-{
-}
-
int console_register(struct console_device *newcdev)
{
if (console)
diff --git a/common/ratp/Kconfig b/common/ratp/Kconfig
index 30462c6..25150ad 100644
--- a/common/ratp/Kconfig
+++ b/common/ratp/Kconfig
@@ -6,6 +6,7 @@ config CONSOLE_RATP
select POLLER
select CMDLINE_EDITING
depends on CONSOLE_FULL
+ depends on !SHELL_NONE
prompt "RATP console support"
help
This option adds support for remote controlling barebox via serial