[U-Boot] [PATCH 2/4] common: make abortboot available for pxecfg use
Jason Hobbs
jason.hobbs at calxeda.com
Mon Jun 6 20:56:37 CEST 2011
From: Rob Herring <rob.herring at calxeda.com>
Signed-off-by: Jason Hobbs <jason.hobbs at calxeda.com>
---
common/main.c | 7 +++++++
include/common.h | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/common/main.c b/common/main.c
index 7da6604..4185bfd 100644
--- a/common/main.c
+++ b/common/main.c
@@ -263,6 +263,13 @@ static __inline__ int abortboot(int bootdelay)
# endif /* CONFIG_AUTOBOOT_KEYED */
#endif /* CONFIG_BOOTDELAY >= 0 */
+int _abortboot(int bootdelay)
+{
+#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
+ return abortboot(bootdelay);
+#endif
+}
+
/****************************************************************************/
void main_loop (void)
diff --git a/include/common.h b/include/common.h
index e659630..fd389e7 100644
--- a/include/common.h
+++ b/include/common.h
@@ -234,6 +234,7 @@ int readline_into_buffer (const char *const prompt, char * buffer);
int parse_line (char *, char *[]);
void init_cmd_timeout(void);
void reset_cmd_timeout(void);
+int _abortboot(int bootdelay);
/* arch/$(ARCH)/lib/board.c */
void board_init_f (ulong) __attribute__ ((noreturn));
--
1.7.0.4
More information about the U-Boot
mailing list