Dear Mike Frysinger, In message <banlktinaphyey48wskj4pezy6sxwdcr...@mail.gmail.com> you wrote: > On Thu, May 5, 2011 at 12:52, Simon Glass wrote: > > +static void auto_load(void) > > +{ > > + char *s = getenv("autoload"); > > const char *s
Agreed. > > + if (s != NULL) { > > + if (*s == 'n') { > > + /* > > + * Just use BOOTP to configure system; > > + * Do not use TFTP to load the bootfile. > > + */ > > + NetState = NETLOOP_SUCCES> S; > > + return; > > +#if defined(CONFIG_CMD_NFS) > > + } else if (strcmp(s, "NFS") == 0) { > > + /* > > + * Use NFS to load the bo> otfile. > > + */ > > + NfsStart(); > > + return; > > +#endif > > + } > > + } > > + > > + TftpStart(); > > put the TftpStart into a new else, then there's no need for the inline > "return" ... I disagree here. As is, we save one level of nesting, which is always a good thing. On contrary, the "else" in the CONFIG_CMD_NFS should be dropped as well, i. e. let's make this: + if (s != NULL) { + if (*s == 'n') { + /* + * Just use BOOTP to configure system; + * Do not use TFTP to load the bootfile. + */ + NetState = NETLOOP_SUCCES> S; + return; + } +#if defined(CONFIG_CMD_NFS) + if (strcmp(s, "NFS") == 0) { + /* + * Use NFS to load the bootfile. + */ + NfsStart(); + return; } +#endif + } + + TftpStart(); Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "We learn from history that we learn nothing from history." - George Bernard Shaw _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot