diff -Naur a/common/autoboot.c b/common/autoboot.c
--- a/common/autoboot.c	2016-09-19 16:45:12.000000000 +0200
+++ b/common/autoboot.c	2016-10-31 15:41:54.765522749 +0100
@@ -216,16 +216,17 @@
 #ifdef CONFIG_MENUPROMPT
 	printf(CONFIG_MENUPROMPT);
 #else
-	printf("Hit any key to stop autoboot: %2d ", bootdelay);
+	printf("Hit ENTER key to stop autoboot: %2d ", bootdelay);
 #endif
 
 	/*
 	 * Check if key already pressed
 	 */
 	if (tstc()) {	/* we got a key press	*/
-		(void) getc();  /* consume input	*/
+		int in = getc();  /* consume input	*/
 		puts("\b\b\b 0");
-		abort = 1;	/* don't auto boot	*/
+		if (in == 13)
+        		abort = 1;	/* don't auto boot	*/
 	}
 
 	while ((bootdelay > 0) && (!abort)) {
@@ -234,12 +235,14 @@
 		ts = get_timer(0);
 		do {
 			if (tstc()) {	/* we got a key press	*/
-				abort  = 1;	/* don't auto boot	*/
-				bootdelay = 0;	/* no more delay	*/
+				int in = getc(); /* consume input       */
+				if ( in == 13) {
+        				abort  = 1;	/* don't auto boot	*/
+	        			bootdelay = 0;	/* no more delay	*/
+				}
+				
 # ifdef CONFIG_MENUKEY
-				menukey = getc();
-# else
-				(void) getc();  /* consume input	*/
+				menukey = in;
 # endif
 				break;
 			}
