Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 1a2ef39..2116a9e 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -47,12 +47,6 @@ void main_loop(void)
 
        bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
 
-#ifndef CONFIG_SYS_GENERIC_BOARD
-       puts("Warning: Your board does not use generic board. Please read\n");
-       puts("doc/README.generic-board and take action. Boards not\n");
-       puts("upgraded by the late 2014 may break or be removed.\n");
-#endif
-
 #ifdef CONFIG_VERSION_VARIABLE
        setenv("ver", version_string);  /* set version variable */
 #endif /* CONFIG_VERSION_VARIABLE */
@@ -72,4 +66,5 @@ void main_loop(void)
        autoboot_command(s);
 
        cli_loop();
+       panic("No CLI available");
 }