Dear Mike Frysinger,
In message BANLkTinaPhYEY48wsKJ4PEZY6sXwdcrLwA@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