Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e4a3d57dc79e8c94e3272c4a82b146df0fe3dda6

Authored by Simon Glass
Committed by Wolfgang Denk
1 parent ed1ada712a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

net: Export auto_load, use it in rarp 

The rarp code includes another instance of the auto_load logic, so call
what is now net_auto_load() instead.

This also fixes an incorrect call to TftpStart() which was never seen
since apparently no boards enable rarp.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>

Showing 4 changed files with 39 additions and 49 deletions Side-by-side Diff

... ... @@ -430,6 +430,12 @@
430 430 extern void NetReceive(volatile uchar *, int);
431 431  
432 432 /*
  433 + * Check if autoload is enabled. If so, use either NFS or TFTP to download
  434 + * the boot file.
  435 + */
  436 +void net_auto_load(void);
  437 +
  438 +/*
433 439 * The following functions are a bit ugly, but necessary to deal with
434 440 * alignment restrictions on ARM.
435 441 *
... ... @@ -138,36 +138,6 @@
138 138 return (curlen);
139 139 }
140 140  
141   -/*
142   - * Check if autoload is enabled. If so, use either NFS or TFTP to download
143   - * the boot file.
144   - */
145   -static void auto_load(void)
146   -{
147   - const char *s = getenv("autoload");
148   -
149   - if (s != NULL) {
150   - if (*s == 'n') {
151   - /*
152   - * Just use BOOTP to configure system;
153   - * Do not use TFTP to load the bootfile.
154   - */
155   - NetState = NETLOOP_SUCCESS;
156   - return;
157   - }
158   -#if defined(CONFIG_CMD_NFS)
159   - if (strcmp(s, "NFS") == 0) {
160   - /*
161   - * Use NFS to load the bootfile.
162   - */
163   - NfsStart();
164   - return;
165   - }
166   -#endif
167   - }
168   - TftpStart(TFTPGET);
169   -}
170   -
171 141 #if !defined(CONFIG_CMD_DHCP)
172 142  
173 143 static void BootpVendorFieldProcess (u8 * ext)
... ... @@ -354,7 +324,7 @@
354 324  
355 325 debug("Got good BOOTP\n");
356 326  
357   - auto_load();
  327 + net_auto_load();
358 328 }
359 329 #endif
360 330  
... ... @@ -979,7 +949,7 @@
979 949 dhcp_state = BOUND;
980 950 printf ("DHCP client bound to address %pI4\n", &NetOurIP);
981 951  
982   - auto_load();
  952 + net_auto_load();
983 953 return;
984 954 }
985 955 break;
... ... @@ -309,6 +309,36 @@
309 309 }
310 310 }
311 311  
  312 +/*
  313 + * Check if autoload is enabled. If so, use either NFS or TFTP to download
  314 + * the boot file.
  315 + */
  316 +void net_auto_load(void)
  317 +{
  318 + const char *s = getenv("autoload");
  319 +
  320 + if (s != NULL) {
  321 + if (*s == 'n') {
  322 + /*
  323 + * Just use BOOTP/RARP to configure system;
  324 + * Do not use TFTP to load the bootfile.
  325 + */
  326 + NetState = NETLOOP_SUCCESS;
  327 + return;
  328 + }
  329 +#if defined(CONFIG_CMD_NFS)
  330 + if (strcmp(s, "NFS") == 0) {
  331 + /*
  332 + * Use NFS to load the bootfile.
  333 + */
  334 + NfsStart();
  335 + return;
  336 + }
  337 +#endif
  338 + }
  339 + TftpStart(TFTPGET);
  340 +}
  341 +
312 342 static void NetInitLoop(enum proto_t protocol)
313 343 {
314 344 static int env_changed_id;
... ... @@ -46,24 +46,8 @@
46 46 RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2,
47 47 unsigned dummi3)
48 48 {
49   - char *s;
50 49 debug("Got good RARP\n");
51   - if ((s = getenv("autoload")) != NULL) {
52   - if (*s == 'n') {
53   - /*
54   - * Just use RARP to configure system;
55   - * Do not use TFTP/NFS to to load the bootfile.
56   - */
57   - NetState = NETLOOP_SUCCESS;
58   - return;
59   -#if defined(CONFIG_CMD_NFS)
60   - } else if ((s != NULL) && !strcmp(s, "NFS")) {
61   - NfsStart();
62   - return;
63   -#endif
64   - }
65   - }
66   - TftpStart ();
  50 + net_auto_load();
67 51 }
68 52  
69 53