*/
#include <common.h>
#include <command.h>
-#include <cmd_net.h>
#include <net.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
-
-# if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
-# include <cmd_autoscript.h>
-# endif
+#if defined(CONFIG_CMD_NET)
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-static int netboot_common (int, cmd_tbl_t *, int , char *[]);
+static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common (BOOTP, cmdtp, argc, argv);
}
+U_BOOT_CMD(
+ bootp, 3, 1, do_bootp,
+ "bootp\t- boot image via network using BootP/TFTP protocol\n",
+ "[loadAddress] [bootfilename]\n"
+);
+
int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common (TFTP, cmdtp, argc, argv);
}
+U_BOOT_CMD(
+ tftpboot, 3, 1, do_tftpb,
+ "tftpboot- boot image via network using TFTP protocol\n",
+ "[loadAddress] [bootfilename]\n"
+);
+
int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common (RARP, cmdtp, argc, argv);
}
-#if (CONFIG_COMMANDS & CFG_CMD_DHCP)
+U_BOOT_CMD(
+ rarpboot, 3, 1, do_rarpb,
+ "rarpboot- boot image via network using RARP/TFTP protocol\n",
+ "[loadAddress] [bootfilename]\n"
+);
+
+#if defined(CONFIG_CMD_DHCP)
int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common(DHCP, cmdtp, argc, argv);
}
-#endif /* CFG_CMD_DHCP */
-static void netboot_update_env(void)
+U_BOOT_CMD(
+ dhcp, 3, 1, do_dhcp,
+ "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
+ "\n"
+);
+#endif
+
+#if defined(CONFIG_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\t- boot image via network using NFS protocol\n",
+ "[loadAddress] [host ip addr:bootfilename]\n"
+);
+#endif
+
+static void netboot_update_env (void)
{
- char tmp[16] ;
-
- if (NetOurGatewayIP) {
- ip_to_string (NetOurGatewayIP, tmp);
- setenv("gatewayip", tmp);
- }
-
- if (NetOurSubnetMask) {
- ip_to_string (NetOurSubnetMask, tmp);
- setenv("netmask", tmp);
- }
-
- if (NetOurHostName[0])
- setenv("hostname", NetOurHostName);
-
- if (NetOurRootPath[0])
- setenv("rootpath", NetOurRootPath);
-
- if (NetOurIP) {
- ip_to_string (NetOurIP, tmp);
- setenv("ipaddr", tmp);
- }
-
- if (NetServerIP) {
- ip_to_string (NetServerIP, tmp);
- setenv("serverip", tmp);
- }
-
- if (NetOurDNSIP) {
- ip_to_string (NetOurDNSIP, tmp);
- setenv("dnsip", tmp);
- }
+ char tmp[22];
+
+ if (NetOurGatewayIP) {
+ ip_to_string (NetOurGatewayIP, tmp);
+ setenv ("gatewayip", tmp);
+ }
+
+ if (NetOurSubnetMask) {
+ ip_to_string (NetOurSubnetMask, tmp);
+ setenv ("netmask", tmp);
+ }
+
+ if (NetOurHostName[0])
+ setenv ("hostname", NetOurHostName);
+
+ if (NetOurRootPath[0])
+ setenv ("rootpath", NetOurRootPath);
+
+ if (NetOurIP) {
+ ip_to_string (NetOurIP, tmp);
+ setenv ("ipaddr", tmp);
+ }
+
+ if (NetServerIP) {
+ ip_to_string (NetServerIP, tmp);
+ setenv ("serverip", tmp);
+ }
+
+ if (NetOurDNSIP) {
+ ip_to_string (NetOurDNSIP, tmp);
+ setenv ("dnsip", tmp);
+ }
+#if defined(CONFIG_BOOTP_DNS2)
+ if (NetOurDNS2IP) {
+ ip_to_string (NetOurDNS2IP, tmp);
+ setenv ("dnsip2", tmp);
+ }
+#endif
+ if (NetOurNISDomain[0])
+ setenv ("domain", NetOurNISDomain);
+
+#if defined(CONFIG_CMD_SNTP) \
+ && defined(CONFIG_BOOTP_TIMEOFFSET)
+ if (NetTimeOffset) {
+ sprintf (tmp, "%d", NetTimeOffset);
+ setenv ("timeoffset", tmp);
+ }
+#endif
+#if defined(CONFIG_CMD_SNTP) \
+ && defined(CONFIG_BOOTP_NTPSERVER)
+ if (NetNtpServerIP) {
+ ip_to_string (NetNtpServerIP, tmp);
+ setenv ("ntpserverip", tmp);
+ }
+#endif
}
+
static int
-netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
+netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
{
char *s;
int rcode = 0;
break;
default: printf ("Usage:\n%s\n", cmdtp->usage);
+ show_boot_progress (-80);
return 1;
}
- if ((size = NetLoop(proto)) < 0)
+ show_boot_progress (80);
+ if ((size = NetLoop(proto)) < 0) {
+ show_boot_progress (-81);
return 1;
+ }
+ show_boot_progress (81);
/* NetLoop ok, update environment */
netboot_update_env();
/* done if no file was loaded (no errors though) */
- if (size == 0)
+ if (size == 0) {
+ show_boot_progress (-82);
return 0;
+ }
/* flush cache */
flush_cache(load_addr, size);
printf ("Automatic boot of image at addr 0x%08lX ...\n",
load_addr);
+ show_boot_progress (82);
rcode = do_bootm (cmdtp, 0, 1, local_args);
}
#ifdef CONFIG_AUTOSCRIPT
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
printf("Running autoscript at addr 0x%08lX ...\n", load_addr);
+ show_boot_progress (83);
rcode = autoscript (load_addr);
}
#endif
+ if (rcode < 0)
+ show_boot_progress (-83);
+ else
+ show_boot_progress (84);
return rcode;
}
-#endif /* CFG_CMD_NET */
+#if defined(CONFIG_CMD_PING)
+int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+ if (argc < 2)
+ return -1;
+
+ NetPingIP = string_to_ip(argv[1]);
+ if (NetPingIP == 0) {
+ printf ("Usage:\n%s\n", cmdtp->usage);
+ return -1;
+ }
+
+ if (NetLoop(PING) < 0) {
+ printf("ping failed; host %s is not alive\n", argv[1]);
+ return 1;
+ }
+
+ printf("host %s is alive\n", argv[1]);
+
+ return 0;
+}
+
+U_BOOT_CMD(
+ ping, 2, 1, do_ping,
+ "ping\t- send ICMP ECHO_REQUEST to network host\n",
+ "pingAddress\n"
+);
+#endif
+
+#if defined(CONFIG_CMD_CDP)
+
+static void cdp_update_env(void)
+{
+ char tmp[16];
+
+ if (CDPApplianceVLAN != htons(-1)) {
+ printf("CDP offered appliance VLAN %d\n", ntohs(CDPApplianceVLAN));
+ VLAN_to_string(CDPApplianceVLAN, tmp);
+ setenv("vlan", tmp);
+ NetOurVLAN = CDPApplianceVLAN;
+ }
+
+ if (CDPNativeVLAN != htons(-1)) {
+ printf("CDP offered native VLAN %d\n", ntohs(CDPNativeVLAN));
+ VLAN_to_string(CDPNativeVLAN, tmp);
+ setenv("nvlan", tmp);
+ NetOurNativeVLAN = CDPNativeVLAN;
+ }
+
+}
+
+int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+ int r;
+
+ r = NetLoop(CDP);
+ if (r < 0) {
+ printf("cdp failed; perhaps not a CISCO switch?\n");
+ return 1;
+ }
+
+ cdp_update_env();
+
+ return 0;
+}
+
+U_BOOT_CMD(
+ cdp, 1, 1, do_cdp,
+ "cdp\t- Perform CDP network configuration\n",
+);
+#endif
+
+#if defined(CONFIG_CMD_SNTP)
+int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+ char *toff;
+
+ if (argc < 2) {
+ NetNtpServerIP = getenv_IPaddr ("ntpserverip");
+ if (NetNtpServerIP == 0) {
+ printf ("ntpserverip not set\n");
+ return (1);
+ }
+ } else {
+ NetNtpServerIP = string_to_ip(argv[1]);
+ if (NetNtpServerIP == 0) {
+ printf ("Bad NTP server IP address\n");
+ return (1);
+ }
+ }
+
+ toff = getenv ("timeoffset");
+ if (toff == NULL) NetTimeOffset = 0;
+ else NetTimeOffset = simple_strtol (toff, NULL, 10);
+
+ if (NetLoop(SNTP) < 0) {
+ printf("SNTP failed: host %s not responding\n", argv[1]);
+ return 1;
+ }
+
+ return 0;
+}
+
+U_BOOT_CMD(
+ sntp, 2, 1, do_sntp,
+ "sntp\t- synchronize RTC via network\n",
+ "[NTP server IP]\n"
+);
+#endif
+
+#endif
projects / karo-tx-uboot.git / blobdiff