Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc

Authored by Mike Frysinger
Committed by Ben Warren
1 parent 4b142febff
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: pull CONFIG checks out of source and into makefile 

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

Showing 7 changed files with 9 additions and 30 deletions Side-by-side Diff

... ... @@ -27,14 +27,14 @@
27 27  
28 28 LIB = $(obj)libnet.a
29 29  
30   -COBJS-y += bootp.o
  30 +COBJS-$(CONFIG_CMD_NET) += bootp.o
31 31 COBJS-$(CONFIG_CMD_DNS) += dns.o
32   -COBJS-y += eth.o
33   -COBJS-y += net.o
34   -COBJS-y += nfs.o
35   -COBJS-y += rarp.o
  32 +COBJS-$(CONFIG_CMD_NET) += eth.o
  33 +COBJS-$(CONFIG_CMD_NET) += net.o
  34 +COBJS-$(CONFIG_CMD_NFS) += nfs.o
  35 +COBJS-$(CONFIG_CMD_NET) += rarp.o
36 36 COBJS-$(CONFIG_CMD_SNTP) += sntp.o
37   -COBJS-y += tftp.o
  37 +COBJS-$(CONFIG_CMD_NET) += tftp.o
38 38  
39 39 COBJS := $(COBJS-y)
40 40 SRCS := $(COBJS:.o=.c)
... ... @@ -20,8 +20,6 @@
20 20  
21 21 #define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */
22 22  
23   -#if defined(CONFIG_CMD_NET)
24   -
25 23 #define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */
26 24 #ifndef CONFIG_NET_RETRY_COUNT
27 25 # define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
... ... @@ -948,6 +946,4 @@
948 946 BootpRequest();
949 947 }
950 948 #endif /* CONFIG_CMD_DHCP */
951   -
952   -#endif /* CONFIG_CMD_NET */
... ... @@ -26,7 +26,6 @@
26 26 #include <net.h>
27 27 #include <miiphy.h>
28 28  
29   -#ifdef CONFIG_CMD_NET
30 29 void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
31 30 {
32 31 char *end;
33 32  
... ... @@ -60,9 +59,8 @@
60 59 sprintf(enetvar, index ? "eth%daddr" : "ethaddr", index);
61 60 return eth_getenv_enetaddr(enetvar, enetaddr);
62 61 }
63   -#endif
64 62  
65   -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
  63 +#ifdef CONFIG_NET_MULTI
66 64  
67 65 /*
68 66 * CPU and board-specific Ethernet initializations. Aliased function
... ... @@ -492,7 +490,8 @@
492 490 {
493 491 return (eth_current ? eth_current->name : "unknown");
494 492 }
495   -#elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI)
  493 +
  494 +#else /* !CONFIG_NET_MULTI */
496 495  
497 496 #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI
498 497  
... ... @@ -96,8 +96,6 @@
96 96 #include "dns.h"
97 97 #endif
98 98  
99   -#if defined(CONFIG_CMD_NET)
100   -
101 99 DECLARE_GLOBAL_DATA_PTR;
102 100  
103 101 #ifndef CONFIG_ARP_TIMEOUT
... ... @@ -1871,8 +1869,6 @@
1871 1869 }
1872 1870 *dst = '\0';
1873 1871 }
1874   -
1875   -#endif
1876 1872  
1877 1873 #if defined(CONFIG_CMD_NFS) || defined(CONFIG_CMD_SNTP) || defined(CONFIG_CMD_DNS)
1878 1874 /*
... ... @@ -29,8 +29,6 @@
29 29 #include "nfs.h"
30 30 #include "bootp.h"
31 31  
32   -#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS)
33   -
34 32 #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
35 33 #define NFS_RETRY_COUNT 30
36 34 #define NFS_TIMEOUT 2000UL
... ... @@ -755,6 +753,4 @@
755 753  
756 754 NfsSend ();
757 755 }
758   -
759   -#endif
... ... @@ -29,8 +29,6 @@
29 29 #include "rarp.h"
30 30 #include "tftp.h"
31 31  
32   -#if defined(CONFIG_CMD_NET)
33   -
34 32 #define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */
35 33 #ifndef CONFIG_NET_RETRY_COUNT
36 34 # define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
... ... @@ -116,6 +114,4 @@
116 114 NetSetTimeout(TIMEOUT, RarpTimeout);
117 115 NetSetHandler(RarpHandler);
118 116 }
119   -
120   -#endif
... ... @@ -10,8 +10,6 @@
10 10 #include "tftp.h"
11 11 #include "bootp.h"
12 12  
13   -#if defined(CONFIG_CMD_NET)
14   -
15 13 #define WELL_KNOWN_PORT 69 /* Well known TFTP port # */
16 14 #define TIMEOUT 5000UL /* Millisecs to timeout for lost pkt */
17 15 #ifndef CONFIG_NET_RETRY_COUNT
... ... @@ -690,6 +688,4 @@
690 688 }
691 689  
692 690 #endif /* Multicast TFTP */
693   -
694   -#endif