summaryrefslogtreecommitdiff
path: root/common/main.c
diff options
context:
space:
mode:
authorJason Hobbs <jason.hobbs@calxeda.com>2011-08-31 10:37:30 -0500
committerWolfgang Denk <wd@denx.de>2011-10-17 22:25:35 +0200
commit06283a6401f652e709b7b27d02238d0c6f92cb0c (patch)
treec3c841d8d464533e85674b41601fcb0a61e5ed47 /common/main.c
parente11938eabc17de35822de1a0a1102213c326f788 (diff)
downloadu-boot-imx-06283a6401f652e709b7b27d02238d0c6f92cb0c.zip
u-boot-imx-06283a6401f652e709b7b27d02238d0c6f92cb0c.tar.gz
u-boot-imx-06283a6401f652e709b7b27d02238d0c6f92cb0c.tar.bz2
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 <jason.hobbs@calxeda.com>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index 7be2955..e96c95a 100644
--- a/common/main.c
+++ b/common/main.c
@@ -269,7 +269,9 @@ int abortboot(int bootdelay)
/*
* Return 0 on success, or != 0 on error.
*/
+#ifndef CONFIG_CMD_PXE
static inline
+#endif
int run_command2(const char *cmd, int flag)
{
#ifndef CONFIG_SYS_HUSH_PARSER