diff options
| author | wdenk <wdenk> | 2004-02-24 02:00:03 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-02-24 02:00:03 +0000 |
| commit | cbd8a35c6dbaaca35494cbec319960887ad02dcf (patch) | |
| tree | f3a5f6817a203a6e3a0a0ab7fb9df5b3697c07e3 /common | |
| parent | 074cff0d2863bab21b065cf283eccd728f4fecaa (diff) | |
| download | u-boot-cbd8a35c6dbaaca35494cbec319960887ad02dcf.tar.gz u-boot-cbd8a35c6dbaaca35494cbec319960887ad02dcf.tar.xz u-boot-cbd8a35c6dbaaca35494cbec319960887ad02dcf.zip | |
* Patch by Masami Komiy, 22 Feb 2004:
Add support for NFS for file download
* Minor code cleanup
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 4 | ||||
| -rw-r--r-- | common/cmd_itest.c | 3 | ||||
| -rw-r--r-- | common/cmd_mem.c | 1 | ||||
| -rw-r--r-- | common/cmd_net.c | 13 |
4 files changed, 19 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index ac9c32e7b8..72553aa061 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -575,10 +575,10 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, kbd->bi_sccfreq /= 1000000L; kbd->bi_vco /= 1000000L; #endif /* CONFIG_8260 */ -#if defined(CONFIG_MPC5XXX) +#if defined(CONFIG_MPC5xxx) kbd->bi_ipbfreq /= 1000000L; kbd->bi_pcifreq /= 1000000L; -#endif /* CONFIG_MPC5XXX */ +#endif /* CONFIG_MPC5xxx */ } kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))hdr->ih_ep; diff --git a/common/cmd_itest.c b/common/cmd_itest.c index 87260b02d6..7fba598d42 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -32,6 +32,8 @@ #include <config.h> #include <command.h> +#if (CONFIG_COMMANDS & CFG_CMD_ITEST) + #define EQ 0 #define NE 1 #define LT 2 @@ -195,3 +197,4 @@ U_BOOT_CMD( "itest - return true/false on integer compare\n", "[.b, .w, .l, .s] [*]value1 <op> [*]value2\n" ); +#endif /* CONFIG_COMMANDS & CFG_CMD_ITEST */ diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 0a5cca9a93..39fc1804f3 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -38,6 +38,7 @@ #if (CONFIG_COMMANDS & (CFG_CMD_MEMORY | \ CFG_CMD_I2C | \ + CFG_CMD_ITEST | \ CFG_CMD_PCI | \ CMD_CMD_PORTIO ) ) int cmd_get_data_size(char* arg, int default_size) diff --git a/common/cmd_net.c b/common/cmd_net.c index e9b54d2450..f13e9d493c 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -81,6 +81,19 @@ U_BOOT_CMD( ); #endif /* CFG_CMD_DHCP */ +#if (CONFIG_COMMANDS & CFG_CMD_NFS) +int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + return netboot_common(NFS, cmdtp, argc, argv); +} + +U_BOOT_CMD( + nfs, 3, 1, do_nfs, + "nfs - boot image via network using NFS protocol\n", + "[loadAddress] [host ip addr:bootfilename]\n" +); +#endif /* CFG_CMD_NFS */ + static void netboot_update_env(void) { char tmp[16] ; |