Merge branch 'mpc86xx'

[u-boot] / board / kup / common / kup.c

diff --git a/board/kup/common/kup.c b/board/kup/common/kup.c
index 69ffa2c2c09291c3d4968ef25ace923ff01ea699..d018e3cc5d73935dc6195f7640566cee53519b2f 100644 (file)
--- a/board/kup/common/kup.c
+++ b/board/kup/common/kup.c
@@ -70,3 +70,14 @@ void poweron_key (void)
        else
                setenv ("key1", "on");
 }
+
+#ifdef CONFIG_POST
+/*
+ * Returns 1 if keys pressed to start the power-on long-running tests
+ * Called from board_init_f().
+ */
+int post_hotkeys_pressed (void)
+{
+       return (0);
+}
+#endif