From b41bc5a82d8a67d347f2fc12cf2106b8a37e4336 Mon Sep 17 00:00:00 2001 From: Jason Hobbs Date: Tue, 23 Aug 2011 11:06:50 +0000 Subject: common, menu: use abortboot for menu timeout Signed-off-by: Jason Hobbs --- include/common.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/common.h') diff --git a/include/common.h b/include/common.h index a55600b182..f9fea08115 100644 --- a/include/common.h +++ b/include/common.h @@ -260,6 +260,9 @@ 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); +#ifdef CONFIG_MENU +int abortboot(int bootdelay); +#endif /* arch/$(ARCH)/lib/board.c */ void board_init_f (ulong) __attribute__ ((noreturn)); -- cgit From e11938eabc17de35822de1a0a1102213c326f788 Mon Sep 17 00:00:00 2001 From: Jason Hobbs Date: Tue, 23 Aug 2011 11:06:56 +0000 Subject: lib: add uuid_str_to_bin for use with bootp and PXE uuid Signed-off-by: Jason Hobbs --- include/common.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/common.h') diff --git a/include/common.h b/include/common.h index f9fea08115..7950c8bded 100644 --- a/include/common.h +++ b/include/common.h @@ -694,6 +694,10 @@ int strcmp_compar(const void *, const void *); /* lib/time.c */ void udelay (unsigned long); +/* lib/uuid.c */ +void uuid_str_to_bin(const char *uuid, unsigned char *out); +int uuid_str_valid(const char *uuid); + /* lib/vsprintf.c */ ulong simple_strtoul(const char *cp,char **endp,unsigned int base); int strict_strtoul(const char *cp, unsigned int base, unsigned long *res); -- cgit From 06283a6401f652e709b7b27d02238d0c6f92cb0c Mon Sep 17 00:00:00 2001 From: Jason Hobbs Date: Wed, 31 Aug 2011 10:37:30 -0500 Subject: Add pxe command Add pxe command, which is intended to mimic PXELINUX functionality. 'pxe get' uses tftp to retrieve a file based on UUID, MAC address or IP address. 'pxe boot' interprets the contents of PXELINUX config like file to boot using a specific initrd, kernel and kernel command line. This patch also adds a README.pxe file - see it for more details on the pxe command. Signed-off-by: Jason Hobbs --- include/common.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/common.h') diff --git a/include/common.h b/include/common.h index 7950c8bded..77a29c8b1d 100644 --- a/include/common.h +++ b/include/common.h @@ -255,6 +255,9 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen); /* common/main.c */ void main_loop (void); int run_command (const char *cmd, int flag); +#ifdef CONFIG_CMD_PXE +int run_command2(const char *cmd, int flag); +#endif int readline (const char *const prompt); int readline_into_buffer (const char *const prompt, char * buffer); int parse_line (char *, char *[]); @@ -285,6 +288,9 @@ extern ulong load_addr; /* Default Load Address */ /* common/cmd_doc.c */ void doc_probe(unsigned long physadr); +/* common/cmd_net.c */ +int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); + /* common/cmd_nvedit.c */ int env_init (void); void env_relocate (void); -- cgit From 744d9859a71c515118457fecb7a58674b600e81a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 10 Oct 2011 08:22:14 +0000 Subject: sandbox: Add architecture header files This adds required header files for the sandbox architecture, and a basic description of what sandbox is (README.sandbox). Signed-off-by: Simon Glass --- include/common.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/common.h') diff --git a/include/common.h b/include/common.h index 77a29c8b1d..4c3e3a68dc 100644 --- a/include/common.h +++ b/include/common.h @@ -311,6 +311,9 @@ int setenv (const char *, const char *); #ifdef CONFIG_X86 /* x86 version to be fixed! */ # include #endif /* CONFIG_X86 */ +#ifdef CONFIG_SANDBOX +# include /* TODO(sjg) what needs to be fixed? */ +#endif #ifdef CONFIG_AUTO_COMPLETE int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); -- cgit