Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3dfbc53bd6310ccc860cf1ad0e9413d8dbbaf4f1

Authored by Joe Hershberger
1 parent 2b9f486bf5
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_8m-imx_v2019.04_4.19.35_1.1.0, 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

net: Make the BOOTP options default 

The BOOTP options used to be and should still be default for all boards
with CMD_NET enabled. One should not be forced to use DISTRO_DEFAULTS to
get them.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Reviewed-by: Duncan Hare <dh@synoia.com>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

... ... @@ -79,12 +79,6 @@
79 79 imply CMD_MII if NET
80 80 select CMD_PART if PARTITIONS
81 81 select HUSH_PARSER
82   - select BOOTP_BOOTPATH if NET && CMD_NET
83   - select BOOTP_DNS if NET && CMD_NET
84   - select BOOTP_GATEWAY if NET && CMD_NET
85   - select BOOTP_HOSTNAME if NET && CMD_NET
86   - select BOOTP_PXE if NET && CMD_NET
87   - select BOOTP_SUBNETMASK if NET && CMD_NET
88 82 select CMDLINE_EDITING
89 83 select AUTO_COMPLETE
90 84 select SYS_LONGHELP
... ... @@ -1043,6 +1043,7 @@
1043 1043  
1044 1044 config BOOTP_BOOTPATH
1045 1045 bool "Request & store 'rootpath' from BOOTP/DHCP server"
  1046 + default y
1046 1047 depends on CMD_BOOTP
1047 1048 help
1048 1049 Even though the config is called BOOTP_BOOTPATH, it stores the
... ... @@ -1050,6 +1051,7 @@
1050 1051  
1051 1052 config BOOTP_DNS
1052 1053 bool "Request & store 'dnsip' from BOOTP/DHCP server"
  1054 + default y
1053 1055 depends on CMD_BOOTP
1054 1056 help
1055 1057 The primary DNS server is stored as 'dnsip'. If two servers are
1056 1058  
1057 1059  
1058 1060  
... ... @@ -1069,20 +1071,24 @@
1069 1071  
1070 1072 config BOOTP_GATEWAY
1071 1073 bool "Request & store 'gatewayip' from BOOTP/DHCP server"
  1074 + default y
1072 1075 depends on CMD_BOOTP
1073 1076  
1074 1077 config BOOTP_HOSTNAME
1075 1078 bool "Request & store 'hostname' from BOOTP/DHCP server"
  1079 + default y
1076 1080 depends on CMD_BOOTP
1077 1081 help
1078 1082 The name may or may not be qualified with the local domain name.
1079 1083  
1080 1084 config BOOTP_SUBNETMASK
1081 1085 bool "Request & store 'netmask' from BOOTP/DHCP server"
  1086 + default y
1082 1087 depends on CMD_BOOTP
1083 1088  
1084 1089 config BOOTP_PXE
1085 1090 bool "Send PXE client arch to BOOTP/DHCP server"
  1091 + default y
1086 1092 depends on CMD_BOOTP && CMD_PXE
1087 1093 help
1088 1094 Supported for ARM, ARM64, and x86 for now.