Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 77cfbf9a111a25188eb8583f49c2429d9b83d08d

Authored by Lokesh Vutla
1 parent 8b72a1ccf6
Exists in v2015.07-smarct4x and in 3 other branches ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc

ARM: AM335x: Fix usb ether boot support 

CONFIG_SPL_NET_VCI_STRING is available only with BOOTP. So if
CMD_DHCP is enabled for SPL in usb ether boot, it will not pass
the right vendor name and failing to download the right file.
Also all the net CMD_* are not required in SPL builds. So defining
these only for non-SPL builds.

Reported-by: Yan Liu <yan-liu@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Sekhar Nori <nsekhar@ti.com>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

include/configs/ti_am335x_common.h
Diff comments   View file @ 77cfbf9
... ... @@ -33,6 +33,7 @@
33 33 #endif
34 34 #define CONFIG_SYS_NS16550_CLK 48000000
35 35  
  36 +#ifndef CONFIG_SPL_BUILD
36 37 /* Network defines. */
37 38 #define CONFIG_CMD_DHCP
38 39 #define CONFIG_CMD_MII
39 40  
40 41  
... ... @@ -43,9 +44,10 @@
43 44 #define CONFIG_BOOTP_SUBNETMASK
44 45 #define CONFIG_NET_RETRY_COUNT 10
45 46 #define CONFIG_CMD_PING
46   -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
47 47 #define CONFIG_MII /* Required in net/eth.c */
  48 +#endif
48 49  
  50 +#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
49 51 /*
50 52 * RTC related defines. To use bootcount you must set bootlimit in the
51 53 * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT