summaryrefslogtreecommitdiffstats
path: root/pbl
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:48:43 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:48:43 +0100
commit1b575024f67f43a3b325c1d3f021ac482b6fad81 (patch)
treefb36c110a86fd4d7517e107048b6c337aef7760d /pbl
parentec2bfe6953c14a477eef546858ab139012c7c695 (diff)
parentab5418b570b24f5be1ac12c3804f6bf04ec48ad2 (diff)
downloadbarebox-1b575024f67f43a3b325c1d3f021ac482b6fad81.tar.gz
Merge branch 'for-next/at91'
Conflicts: arch/arm/boards/at91rm9200ek/init.c arch/arm/boards/pm9263/init.c arch/arm/configs/at91sam9n12ek_defconfig arch/arm/mach-at91/Kconfig
Diffstat (limited to 'pbl')
-rw-r--r--pbl/misc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pbl/misc.c b/pbl/misc.c
index a2cb44d..9065bf0 100644
--- a/pbl/misc.c
+++ b/pbl/misc.c
@@ -14,6 +14,8 @@ void __noreturn panic(const char *fmt, ...)
while(1);
}
-void start_barebox(void)
+void __noreturn start_barebox(void)
{
+ /* Should never be here in the pbl */
+ hang();
}