Dear "Jason Hobbs",
In message 1307386599-4256-3-git-send-email-jason.hobbs@calxeda.com you wrote:
From: Rob Herring rob.herring@calxeda.com
Signed-off-by: Jason Hobbs jason.hobbs@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);
Why do you make this a reserved identifier? (Quote standard: " All identifiers that begin with an underscore and either an uppercase letter or another underscore are always reserved for any use.").
Also, if this is needed for the PXE code, it should be part of the PXE patch series.
Best regards,
Wolfgang Denk