* [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options
@ 2018-03-28 20:51 Joe Hershberger
2018-03-28 20:51 ` [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig Joe Hershberger
` (10 more replies)
0 siblings, 11 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
There have been a few issues persisting in the net menus and a recent
change that went in (Kconfig: cmd: Make networking command dependent on NET)
caused a few new issues. Clean up these things and further move to separate
CMD_NET from NET along appropriate boundaries.
Joe Hershberger (9):
net: Make CMD_NET a menuconfig
net: Move net command options to the cmd menu
net: Move the DHCP command below the BOOTP command
net: Improve menu options and help for BOOTP options
net: Add the BOOTP_DNS2 option to Kconfig
net: Improve BOOTP PXE config option
net: Make the BOOTP options default
net: Make core net code depend on NET instead of CMD_NET
Revert "Kconfig: cmd: Make networking command dependent on NET"
Kconfig | 8 +--
cmd/Kconfig | 113 ++++++++++++++++++++++++++++++++++-----
cmd/bootefi.c | 4 +-
cmd/net.c | 4 ++
lib/efi_loader/Makefile | 2 +-
lib/efi_loader/efi_device_path.c | 2 +-
net/Kconfig | 51 ------------------
net/Makefile | 14 ++---
8 files changed, 116 insertions(+), 82 deletions(-)
--
1.7.11.5
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 3:03 ` Chris Packham
2018-03-29 16:19 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 2/9] net: Move net command options to the cmd menu Joe Hershberger
` (9 subsequent siblings)
10 siblings, 2 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
Previously, CMD_NET was an alias for 2 commands (bootp and tftpboot) and
they we not able to be disabled. Separate out those 2 commands and move
CMD_NET up to the menu level, which more accurately represents the code.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 25 +++++++++++++++++--------
cmd/net.c | 4 ++++
net/Kconfig | 19 +++++++++----------
net/Makefile | 4 ++--
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 136836d..f2a12ce 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1010,25 +1010,35 @@ config CMD_SETEXPR
endmenu
-menu "Network commands"
-
if NET
-config CMD_NET
- bool "bootp, tftpboot"
+menuconfig CMD_NET
+ bool "Network commands"
+ default y
+
+if CMD_NET
+
+config CMD_BOOTP
+ bool "bootp"
default y
help
- Network commands.
bootp - boot image via network using BOOTP/TFTP protocol
+
+config CMD_TFTPBOOT
+ bool "tftpboot"
+ default y
+ help
tftpboot - boot image via network using TFTP protocol
config CMD_TFTPPUT
bool "tftp put"
+ depends on CMD_TFTPBOOT
help
TFTP put command, for uploading files to a server
config CMD_TFTPSRV
bool "tftpsrv"
+ depends on CMD_TFTPBOOT
help
Act as a TFTP server and boot the first received file
@@ -1039,13 +1049,12 @@ config CMD_RARP
config CMD_DHCP
bool "dhcp"
- depends on CMD_NET
+ depends on CMD_BOOTP
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
- depends on CMD_NET
select MENU
help
Boot image via network using PXE protocol
@@ -1096,7 +1105,7 @@ config CMD_ETHSW
endif
-endmenu
+endif
menu "Misc commands"
diff --git a/cmd/net.c b/cmd/net.c
index d7c776a..67888d4 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -14,6 +14,7 @@
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
+#ifdef CONFIG_CMD_BOOTP
static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
return netboot_common(BOOTP, cmdtp, argc, argv);
@@ -24,7 +25,9 @@ U_BOOT_CMD(
"boot image via network using BOOTP/TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
+#ifdef CONFIG_CMD_TFTPBOOT
int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret;
@@ -40,6 +43,7 @@ U_BOOT_CMD(
"boot image via network using TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
#ifdef CONFIG_CMD_TFTPPUT
static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/net/Kconfig b/net/Kconfig
index 143c441..d421a34 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,7 +24,7 @@ config NETCONSOLE
config NET_TFTP_VARS
bool "Control TFTP timeout and count through environment"
- depends on CMD_NET
+ depends on CMD_TFTPBOOT
default y
help
If set, allows controlling the TFTP timeout through the
@@ -35,39 +35,38 @@ config NET_TFTP_VARS
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_DNS
bool "Enable bootp DNS"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE
bool "Enable BOOTP PXE"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
- depends on CMD_NET
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_NET
+ depends on CMD_BOOTP
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
- depends on CMD_NET
+ depends on CMD_BOOTP
default "U-Boot.armv7" if CPU_V7 || CPU_V7M
default "U-Boot.armv8" if ARM64
default "U-Boot.arm" if ARM
diff --git a/net/Makefile b/net/Makefile
index ae54eee..ed102ec 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -9,7 +9,7 @@
obj-y += checksum.o
obj-$(CONFIG_CMD_NET) += arp.o
-obj-$(CONFIG_CMD_NET) += bootp.o
+obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
@@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_NFS) += nfs.o
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
obj-$(CONFIG_CMD_SNTP) += sntp.o
-obj-$(CONFIG_CMD_NET) += tftp.o
+obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
# Disable this warning as it is triggered by:
# sprintf(buf, index ? "foo%d" : "foo", index)
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 2/9] net: Move net command options to the cmd menu
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
2018-03-28 20:51 ` [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 3:05 ` Chris Packham
2018-03-28 20:51 ` [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command Joe Hershberger
` (8 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
Options that controlled the tftp and bootp commands depended on their
commands, but lived in the net menu.
Move them so they are in a consistent location.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
net/Kconfig | 50 --------------------------------------------------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index f2a12ce..d714f73 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1024,6 +1024,45 @@ config CMD_BOOTP
help
bootp - boot image via network using BOOTP/TFTP protocol
+config BOOTP_BOOTPATH
+ bool "Enable BOOTP BOOTPATH"
+ depends on CMD_BOOTP
+
+config BOOTP_DNS
+ bool "Enable bootp DNS"
+ depends on CMD_BOOTP
+
+config BOOTP_GATEWAY
+ bool "Enable BOOTP gateway"
+ depends on CMD_BOOTP
+
+config BOOTP_HOSTNAME
+ bool "Enable BOOTP hostname"
+ depends on CMD_BOOTP
+
+config BOOTP_SUBNETMASK
+ bool "Enable BOOTP subnetmask"
+ depends on CMD_BOOTP
+
+config BOOTP_PXE
+ bool "Enable BOOTP PXE"
+ depends on CMD_BOOTP
+
+config BOOTP_PXE_CLIENTARCH
+ hex
+ depends on CMD_BOOTP
+ default 0x16 if ARM64
+ default 0x15 if ARM
+ default 0 if X86
+
+config BOOTP_VCI_STRING
+ string
+ depends on CMD_BOOTP
+ default "U-Boot.armv7" if CPU_V7 || CPU_V7M
+ default "U-Boot.armv8" if ARM64
+ default "U-Boot.arm" if ARM
+ default "U-Boot"
+
config CMD_TFTPBOOT
bool "tftpboot"
default y
@@ -1042,6 +1081,17 @@ config CMD_TFTPSRV
help
Act as a TFTP server and boot the first received file
+config NET_TFTP_VARS
+ bool "Control TFTP timeout and count through environment"
+ depends on CMD_TFTPBOOT
+ default y
+ help
+ If set, allows controlling the TFTP timeout through the
+ environment variable tftptimeout, and the TFTP maximum
+ timeout count through the variable tftptimeoutcountmax.
+ If unset, timeout and maximum are hard-defined as 1 second
+ and 10 timouts per TFTP transfer.
+
config CMD_RARP
bool "rarpboot"
help
diff --git a/net/Kconfig b/net/Kconfig
index d421a34..f2363e5 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -22,54 +22,4 @@ config NETCONSOLE
Support the 'nc' input/output device for networked console.
See README.NetConsole for details.
-config NET_TFTP_VARS
- bool "Control TFTP timeout and count through environment"
- depends on CMD_TFTPBOOT
- default y
- help
- If set, allows controlling the TFTP timeout through the
- environment variable tftptimeout, and the TFTP maximum
- timeout count through the variable tftptimeoutcountmax.
- If unset, timeout and maximum are hard-defined as 1 second
- and 10 timouts per TFTP transfer.
-
-config BOOTP_BOOTPATH
- bool "Enable BOOTP BOOTPATH"
- depends on CMD_BOOTP
-
-config BOOTP_DNS
- bool "Enable bootp DNS"
- depends on CMD_BOOTP
-
-config BOOTP_GATEWAY
- bool "Enable BOOTP gateway"
- depends on CMD_BOOTP
-
-config BOOTP_HOSTNAME
- bool "Enable BOOTP hostname"
- depends on CMD_BOOTP
-
-config BOOTP_PXE
- bool "Enable BOOTP PXE"
- depends on CMD_BOOTP
-
-config BOOTP_SUBNETMASK
- bool "Enable BOOTP subnetmask"
- depends on CMD_BOOTP
-
-config BOOTP_PXE_CLIENTARCH
- hex
- depends on CMD_BOOTP
- default 0x16 if ARM64
- default 0x15 if ARM
- default 0 if X86
-
-config BOOTP_VCI_STRING
- string
- depends on CMD_BOOTP
- default "U-Boot.armv7" if CPU_V7 || CPU_V7M
- default "U-Boot.armv8" if ARM64
- default "U-Boot.arm" if ARM
- default "U-Boot"
-
endif # if NET
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
2018-03-28 20:51 ` [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig Joe Hershberger
2018-03-28 20:51 ` [U-Boot] [PATCH 2/9] net: Move net command options to the cmd menu Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 3:14 ` Chris Packham
2018-03-29 16:51 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options Joe Hershberger
` (7 subsequent siblings)
10 siblings, 2 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
Move DHCP to directly follow BOOTP so that Kconfig can show the
dependency as a hierarchy.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d714f73..7ef9501 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1024,6 +1024,12 @@ config CMD_BOOTP
help
bootp - boot image via network using BOOTP/TFTP protocol
+config CMD_DHCP
+ bool "dhcp"
+ depends on CMD_BOOTP
+ help
+ Boot image via network using DHCP/TFTP protocol
+
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
depends on CMD_BOOTP
@@ -1097,12 +1103,6 @@ config CMD_RARP
help
Boot image via network using RARP/TFTP protocol
-config CMD_DHCP
- bool "dhcp"
- depends on CMD_BOOTP
- help
- Boot image via network using DHCP/TFTP protocol
-
config CMD_PXE
bool "pxe"
select MENU
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (2 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 3:18 ` Chris Packham
2018-03-28 20:51 ` [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
` (6 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
The options were pretty unhelpful, so improve them some.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7ef9501..76fd111 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1031,23 +1031,32 @@ config CMD_DHCP
Boot image via network using DHCP/TFTP protocol
config BOOTP_BOOTPATH
- bool "Enable BOOTP BOOTPATH"
+ bool "Request & store 'rootpath' from BOOTP/DHCP server"
depends on CMD_BOOTP
+ help
+ Even though the config is called BOOTP_BOOTPATH, it stores the
+ path in the variable 'rootpath'.
config BOOTP_DNS
- bool "Enable bootp DNS"
+ bool "Request & store 'dnsip' from BOOTP/DHCP server"
depends on CMD_BOOTP
+ help
+ The primary DNS server is stored as 'dnsip'. If two servers are
+ returned, you must set BOOTP_DNS2 to store that second server IP
+ also.
config BOOTP_GATEWAY
- bool "Enable BOOTP gateway"
+ bool "Request & store 'gatewayip' from BOOTP/DHCP server"
depends on CMD_BOOTP
config BOOTP_HOSTNAME
- bool "Enable BOOTP hostname"
+ bool "Request & store 'hostname' from BOOTP/DHCP server"
depends on CMD_BOOTP
+ help
+ The name may or may not be qualified with the local domain name.
config BOOTP_SUBNETMASK
- bool "Enable BOOTP subnetmask"
+ bool "Request & store 'netmask' from BOOTP/DHCP server"
depends on CMD_BOOTP
config BOOTP_PXE
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (3 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 3:19 ` Chris Packham
2018-03-29 16:39 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 6/9] net: Improve BOOTP PXE config option Joe Hershberger
` (5 subsequent siblings)
10 siblings, 2 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
Commit 3b3ea2c56ec4bc5 ("Kconfig: cmd: Make networking command dependent on NET")
removed the help documentation from the README but didn't add it back to Kconfig.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 76fd111..db75759 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1045,6 +1045,17 @@ config BOOTP_DNS
returned, you must set BOOTP_DNS2 to store that second server IP
also.
+config BOOTP_DNS2
+ bool "Store 'dnsip2' from BOOTP/DHCP server"
+ depends on BOOTP_DNS
+ help
+ If a DHCP client requests the DNS server IP from a DHCP server,
+ it is possible that more than one DNS serverip is offered to the
+ client. If CONFIG_BOOTP_DNS2 is enabled, the secondary DNS
+ server IP will be stored in the additional environment
+ variable "dnsip2". The first DNS serverip is always
+ stored in the variable "dnsip", when BOOTP_DNS is defined.
+
config BOOTP_GATEWAY
bool "Request & store 'gatewayip' from BOOTP/DHCP server"
depends on CMD_BOOTP
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 6/9] net: Improve BOOTP PXE config option
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (4 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 16:38 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 7/9] net: Make the BOOTP options default Joe Hershberger
` (4 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
Improve the documentation and correct the listed dependencies.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index db75759..cc059c4 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1071,12 +1071,14 @@ config BOOTP_SUBNETMASK
depends on CMD_BOOTP
config BOOTP_PXE
- bool "Enable BOOTP PXE"
- depends on CMD_BOOTP
+ bool "Send PXE client arch to BOOTP/DHCP server"
+ depends on CMD_BOOTP && CMD_PXE
+ help
+ Supported for ARM, ARM64, and x86 for now.
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_BOOTP
+ depends on BOOTP_PXE
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 7/9] net: Make the BOOTP options default
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (5 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 6/9] net: Improve BOOTP PXE config option Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 16:35 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
` (3 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
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>
---
Kconfig | 6 ------
cmd/Kconfig | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Kconfig b/Kconfig
index 6670913..17e6212 100644
--- a/Kconfig
+++ b/Kconfig
@@ -79,12 +79,6 @@ config DISTRO_DEFAULTS
select CMD_PING if NET
select CMD_PART if PARTITIONS
select HUSH_PARSER
- select BOOTP_BOOTPATH if NET && CMD_NET
- select BOOTP_DNS if NET && CMD_NET
- select BOOTP_GATEWAY if NET && CMD_NET
- select BOOTP_HOSTNAME if NET && CMD_NET
- select BOOTP_PXE if NET && CMD_NET
- select BOOTP_SUBNETMASK if NET && CMD_NET
select CMDLINE_EDITING
select AUTO_COMPLETE
select SYS_LONGHELP
diff --git a/cmd/Kconfig b/cmd/Kconfig
index cc059c4..6eff18f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1032,6 +1032,7 @@ config CMD_DHCP
config BOOTP_BOOTPATH
bool "Request & store 'rootpath' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
Even though the config is called BOOTP_BOOTPATH, it stores the
@@ -1039,6 +1040,7 @@ config BOOTP_BOOTPATH
config BOOTP_DNS
bool "Request & store 'dnsip' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
The primary DNS server is stored as 'dnsip'. If two servers are
@@ -1058,20 +1060,24 @@ config BOOTP_DNS2
config BOOTP_GATEWAY
bool "Request & store 'gatewayip' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Request & store 'hostname' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
The name may or may not be qualified with the local domain name.
config BOOTP_SUBNETMASK
bool "Request & store 'netmask' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
config BOOTP_PXE
bool "Send PXE client arch to BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP && CMD_PXE
help
Supported for ARM, ARM64, and x86 for now.
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (6 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 7/9] net: Make the BOOTP options default Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 16:33 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
` (2 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
No commands are necessary to have a network stack.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
net/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/Makefile b/net/Makefile
index ed102ec..95e9f63 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -8,18 +8,18 @@
#ccflags-y += -DDEBUG
obj-y += checksum.o
-obj-$(CONFIG_CMD_NET) += arp.o
+obj-$(CONFIG_NET) += arp.o
obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
-obj-$(CONFIG_CMD_NET) += eth-uclass.o
+obj-$(CONFIG_NET) += eth-uclass.o
else
-obj-$(CONFIG_CMD_NET) += eth_legacy.o
+obj-$(CONFIG_NET) += eth_legacy.o
endif
-obj-$(CONFIG_CMD_NET) += eth_common.o
+obj-$(CONFIG_NET) += eth_common.o
obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
-obj-$(CONFIG_CMD_NET) += net.o
+obj-$(CONFIG_NET) += net.o
obj-$(CONFIG_CMD_NFS) += nfs.o
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET"
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (7 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
@ 2018-03-28 20:51 ` Joe Hershberger
2018-03-29 16:32 ` Duncan Hare
2018-03-29 16:18 ` [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Duncan Hare
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-03-28 20:51 UTC (permalink / raw)
To: u-boot
This reverts the parts of commit 3b3ea2c56ec4bc5588281fd103c744e608f8b25c
where it changed the EFI dependency on NET.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
Kconfig | 2 +-
cmd/bootefi.c | 4 ++--
lib/efi_loader/Makefile | 2 +-
lib/efi_loader/efi_device_path.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Kconfig b/Kconfig
index 17e6212..89f685b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -70,7 +70,7 @@ config DISTRO_DEFAULTS
select CMD_BOOTZ if ARM && !ARM64
select CMD_BOOTI if ARM64
select CMD_DHCP if NET && CMD_NET
- select CMD_PXE if NET && CMD_NET
+ select CMD_PXE if NET
select CMD_EXT2
select CMD_EXT4
select CMD_FAT
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 6546272..7b1c09f 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -42,7 +42,7 @@ static void efi_init_obj_list(void)
#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
efi_gop_register();
#endif
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
efi_net_register();
#endif
#ifdef CONFIG_GENERATE_SMBIOS_TABLE
@@ -450,7 +450,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
bootefi_device_path = efi_dp_from_part(desc, part);
} else {
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
bootefi_device_path = efi_dp_from_eth();
#endif
}
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 2a87d9e..2722265 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -21,5 +21,5 @@ obj-y += efi_file.o efi_variable.o efi_bootmgr.o efi_watchdog.o
obj-$(CONFIG_LCD) += efi_gop.o
obj-$(CONFIG_DM_VIDEO) += efi_gop.o
obj-$(CONFIG_PARTITIONS) += efi_disk.o
-obj-$(CONFIG_CMD_NET) += efi_net.o
+obj-$(CONFIG_NET) += efi_net.o
obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 3c735e6..ecc4eda 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -746,7 +746,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
return start;
}
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
struct efi_device_path *efi_dp_from_eth(void)
{
struct efi_device_path_mac_addr *ndp;
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig
2018-03-28 20:51 ` [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig Joe Hershberger
@ 2018-03-29 3:03 ` Chris Packham
2018-03-29 16:19 ` Duncan Hare
1 sibling, 0 replies; 48+ messages in thread
From: Chris Packham @ 2018-03-29 3:03 UTC (permalink / raw)
To: u-boot
On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Previously, CMD_NET was an alias for 2 commands (bootp and tftpboot) and
> they we not able to be disabled. Separate out those 2 commands and move
> CMD_NET up to the menu level, which more accurately represents the code.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
Reviewed-by: Chris Packham <judge.packham@gmail.com>
>
> cmd/Kconfig | 25 +++++++++++++++++--------
> cmd/net.c | 4 ++++
> net/Kconfig | 19 +++++++++----------
> net/Makefile | 4 ++--
> 4 files changed, 32 insertions(+), 20 deletions(-)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 136836d..f2a12ce 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1010,25 +1010,35 @@ config CMD_SETEXPR
>
> endmenu
>
> -menu "Network commands"
> -
> if NET
>
> -config CMD_NET
> - bool "bootp, tftpboot"
> +menuconfig CMD_NET
> + bool "Network commands"
> + default y
> +
> +if CMD_NET
> +
> +config CMD_BOOTP
> + bool "bootp"
> default y
> help
> - Network commands.
> bootp - boot image via network using BOOTP/TFTP protocol
> +
> +config CMD_TFTPBOOT
> + bool "tftpboot"
> + default y
> + help
> tftpboot - boot image via network using TFTP protocol
>
> config CMD_TFTPPUT
> bool "tftp put"
> + depends on CMD_TFTPBOOT
> help
> TFTP put command, for uploading files to a server
>
> config CMD_TFTPSRV
> bool "tftpsrv"
> + depends on CMD_TFTPBOOT
> help
> Act as a TFTP server and boot the first received file
>
> @@ -1039,13 +1049,12 @@ config CMD_RARP
>
> config CMD_DHCP
> bool "dhcp"
> - depends on CMD_NET
> + depends on CMD_BOOTP
> help
> Boot image via network using DHCP/TFTP protocol
>
> config CMD_PXE
> bool "pxe"
> - depends on CMD_NET
> select MENU
> help
> Boot image via network using PXE protocol
> @@ -1096,7 +1105,7 @@ config CMD_ETHSW
>
> endif
>
> -endmenu
> +endif
>
> menu "Misc commands"
>
> diff --git a/cmd/net.c b/cmd/net.c
> index d7c776a..67888d4 100644
> --- a/cmd/net.c
> +++ b/cmd/net.c
> @@ -14,6 +14,7 @@
>
> static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
>
> +#ifdef CONFIG_CMD_BOOTP
> static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> {
> return netboot_common(BOOTP, cmdtp, argc, argv);
> @@ -24,7 +25,9 @@ U_BOOT_CMD(
> "boot image via network using BOOTP/TFTP protocol",
> "[loadAddress] [[hostIPaddr:]bootfilename]"
> );
> +#endif
>
> +#ifdef CONFIG_CMD_TFTPBOOT
> int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> {
> int ret;
> @@ -40,6 +43,7 @@ U_BOOT_CMD(
> "boot image via network using TFTP protocol",
> "[loadAddress] [[hostIPaddr:]bootfilename]"
> );
> +#endif
>
> #ifdef CONFIG_CMD_TFTPPUT
> static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> diff --git a/net/Kconfig b/net/Kconfig
> index 143c441..d421a34 100644
> --- a/net/Kconfig
> +++ b/net/Kconfig
> @@ -24,7 +24,7 @@ config NETCONSOLE
>
> config NET_TFTP_VARS
> bool "Control TFTP timeout and count through environment"
> - depends on CMD_NET
> + depends on CMD_TFTPBOOT
> default y
> help
> If set, allows controlling the TFTP timeout through the
> @@ -35,39 +35,38 @@ config NET_TFTP_VARS
>
> config BOOTP_BOOTPATH
> bool "Enable BOOTP BOOTPATH"
> - depends on CMD_NET
> + depends on CMD_BOOTP
>
> config BOOTP_DNS
> bool "Enable bootp DNS"
> - depends on CMD_NET
> + depends on CMD_BOOTP
>
> config BOOTP_GATEWAY
> bool "Enable BOOTP gateway"
> - depends on CMD_NET
> + depends on CMD_BOOTP
>
> config BOOTP_HOSTNAME
> bool "Enable BOOTP hostname"
> - depends on CMD_NET
> + depends on CMD_BOOTP
>
> config BOOTP_PXE
> bool "Enable BOOTP PXE"
> - depends on CMD_NET
> + depends on CMD_BOOTP
>
> config BOOTP_SUBNETMASK
> bool "Enable BOOTP subnetmask"
> - depends on CMD_NET
> - depends on CMD_NET
> + depends on CMD_BOOTP
>
> config BOOTP_PXE_CLIENTARCH
> hex
> - depends on CMD_NET
> + depends on CMD_BOOTP
> default 0x16 if ARM64
> default 0x15 if ARM
> default 0 if X86
>
> config BOOTP_VCI_STRING
> string
> - depends on CMD_NET
> + depends on CMD_BOOTP
> default "U-Boot.armv7" if CPU_V7 || CPU_V7M
> default "U-Boot.armv8" if ARM64
> default "U-Boot.arm" if ARM
> diff --git a/net/Makefile b/net/Makefile
> index ae54eee..ed102ec 100644
> --- a/net/Makefile
> +++ b/net/Makefile
> @@ -9,7 +9,7 @@
>
> obj-y += checksum.o
> obj-$(CONFIG_CMD_NET) += arp.o
> -obj-$(CONFIG_CMD_NET) += bootp.o
> +obj-$(CONFIG_CMD_BOOTP) += bootp.o
> obj-$(CONFIG_CMD_CDP) += cdp.o
> obj-$(CONFIG_CMD_DNS) += dns.o
> ifdef CONFIG_DM_ETH
> @@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_NFS) += nfs.o
> obj-$(CONFIG_CMD_PING) += ping.o
> obj-$(CONFIG_CMD_RARP) += rarp.o
> obj-$(CONFIG_CMD_SNTP) += sntp.o
> -obj-$(CONFIG_CMD_NET) += tftp.o
> +obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
>
> # Disable this warning as it is triggered by:
> # sprintf(buf, index ? "foo%d" : "foo", index)
> --
> 1.7.11.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 2/9] net: Move net command options to the cmd menu
2018-03-28 20:51 ` [U-Boot] [PATCH 2/9] net: Move net command options to the cmd menu Joe Hershberger
@ 2018-03-29 3:05 ` Chris Packham
0 siblings, 0 replies; 48+ messages in thread
From: Chris Packham @ 2018-03-29 3:05 UTC (permalink / raw)
To: u-boot
On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Options that controlled the tftp and bootp commands depended on their
> commands, but lived in the net menu.
>
> Move them so they are in a consistent location.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
Reviewed-by: Chris Packham <judge.packham@gmail.com>
> cmd/Kconfig | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
> net/Kconfig | 50 --------------------------------------------------
> 2 files changed, 50 insertions(+), 50 deletions(-)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index f2a12ce..d714f73 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1024,6 +1024,45 @@ config CMD_BOOTP
> help
> bootp - boot image via network using BOOTP/TFTP protocol
>
> +config BOOTP_BOOTPATH
> + bool "Enable BOOTP BOOTPATH"
> + depends on CMD_BOOTP
> +
> +config BOOTP_DNS
> + bool "Enable bootp DNS"
> + depends on CMD_BOOTP
> +
> +config BOOTP_GATEWAY
> + bool "Enable BOOTP gateway"
> + depends on CMD_BOOTP
> +
> +config BOOTP_HOSTNAME
> + bool "Enable BOOTP hostname"
> + depends on CMD_BOOTP
> +
> +config BOOTP_SUBNETMASK
> + bool "Enable BOOTP subnetmask"
> + depends on CMD_BOOTP
> +
> +config BOOTP_PXE
> + bool "Enable BOOTP PXE"
> + depends on CMD_BOOTP
> +
> +config BOOTP_PXE_CLIENTARCH
> + hex
> + depends on CMD_BOOTP
> + default 0x16 if ARM64
> + default 0x15 if ARM
> + default 0 if X86
> +
> +config BOOTP_VCI_STRING
> + string
> + depends on CMD_BOOTP
> + default "U-Boot.armv7" if CPU_V7 || CPU_V7M
> + default "U-Boot.armv8" if ARM64
> + default "U-Boot.arm" if ARM
> + default "U-Boot"
> +
> config CMD_TFTPBOOT
> bool "tftpboot"
> default y
> @@ -1042,6 +1081,17 @@ config CMD_TFTPSRV
> help
> Act as a TFTP server and boot the first received file
>
> +config NET_TFTP_VARS
> + bool "Control TFTP timeout and count through environment"
> + depends on CMD_TFTPBOOT
> + default y
> + help
> + If set, allows controlling the TFTP timeout through the
> + environment variable tftptimeout, and the TFTP maximum
> + timeout count through the variable tftptimeoutcountmax.
> + If unset, timeout and maximum are hard-defined as 1 second
> + and 10 timouts per TFTP transfer.
> +
> config CMD_RARP
> bool "rarpboot"
> help
> diff --git a/net/Kconfig b/net/Kconfig
> index d421a34..f2363e5 100644
> --- a/net/Kconfig
> +++ b/net/Kconfig
> @@ -22,54 +22,4 @@ config NETCONSOLE
> Support the 'nc' input/output device for networked console.
> See README.NetConsole for details.
>
> -config NET_TFTP_VARS
> - bool "Control TFTP timeout and count through environment"
> - depends on CMD_TFTPBOOT
> - default y
> - help
> - If set, allows controlling the TFTP timeout through the
> - environment variable tftptimeout, and the TFTP maximum
> - timeout count through the variable tftptimeoutcountmax.
> - If unset, timeout and maximum are hard-defined as 1 second
> - and 10 timouts per TFTP transfer.
> -
> -config BOOTP_BOOTPATH
> - bool "Enable BOOTP BOOTPATH"
> - depends on CMD_BOOTP
> -
> -config BOOTP_DNS
> - bool "Enable bootp DNS"
> - depends on CMD_BOOTP
> -
> -config BOOTP_GATEWAY
> - bool "Enable BOOTP gateway"
> - depends on CMD_BOOTP
> -
> -config BOOTP_HOSTNAME
> - bool "Enable BOOTP hostname"
> - depends on CMD_BOOTP
> -
> -config BOOTP_PXE
> - bool "Enable BOOTP PXE"
> - depends on CMD_BOOTP
> -
> -config BOOTP_SUBNETMASK
> - bool "Enable BOOTP subnetmask"
> - depends on CMD_BOOTP
> -
> -config BOOTP_PXE_CLIENTARCH
> - hex
> - depends on CMD_BOOTP
> - default 0x16 if ARM64
> - default 0x15 if ARM
> - default 0 if X86
> -
> -config BOOTP_VCI_STRING
> - string
> - depends on CMD_BOOTP
> - default "U-Boot.armv7" if CPU_V7 || CPU_V7M
> - default "U-Boot.armv8" if ARM64
> - default "U-Boot.arm" if ARM
> - default "U-Boot"
> -
> endif # if NET
> --
> 1.7.11.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command
2018-03-28 20:51 ` [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command Joe Hershberger
@ 2018-03-29 3:14 ` Chris Packham
2018-03-29 16:51 ` Duncan Hare
1 sibling, 0 replies; 48+ messages in thread
From: Chris Packham @ 2018-03-29 3:14 UTC (permalink / raw)
To: u-boot
On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Move DHCP to directly follow BOOTP so that Kconfig can show the
> dependency as a hierarchy.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
I never quite understood the distinction between bootp and dhcp. I
know technically bootp was an earlier version of what eventually
became bootp but isn't dhcp fully backwards compatible with the bootp
protocol? Code-wise it looks like bootp is dhcp without the option
processing. Do we save much by keeping the separate?
Regardless ...
Reviewed-by: Chris Packham <judge.packham@gmail.com>
>
> cmd/Kconfig | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index d714f73..7ef9501 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1024,6 +1024,12 @@ config CMD_BOOTP
> help
> bootp - boot image via network using BOOTP/TFTP protocol
>
> +config CMD_DHCP
> + bool "dhcp"
> + depends on CMD_BOOTP
> + help
> + Boot image via network using DHCP/TFTP protocol
> +
> config BOOTP_BOOTPATH
> bool "Enable BOOTP BOOTPATH"
> depends on CMD_BOOTP
> @@ -1097,12 +1103,6 @@ config CMD_RARP
> help
> Boot image via network using RARP/TFTP protocol
>
> -config CMD_DHCP
> - bool "dhcp"
> - depends on CMD_BOOTP
> - help
> - Boot image via network using DHCP/TFTP protocol
> -
> config CMD_PXE
> bool "pxe"
> select MENU
> --
> 1.7.11.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options
2018-03-28 20:51 ` [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options Joe Hershberger
@ 2018-03-29 3:18 ` Chris Packham
2018-03-29 3:21 ` Chris Packham
0 siblings, 1 reply; 48+ messages in thread
From: Chris Packham @ 2018-03-29 3:18 UTC (permalink / raw)
To: u-boot
On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> The options were pretty unhelpful, so improve them some.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
Couple of questions below. But with or without changes
Reviewed-by: Chris Packham <judge.packham@gmail.com>
>
> cmd/Kconfig | 19 ++++++++++++++-----
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 7ef9501..76fd111 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1031,23 +1031,32 @@ config CMD_DHCP
> Boot image via network using DHCP/TFTP protocol
>
> config BOOTP_BOOTPATH
> - bool "Enable BOOTP BOOTPATH"
> + bool "Request & store 'rootpath' from BOOTP/DHCP server"
> depends on CMD_BOOTP
> + help
> + Even though the config is called BOOTP_BOOTPATH, it stores the
> + path in the variable 'rootpath'.
>
> config BOOTP_DNS
> - bool "Enable bootp DNS"
> + bool "Request & store 'dnsip' from BOOTP/DHCP server"
> depends on CMD_BOOTP
> + help
> + The primary DNS server is stored as 'dnsip'. If two servers are
> + returned, you must set BOOTP_DNS2 to store that second server IP
> + also.
>
> config BOOTP_GATEWAY
> - bool "Enable BOOTP gateway"
> + bool "Request & store 'gatewayip' from BOOTP/DHCP server"
> depends on CMD_BOOTP
Should this be default y? It would be pretty annoying if you were to
turn on bootp/dhcp and forget to enable this as well.
>
> config BOOTP_HOSTNAME
> - bool "Enable BOOTP hostname"
> + bool "Request & store 'hostname' from BOOTP/DHCP server"
> depends on CMD_BOOTP
> + help
> + The name may or may not be qualified with the local domain name.
>
> config BOOTP_SUBNETMASK
> - bool "Enable BOOTP subnetmask"
> + bool "Request & store 'netmask' from BOOTP/DHCP server"
> depends on CMD_BOOTP
Should this be default y?
>
> config BOOTP_PXE
> --
> 1.7.11.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig
2018-03-28 20:51 ` [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
@ 2018-03-29 3:19 ` Chris Packham
2018-03-29 16:39 ` Duncan Hare
1 sibling, 0 replies; 48+ messages in thread
From: Chris Packham @ 2018-03-29 3:19 UTC (permalink / raw)
To: u-boot
On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Commit 3b3ea2c56ec4bc5 ("Kconfig: cmd: Make networking command dependent on NET")
> removed the help documentation from the README but didn't add it back to Kconfig.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
> ---
>
> cmd/Kconfig | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 76fd111..db75759 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1045,6 +1045,17 @@ config BOOTP_DNS
> returned, you must set BOOTP_DNS2 to store that second server IP
> also.
>
> +config BOOTP_DNS2
> + bool "Store 'dnsip2' from BOOTP/DHCP server"
> + depends on BOOTP_DNS
> + help
> + If a DHCP client requests the DNS server IP from a DHCP server,
> + it is possible that more than one DNS serverip is offered to the
> + client. If CONFIG_BOOTP_DNS2 is enabled, the secondary DNS
> + server IP will be stored in the additional environment
> + variable "dnsip2". The first DNS serverip is always
> + stored in the variable "dnsip", when BOOTP_DNS is defined.
> +
> config BOOTP_GATEWAY
> bool "Request & store 'gatewayip' from BOOTP/DHCP server"
> depends on CMD_BOOTP
> --
> 1.7.11.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options
2018-03-29 3:18 ` Chris Packham
@ 2018-03-29 3:21 ` Chris Packham
0 siblings, 0 replies; 48+ messages in thread
From: Chris Packham @ 2018-03-29 3:21 UTC (permalink / raw)
To: u-boot
On Thu, Mar 29, 2018 at 4:18 PM, Chris Packham <judge.packham@gmail.com> wrote:
> On Thu, Mar 29, 2018 at 9:51 AM, Joe Hershberger <joe.hershberger@ni.com> wrote:
>> The options were pretty unhelpful, so improve them some.
>>
>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>> ---
>
> Couple of questions below. But with or without changes
>
> Reviewed-by: Chris Packham <judge.packham@gmail.com>
>
>>
>> cmd/Kconfig | 19 ++++++++++++++-----
>> 1 file changed, 14 insertions(+), 5 deletions(-)
>>
>> diff --git a/cmd/Kconfig b/cmd/Kconfig
>> index 7ef9501..76fd111 100644
>> --- a/cmd/Kconfig
>> +++ b/cmd/Kconfig
>> @@ -1031,23 +1031,32 @@ config CMD_DHCP
>> Boot image via network using DHCP/TFTP protocol
>>
>> config BOOTP_BOOTPATH
>> - bool "Enable BOOTP BOOTPATH"
>> + bool "Request & store 'rootpath' from BOOTP/DHCP server"
>> depends on CMD_BOOTP
>> + help
>> + Even though the config is called BOOTP_BOOTPATH, it stores the
>> + path in the variable 'rootpath'.
>>
>> config BOOTP_DNS
>> - bool "Enable bootp DNS"
>> + bool "Request & store 'dnsip' from BOOTP/DHCP server"
>> depends on CMD_BOOTP
>> + help
>> + The primary DNS server is stored as 'dnsip'. If two servers are
>> + returned, you must set BOOTP_DNS2 to store that second server IP
>> + also.
>>
>> config BOOTP_GATEWAY
>> - bool "Enable BOOTP gateway"
>> + bool "Request & store 'gatewayip' from BOOTP/DHCP server"
>> depends on CMD_BOOTP
>
> Should this be default y? It would be pretty annoying if you were to
> turn on bootp/dhcp and forget to enable this as well.
>
Never-mind. Should have looked at the whole series :)
>>
>> config BOOTP_HOSTNAME
>> - bool "Enable BOOTP hostname"
>> + bool "Request & store 'hostname' from BOOTP/DHCP server"
>> depends on CMD_BOOTP
>> + help
>> + The name may or may not be qualified with the local domain name.
>>
>> config BOOTP_SUBNETMASK
>> - bool "Enable BOOTP subnetmask"
>> + bool "Request & store 'netmask' from BOOTP/DHCP server"
>> depends on CMD_BOOTP
>
> Should this be default y?
>
>>
>> config BOOTP_PXE
>> --
>> 1.7.11.5
>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (8 preceding siblings ...)
2018-03-28 20:51 ` [U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
@ 2018-03-29 16:18 ` Duncan Hare
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
10 siblings, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:18 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 0/9] net: Clean up the menus and dependencies among commands and options
There have been a few issues persisting in the net menus and a recent
change that went in (Kconfig: cmd: Make networking command dependent on NET)
caused a few new issues. Clean up these things and further move to separate
CMD_NET from NET along appropriate boundaries.
Joe Hershberger (9):
net: Make CMD_NET a menuconfig
net: Move net command options to the cmd menu
net: Move the DHCP command below the BOOTP command
net: Improve menu options and help for BOOTP options
net: Add the BOOTP_DNS2 option to Kconfig
net: Improve BOOTP PXE config option
net: Make the BOOTP options default
net: Make core net code depend on NET instead of CMD_NET
Revert "Kconfig: cmd: Make networking command dependent on NET"
Kconfig | 8 +--
cmd/Kconfig | 113 ++++++++++++++++++++++++++++++++++-----
cmd/bootefi.c | 4 +-
cmd/net.c | 4 ++
lib/efi_loader/Makefile | 2 +-
lib/efi_loader/efi_device_path.c | 2 +-
net/Kconfig | 51 ------------------
net/Makefile | 14 ++---
8 files changed, 116 insertions(+), 82 deletions(-)
--
1.7.11.5
Reviewed by Duncan Hare, dh at synoia.com
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig
2018-03-28 20:51 ` [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig Joe Hershberger
2018-03-29 3:03 ` Chris Packham
@ 2018-03-29 16:19 ` Duncan Hare
1 sibling, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:19 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 1/9] net: Make CMD_NET a menuconfig
Previously, CMD_NET was an alias for 2 commands (bootp and tftpboot) and
they we not able to be disabled. Separate out those 2 commands and move
CMD_NET up to the menu level, which more accurately represents the code.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 25 +++++++++++++++++--------
cmd/net.c | 4 ++++
net/Kconfig | 19 +++++++++----------
net/Makefile | 4 ++--
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 136836d..f2a12ce 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1010,25 +1010,35 @@ config CMD_SETEXPR
endmenu
-menu "Network commands"
-
if NET
-config CMD_NET
- bool "bootp, tftpboot"
+menuconfig CMD_NET
+ bool "Network commands"
+ default y
+
+if CMD_NET
+
+config CMD_BOOTP
+ bool "bootp"
default y
help
- Network commands.
bootp - boot image via network using BOOTP/TFTP protocol
+
+config CMD_TFTPBOOT
+ bool "tftpboot"
+ default y
+ help
tftpboot - boot image via network using TFTP protocol
config CMD_TFTPPUT
bool "tftp put"
+ depends on CMD_TFTPBOOT
help
TFTP put command, for uploading files to a server
config CMD_TFTPSRV
bool "tftpsrv"
+ depends on CMD_TFTPBOOT
help
Act as a TFTP server and boot the first received file
@@ -1039,13 +1049,12 @@ config CMD_RARP
config CMD_DHCP
bool "dhcp"
- depends on CMD_NET
+ depends on CMD_BOOTP
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
- depends on CMD_NET
select MENU
help
Boot image via network using PXE protocol
@@ -1096,7 +1105,7 @@ config CMD_ETHSW
endif
-endmenu
+endif
menu "Misc commands"
diff --git a/cmd/net.c b/cmd/net.c
index d7c776a..67888d4 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -14,6 +14,7 @@
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
+#ifdef CONFIG_CMD_BOOTP
static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
return netboot_common(BOOTP, cmdtp, argc, argv);
@@ -24,7 +25,9 @@ U_BOOT_CMD(
"boot image via network using BOOTP/TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
+#ifdef CONFIG_CMD_TFTPBOOT
int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret;
@@ -40,6 +43,7 @@ U_BOOT_CMD(
"boot image via network using TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
#ifdef CONFIG_CMD_TFTPPUT
static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/net/Kconfig b/net/Kconfig
index 143c441..d421a34 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,7 +24,7 @@ config NETCONSOLE
config NET_TFTP_VARS
bool "Control TFTP timeout and count through environment"
- depends on CMD_NET
+ depends on CMD_TFTPBOOT
default y
help
If set, allows controlling the TFTP timeout through the
@@ -35,39 +35,38 @@ config NET_TFTP_VARS
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_DNS
bool "Enable bootp DNS"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE
bool "Enable BOOTP PXE"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
- depends on CMD_NET
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_NET
+ depends on CMD_BOOTP
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
- depends on CMD_NET
+ depends on CMD_BOOTP
default "U-Boot.armv7" if CPU_V7 || CPU_V7M
default "U-Boot.armv8" if ARM64
default "U-Boot.arm" if ARM
diff --git a/net/Makefile b/net/Makefile
index ae54eee..ed102ec 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -9,7 +9,7 @@
obj-y += checksum.o
obj-$(CONFIG_CMD_NET) += arp.o
-obj-$(CONFIG_CMD_NET) += bootp.o
+obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
@@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_NFS) += nfs.o
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
obj-$(CONFIG_CMD_SNTP) += sntp.o
-obj-$(CONFIG_CMD_NET) += tftp.o
+obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
# Disable this warning as it is triggered by:
# sprintf(buf, index ? "foo%d" : "foo", index)
--
1.7.11.5
Reviewed by Duncan Hare, dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET"
2018-03-28 20:51 ` [U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
@ 2018-03-29 16:32 ` Duncan Hare
0 siblings, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:32 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET"
This reverts the parts of commit 3b3ea2c56ec4bc5588281fd103c744e608f8b25c
where it changed the EFI dependency on NET.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
Kconfig | 2 +-
cmd/bootefi.c | 4 ++--
lib/efi_loader/Makefile | 2 +-
lib/efi_loader/efi_device_path.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Kconfig b/Kconfig
index 17e6212..89f685b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -70,7 +70,7 @@ config DISTRO_DEFAULTS
select CMD_BOOTZ if ARM && !ARM64
select CMD_BOOTI if ARM64
select CMD_DHCP if NET && CMD_NET
- select CMD_PXE if NET && CMD_NET
+ select CMD_PXE if NET
select CMD_EXT2
select CMD_EXT4
select CMD_FAT
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 6546272..7b1c09f 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -42,7 +42,7 @@ static void efi_init_obj_list(void)
#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
efi_gop_register();
#endif
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
efi_net_register();
#endif
#ifdef CONFIG_GENERATE_SMBIOS_TABLE
@@ -450,7 +450,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
bootefi_device_path = efi_dp_from_part(desc, part);
} else {
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
bootefi_device_path = efi_dp_from_eth();
#endif
}
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 2a87d9e..2722265 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -21,5 +21,5 @@ obj-y += efi_file.o efi_variable.o efi_bootmgr.o efi_watchdog.o
obj-$(CONFIG_LCD) += efi_gop.o
obj-$(CONFIG_DM_VIDEO) += efi_gop.o
obj-$(CONFIG_PARTITIONS) += efi_disk.o
-obj-$(CONFIG_CMD_NET) += efi_net.o
+obj-$(CONFIG_NET) += efi_net.o
obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 3c735e6..ecc4eda 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -746,7 +746,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
return start;
}
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
struct efi_device_path *efi_dp_from_eth(void)
{
struct efi_device_path_mac_addr *ndp;
--
1.7.11.5
Reviewed by Duncan Hare dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET
2018-03-28 20:51 ` [U-Boot] [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
@ 2018-03-29 16:33 ` Duncan Hare
0 siblings, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:33 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET
No commands are necessary to have a network stack.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
net/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/Makefile b/net/Makefile
index ed102ec..95e9f63 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -8,18 +8,18 @@
#ccflags-y += -DDEBUG
obj-y += checksum.o
-obj-$(CONFIG_CMD_NET) += arp.o
+obj-$(CONFIG_NET) += arp.o
obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
-obj-$(CONFIG_CMD_NET) += eth-uclass.o
+obj-$(CONFIG_NET) += eth-uclass.o
else
-obj-$(CONFIG_CMD_NET) += eth_legacy.o
+obj-$(CONFIG_NET) += eth_legacy.o
endif
-obj-$(CONFIG_CMD_NET) += eth_common.o
+obj-$(CONFIG_NET) += eth_common.o
obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
-obj-$(CONFIG_CMD_NET) += net.o
+obj-$(CONFIG_NET) += net.o
obj-$(CONFIG_CMD_NFS) += nfs.o
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
--
1.7.11.5
Reviewed by Duncan Hare dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 7/9] net: Make the BOOTP options default
2018-03-28 20:51 ` [U-Boot] [PATCH 7/9] net: Make the BOOTP options default Joe Hershberger
@ 2018-03-29 16:35 ` Duncan Hare
0 siblings, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:35 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 7/9] 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>
---
Kconfig | 6 ------
cmd/Kconfig | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Kconfig b/Kconfig
index 6670913..17e6212 100644
--- a/Kconfig
+++ b/Kconfig
@@ -79,12 +79,6 @@ config DISTRO_DEFAULTS
select CMD_PING if NET
select CMD_PART if PARTITIONS
select HUSH_PARSER
- select BOOTP_BOOTPATH if NET && CMD_NET
- select BOOTP_DNS if NET && CMD_NET
- select BOOTP_GATEWAY if NET && CMD_NET
- select BOOTP_HOSTNAME if NET && CMD_NET
- select BOOTP_PXE if NET && CMD_NET
- select BOOTP_SUBNETMASK if NET && CMD_NET
select CMDLINE_EDITING
select AUTO_COMPLETE
select SYS_LONGHELP
diff --git a/cmd/Kconfig b/cmd/Kconfig
index cc059c4..6eff18f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1032,6 +1032,7 @@ config CMD_DHCP
config BOOTP_BOOTPATH
bool "Request & store 'rootpath' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
Even though the config is called BOOTP_BOOTPATH, it stores the
@@ -1039,6 +1040,7 @@ config BOOTP_BOOTPATH
config BOOTP_DNS
bool "Request & store 'dnsip' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
The primary DNS server is stored as 'dnsip'. If two servers are
@@ -1058,20 +1060,24 @@ config BOOTP_DNS2
config BOOTP_GATEWAY
bool "Request & store 'gatewayip' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Request & store 'hostname' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
The name may or may not be qualified with the local domain name.
config BOOTP_SUBNETMASK
bool "Request & store 'netmask' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
config BOOTP_PXE
bool "Send PXE client arch to BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP && CMD_PXE
help
Supported for ARM, ARM64, and x86 for now.
--
1.7.11.5
Reviewed by: Duncan Hare dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 6/9] net: Improve BOOTP PXE config option
2018-03-28 20:51 ` [U-Boot] [PATCH 6/9] net: Improve BOOTP PXE config option Joe Hershberger
@ 2018-03-29 16:38 ` Duncan Hare
0 siblings, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:38 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 6/9] net: Improve BOOTP PXE config option
Improve the documentation and correct the listed dependencies.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index db75759..cc059c4 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1071,12 +1071,14 @@ config BOOTP_SUBNETMASK
depends on CMD_BOOTP
config BOOTP_PXE
- bool "Enable BOOTP PXE"
- depends on CMD_BOOTP
+ bool "Send PXE client arch to BOOTP/DHCP server"
+ depends on CMD_BOOTP && CMD_PXE
+ help
+ Supported for ARM, ARM64, and x86 for now.
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_BOOTP
+ depends on BOOTP_PXE
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
--
1.7.11.5
Reviewed by: Duncan Hare dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig
2018-03-28 20:51 ` [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
2018-03-29 3:19 ` Chris Packham
@ 2018-03-29 16:39 ` Duncan Hare
1 sibling, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:39 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig
Commit 3b3ea2c56ec4bc5 ("Kconfig: cmd: Make networking command dependent on NET")
removed the help documentation from the README but didn't add it back to Kconfig.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 76fd111..db75759 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1045,6 +1045,17 @@ config BOOTP_DNS
returned, you must set BOOTP_DNS2 to store that second server IP
also.
+config BOOTP_DNS2
+ bool "Store 'dnsip2' from BOOTP/DHCP server"
+ depends on BOOTP_DNS
+ help
+ If a DHCP client requests the DNS server IP from a DHCP server,
+ it is possible that more than one DNS serverip is offered to the
+ client. If CONFIG_BOOTP_DNS2 is enabled, the secondary DNS
+ server IP will be stored in the additional environment
+ variable "dnsip2". The first DNS serverip is always
+ stored in the variable "dnsip", when BOOTP_DNS is defined.
+
config BOOTP_GATEWAY
bool "Request & store 'gatewayip' from BOOTP/DHCP server"
depends on CMD_BOOTP
--
1.7.11.5Joe
Good. Thanks.
Reviewed by: Duncan Hare dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command
2018-03-28 20:51 ` [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command Joe Hershberger
2018-03-29 3:14 ` Chris Packham
@ 2018-03-29 16:51 ` Duncan Hare
1 sibling, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-03-29 16:51 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Wednesday, March 28, 2018 1:53 PM
Subject: [PATCH 3/9] net: Move the DHCP command below the BOOTP command
Move DHCP to directly follow BOOTP so that Kconfig can show the
dependency as a hierarchy.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
cmd/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d714f73..7ef9501 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1024,6 +1024,12 @@ config CMD_BOOTP
help
bootp - boot image via network using BOOTP/TFTP protocol
+config CMD_DHCP
+ bool "dhcp"
+ depends on CMD_BOOTP
+ help
+ Boot image via network using DHCP/TFTP protocol
+
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
depends on CMD_BOOTP
@@ -1097,12 +1103,6 @@ config CMD_RARP
help
Boot image via network using RARP/TFTP protocol
-config CMD_DHCP
- bool "dhcp"
- depends on CMD_BOOTP
- help
- Boot image via network using DHCP/TFTP protocol
-
config CMD_PXE
bool "pxe"
select MENU
--
1.7.11.5
Reviewed by: Duncan Hare dh at synoia.com
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 00/11] net: Clean up the menus and dependencies among commands and options
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
` (9 preceding siblings ...)
2018-03-29 16:18 ` [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Duncan Hare
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 01/11] net: Make CMD_NET a menuconfig Joe Hershberger
` (10 more replies)
10 siblings, 11 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
There have been a few issues persisting in the net menus and a recent
change that went in (Kconfig: cmd: Make networking command dependent on NET)
caused a few new issues. Clean up these things and further move to separate
CMD_NET from NET along appropriate boundaries.
Changes in v2:
- Fixed dependencies on CMD_NET
- Move eth_sw and pxe commands out of cmd_net
- New patch
Joe Hershberger (11):
net: Make CMD_NET a menuconfig
net: Fix distro default dependencies
net: Move net command options to the cmd menu
net: Move the DHCP command below the BOOTP command
net: Improve menu options and help for BOOTP options
net: Add the BOOTP_DNS2 option to Kconfig
net: Improve BOOTP PXE config option
net: Make the BOOTP options default
net: Make core net code depend on NET instead of CMD_NET
Revert "Kconfig: cmd: Make networking command dependent on NET"
xilinx: Only enable dist boot pxe when DHCP is enabled
Kconfig | 12 +---
cmd/Kconfig | 127 +++++++++++++++++++++++++++++++++------
cmd/bootefi.c | 4 +-
cmd/net.c | 4 ++
include/configs/socfpga_common.h | 2 +-
include/configs/xilinx_zynqmp.h | 2 +-
include/configs/zynq-common.h | 2 +-
lib/efi_loader/Makefile | 2 +-
lib/efi_loader/efi_device_path.c | 2 +-
net/Kconfig | 51 ----------------
net/Makefile | 14 ++---
11 files changed, 128 insertions(+), 94 deletions(-)
--
1.7.11.5
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 01/11] net: Make CMD_NET a menuconfig
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 02/11] net: Fix distro default dependencies Joe Hershberger
` (9 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
Previously, CMD_NET was an alias for 2 commands (bootp and tftpboot) and
they we not able to be disabled. Separate out those 2 commands and move
CMD_NET up to the menu level, which more accurately represents the code.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
---
Changes in v2: None
cmd/Kconfig | 25 +++++++++++++++++--------
cmd/net.c | 4 ++++
net/Kconfig | 19 +++++++++----------
net/Makefile | 4 ++--
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d440675..fb74227 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1021,25 +1021,35 @@ config CMD_SETEXPR
endmenu
-menu "Network commands"
-
if NET
-config CMD_NET
- bool "bootp, tftpboot"
+menuconfig CMD_NET
+ bool "Network commands"
+ default y
+
+if CMD_NET
+
+config CMD_BOOTP
+ bool "bootp"
default y
help
- Network commands.
bootp - boot image via network using BOOTP/TFTP protocol
+
+config CMD_TFTPBOOT
+ bool "tftpboot"
+ default y
+ help
tftpboot - boot image via network using TFTP protocol
config CMD_TFTPPUT
bool "tftp put"
+ depends on CMD_TFTPBOOT
help
TFTP put command, for uploading files to a server
config CMD_TFTPSRV
bool "tftpsrv"
+ depends on CMD_TFTPBOOT
help
Act as a TFTP server and boot the first received file
@@ -1050,13 +1060,12 @@ config CMD_RARP
config CMD_DHCP
bool "dhcp"
- depends on CMD_NET
+ depends on CMD_BOOTP
help
Boot image via network using DHCP/TFTP protocol
config CMD_PXE
bool "pxe"
- depends on CMD_NET
select MENU
help
Boot image via network using PXE protocol
@@ -1107,7 +1116,7 @@ config CMD_ETHSW
endif
-endmenu
+endif
menu "Misc commands"
diff --git a/cmd/net.c b/cmd/net.c
index d7c776a..67888d4 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -14,6 +14,7 @@
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
+#ifdef CONFIG_CMD_BOOTP
static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
return netboot_common(BOOTP, cmdtp, argc, argv);
@@ -24,7 +25,9 @@ U_BOOT_CMD(
"boot image via network using BOOTP/TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
+#ifdef CONFIG_CMD_TFTPBOOT
int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret;
@@ -40,6 +43,7 @@ U_BOOT_CMD(
"boot image via network using TFTP protocol",
"[loadAddress] [[hostIPaddr:]bootfilename]"
);
+#endif
#ifdef CONFIG_CMD_TFTPPUT
static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/net/Kconfig b/net/Kconfig
index 143c441..d421a34 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,7 +24,7 @@ config NETCONSOLE
config NET_TFTP_VARS
bool "Control TFTP timeout and count through environment"
- depends on CMD_NET
+ depends on CMD_TFTPBOOT
default y
help
If set, allows controlling the TFTP timeout through the
@@ -35,39 +35,38 @@ config NET_TFTP_VARS
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_DNS
bool "Enable bootp DNS"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_GATEWAY
bool "Enable BOOTP gateway"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Enable BOOTP hostname"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE
bool "Enable BOOTP PXE"
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_SUBNETMASK
bool "Enable BOOTP subnetmask"
- depends on CMD_NET
- depends on CMD_NET
+ depends on CMD_BOOTP
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_NET
+ depends on CMD_BOOTP
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING
string
- depends on CMD_NET
+ depends on CMD_BOOTP
default "U-Boot.armv7" if CPU_V7 || CPU_V7M
default "U-Boot.armv8" if ARM64
default "U-Boot.arm" if ARM
diff --git a/net/Makefile b/net/Makefile
index ae54eee..ed102ec 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -9,7 +9,7 @@
obj-y += checksum.o
obj-$(CONFIG_CMD_NET) += arp.o
-obj-$(CONFIG_CMD_NET) += bootp.o
+obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
@@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_NFS) += nfs.o
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
obj-$(CONFIG_CMD_SNTP) += sntp.o
-obj-$(CONFIG_CMD_NET) += tftp.o
+obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
# Disable this warning as it is triggered by:
# sprintf(buf, index ? "foo%d" : "foo", index)
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 02/11] net: Fix distro default dependencies
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 01/11] net: Make CMD_NET a menuconfig Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu Joe Hershberger
` (8 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
PING requires CMD_NET, not NET.
Also, CMD_NET already depends on NET, so no need to directly depend
on it.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
Changes in v2:
- Fixed dependencies on CMD_NET
- New patch
Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Kconfig b/Kconfig
index 6670913..f319750 100644
--- a/Kconfig
+++ b/Kconfig
@@ -69,14 +69,14 @@ config DISTRO_DEFAULTS
imply USE_BOOTCOMMAND
select CMD_BOOTZ if ARM && !ARM64
select CMD_BOOTI if ARM64
- select CMD_DHCP if NET && CMD_NET
+ select CMD_DHCP if CMD_NET
+ select CMD_PING if CMD_NET
select CMD_PXE if NET && CMD_NET
select CMD_EXT2
select CMD_EXT4
select CMD_FAT
select CMD_FS_GENERIC
imply CMD_MII if NET
- select CMD_PING if NET
select CMD_PART if PARTITIONS
select HUSH_PARSER
select BOOTP_BOOTPATH if NET && CMD_NET
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 01/11] net: Make CMD_NET a menuconfig Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 02/11] net: Fix distro default dependencies Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-14 2:06 ` Duncan Hare
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 04/11] net: Move the DHCP command below the BOOTP command Joe Hershberger
` (7 subsequent siblings)
10 siblings, 2 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
Options that controlled the tftp and bootp commands depended on their
commands, but lived in the net menu.
Move them so they are in a consistent location.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
---
Changes in v2:
- Move eth_sw and pxe commands out of cmd_net
cmd/Kconfig | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
net/Kconfig | 50 -----------------------------------------------
2 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index fb74227..7f47819 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1035,6 +1035,45 @@ config CMD_BOOTP
help
bootp - boot image via network using BOOTP/TFTP protocol
+config BOOTP_BOOTPATH
+ bool "Enable BOOTP BOOTPATH"
+ depends on CMD_BOOTP
+
+config BOOTP_DNS
+ bool "Enable bootp DNS"
+ depends on CMD_BOOTP
+
+config BOOTP_GATEWAY
+ bool "Enable BOOTP gateway"
+ depends on CMD_BOOTP
+
+config BOOTP_HOSTNAME
+ bool "Enable BOOTP hostname"
+ depends on CMD_BOOTP
+
+config BOOTP_SUBNETMASK
+ bool "Enable BOOTP subnetmask"
+ depends on CMD_BOOTP
+
+config BOOTP_PXE
+ bool "Enable BOOTP PXE"
+ depends on CMD_BOOTP
+
+config BOOTP_PXE_CLIENTARCH
+ hex
+ depends on CMD_BOOTP
+ default 0x16 if ARM64
+ default 0x15 if ARM
+ default 0 if X86
+
+config BOOTP_VCI_STRING
+ string
+ depends on CMD_BOOTP
+ default "U-Boot.armv7" if CPU_V7 || CPU_V7M
+ default "U-Boot.armv8" if ARM64
+ default "U-Boot.arm" if ARM
+ default "U-Boot"
+
config CMD_TFTPBOOT
bool "tftpboot"
default y
@@ -1053,6 +1092,17 @@ config CMD_TFTPSRV
help
Act as a TFTP server and boot the first received file
+config NET_TFTP_VARS
+ bool "Control TFTP timeout and count through environment"
+ depends on CMD_TFTPBOOT
+ default y
+ help
+ If set, allows controlling the TFTP timeout through the
+ environment variable tftptimeout, and the TFTP maximum
+ timeout count through the variable tftptimeoutcountmax.
+ If unset, timeout and maximum are hard-defined as 1 second
+ and 10 timouts per TFTP transfer.
+
config CMD_RARP
bool "rarpboot"
help
@@ -1064,12 +1114,6 @@ config CMD_DHCP
help
Boot image via network using DHCP/TFTP protocol
-config CMD_PXE
- bool "pxe"
- select MENU
- help
- Boot image via network using PXE protocol
-
config CMD_NFS
bool "nfs"
default y
@@ -1106,6 +1150,8 @@ config CMD_LINK_LOCAL
help
Acquire a network IP address using the link-local protocol
+endif
+
config CMD_ETHSW
bool "ethsw"
help
@@ -1114,7 +1160,11 @@ config CMD_ETHSW
operations such as enabling / disabling a port and
viewing/maintaining the filtering database (FDB)
-endif
+config CMD_PXE
+ bool "pxe"
+ select MENU
+ help
+ Boot image via network using PXE protocol
endif
diff --git a/net/Kconfig b/net/Kconfig
index d421a34..f2363e5 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -22,54 +22,4 @@ config NETCONSOLE
Support the 'nc' input/output device for networked console.
See README.NetConsole for details.
-config NET_TFTP_VARS
- bool "Control TFTP timeout and count through environment"
- depends on CMD_TFTPBOOT
- default y
- help
- If set, allows controlling the TFTP timeout through the
- environment variable tftptimeout, and the TFTP maximum
- timeout count through the variable tftptimeoutcountmax.
- If unset, timeout and maximum are hard-defined as 1 second
- and 10 timouts per TFTP transfer.
-
-config BOOTP_BOOTPATH
- bool "Enable BOOTP BOOTPATH"
- depends on CMD_BOOTP
-
-config BOOTP_DNS
- bool "Enable bootp DNS"
- depends on CMD_BOOTP
-
-config BOOTP_GATEWAY
- bool "Enable BOOTP gateway"
- depends on CMD_BOOTP
-
-config BOOTP_HOSTNAME
- bool "Enable BOOTP hostname"
- depends on CMD_BOOTP
-
-config BOOTP_PXE
- bool "Enable BOOTP PXE"
- depends on CMD_BOOTP
-
-config BOOTP_SUBNETMASK
- bool "Enable BOOTP subnetmask"
- depends on CMD_BOOTP
-
-config BOOTP_PXE_CLIENTARCH
- hex
- depends on CMD_BOOTP
- default 0x16 if ARM64
- default 0x15 if ARM
- default 0 if X86
-
-config BOOTP_VCI_STRING
- string
- depends on CMD_BOOTP
- default "U-Boot.armv7" if CPU_V7 || CPU_V7M
- default "U-Boot.armv8" if ARM64
- default "U-Boot.arm" if ARM
- default "U-Boot"
-
endif # if NET
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 04/11] net: Move the DHCP command below the BOOTP command
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (2 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 05/11] net: Improve menu options and help for BOOTP options Joe Hershberger
` (6 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
Move DHCP to directly follow BOOTP so that Kconfig can show the
dependency as a hierarchy.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
---
Changes in v2: None
cmd/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7f47819..a89d5ac 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1035,6 +1035,12 @@ config CMD_BOOTP
help
bootp - boot image via network using BOOTP/TFTP protocol
+config CMD_DHCP
+ bool "dhcp"
+ depends on CMD_BOOTP
+ help
+ Boot image via network using DHCP/TFTP protocol
+
config BOOTP_BOOTPATH
bool "Enable BOOTP BOOTPATH"
depends on CMD_BOOTP
@@ -1108,12 +1114,6 @@ config CMD_RARP
help
Boot image via network using RARP/TFTP protocol
-config CMD_DHCP
- bool "dhcp"
- depends on CMD_BOOTP
- help
- Boot image via network using DHCP/TFTP protocol
-
config CMD_NFS
bool "nfs"
default y
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 05/11] net: Improve menu options and help for BOOTP options
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (3 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 04/11] net: Move the DHCP command below the BOOTP command Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 06/11] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
` (5 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
The options were pretty unhelpful, so improve them some.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
---
Changes in v2: None
cmd/Kconfig | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index a89d5ac..6664379 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1042,23 +1042,32 @@ config CMD_DHCP
Boot image via network using DHCP/TFTP protocol
config BOOTP_BOOTPATH
- bool "Enable BOOTP BOOTPATH"
+ bool "Request & store 'rootpath' from BOOTP/DHCP server"
depends on CMD_BOOTP
+ help
+ Even though the config is called BOOTP_BOOTPATH, it stores the
+ path in the variable 'rootpath'.
config BOOTP_DNS
- bool "Enable bootp DNS"
+ bool "Request & store 'dnsip' from BOOTP/DHCP server"
depends on CMD_BOOTP
+ help
+ The primary DNS server is stored as 'dnsip'. If two servers are
+ returned, you must set BOOTP_DNS2 to store that second server IP
+ also.
config BOOTP_GATEWAY
- bool "Enable BOOTP gateway"
+ bool "Request & store 'gatewayip' from BOOTP/DHCP server"
depends on CMD_BOOTP
config BOOTP_HOSTNAME
- bool "Enable BOOTP hostname"
+ bool "Request & store 'hostname' from BOOTP/DHCP server"
depends on CMD_BOOTP
+ help
+ The name may or may not be qualified with the local domain name.
config BOOTP_SUBNETMASK
- bool "Enable BOOTP subnetmask"
+ bool "Request & store 'netmask' from BOOTP/DHCP server"
depends on CMD_BOOTP
config BOOTP_PXE
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 06/11] net: Add the BOOTP_DNS2 option to Kconfig
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (4 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 05/11] net: Improve menu options and help for BOOTP options Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 07/11] net: Improve BOOTP PXE config option Joe Hershberger
` (4 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
Commit 3b3ea2c56ec4bc5 ("Kconfig: cmd: Make networking command dependent on NET")
removed the help documentation from the README but didn't add it back to Kconfig.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
---
Changes in v2: None
cmd/Kconfig | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 6664379..43efe7d 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1056,6 +1056,17 @@ config BOOTP_DNS
returned, you must set BOOTP_DNS2 to store that second server IP
also.
+config BOOTP_DNS2
+ bool "Store 'dnsip2' from BOOTP/DHCP server"
+ depends on BOOTP_DNS
+ help
+ If a DHCP client requests the DNS server IP from a DHCP server,
+ it is possible that more than one DNS serverip is offered to the
+ client. If CONFIG_BOOTP_DNS2 is enabled, the secondary DNS
+ server IP will be stored in the additional environment
+ variable "dnsip2". The first DNS serverip is always
+ stored in the variable "dnsip", when BOOTP_DNS is defined.
+
config BOOTP_GATEWAY
bool "Request & store 'gatewayip' from BOOTP/DHCP server"
depends on CMD_BOOTP
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 07/11] net: Improve BOOTP PXE config option
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (5 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 06/11] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 08/11] net: Make the BOOTP options default Joe Hershberger
` (3 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
Improve the documentation and correct the listed dependencies.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
---
Changes in v2: None
cmd/Kconfig | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 43efe7d..0d077bd 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1082,12 +1082,14 @@ config BOOTP_SUBNETMASK
depends on CMD_BOOTP
config BOOTP_PXE
- bool "Enable BOOTP PXE"
- depends on CMD_BOOTP
+ bool "Send PXE client arch to BOOTP/DHCP server"
+ depends on CMD_BOOTP && CMD_PXE
+ help
+ Supported for ARM, ARM64, and x86 for now.
config BOOTP_PXE_CLIENTARCH
hex
- depends on CMD_BOOTP
+ depends on BOOTP_PXE
default 0x16 if ARM64
default 0x15 if ARM
default 0 if X86
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 08/11] net: Make the BOOTP options default
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (6 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 07/11] net: Improve BOOTP PXE config option Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 09/11] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
` (2 subsequent siblings)
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
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>
---
Changes in v2: None
Kconfig | 6 ------
cmd/Kconfig | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Kconfig b/Kconfig
index f319750..0b73006 100644
--- a/Kconfig
+++ b/Kconfig
@@ -79,12 +79,6 @@ config DISTRO_DEFAULTS
imply CMD_MII if NET
select CMD_PART if PARTITIONS
select HUSH_PARSER
- select BOOTP_BOOTPATH if NET && CMD_NET
- select BOOTP_DNS if NET && CMD_NET
- select BOOTP_GATEWAY if NET && CMD_NET
- select BOOTP_HOSTNAME if NET && CMD_NET
- select BOOTP_PXE if NET && CMD_NET
- select BOOTP_SUBNETMASK if NET && CMD_NET
select CMDLINE_EDITING
select AUTO_COMPLETE
select SYS_LONGHELP
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0d077bd..bc1d2f3 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1043,6 +1043,7 @@ config CMD_DHCP
config BOOTP_BOOTPATH
bool "Request & store 'rootpath' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
Even though the config is called BOOTP_BOOTPATH, it stores the
@@ -1050,6 +1051,7 @@ config BOOTP_BOOTPATH
config BOOTP_DNS
bool "Request & store 'dnsip' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
The primary DNS server is stored as 'dnsip'. If two servers are
@@ -1069,20 +1071,24 @@ config BOOTP_DNS2
config BOOTP_GATEWAY
bool "Request & store 'gatewayip' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
config BOOTP_HOSTNAME
bool "Request & store 'hostname' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
help
The name may or may not be qualified with the local domain name.
config BOOTP_SUBNETMASK
bool "Request & store 'netmask' from BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP
config BOOTP_PXE
bool "Send PXE client arch to BOOTP/DHCP server"
+ default y
depends on CMD_BOOTP && CMD_PXE
help
Supported for ARM, ARM64, and x86 for now.
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 09/11] net: Make core net code depend on NET instead of CMD_NET
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (7 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 08/11] net: Make the BOOTP options default Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 10/11] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 11/11] xilinx: Only enable dist boot pxe when DHCP is enabled Joe Hershberger
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
No commands are necessary to have a network stack.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
---
Changes in v2: None
net/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/Makefile b/net/Makefile
index ed102ec..ce6e5ad 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -8,18 +8,18 @@
#ccflags-y += -DDEBUG
obj-y += checksum.o
-obj-$(CONFIG_CMD_NET) += arp.o
+obj-$(CONFIG_NET) += arp.o
obj-$(CONFIG_CMD_BOOTP) += bootp.o
obj-$(CONFIG_CMD_CDP) += cdp.o
obj-$(CONFIG_CMD_DNS) += dns.o
ifdef CONFIG_DM_ETH
-obj-$(CONFIG_CMD_NET) += eth-uclass.o
+obj-$(CONFIG_NET) += eth-uclass.o
else
-obj-$(CONFIG_CMD_NET) += eth_legacy.o
+obj-$(CONFIG_NET) += eth_legacy.o
endif
-obj-$(CONFIG_CMD_NET) += eth_common.o
+obj-$(CONFIG_NET) += eth_common.o
obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
-obj-$(CONFIG_CMD_NET) += net.o
+obj-$(CONFIG_NET) += net.o
obj-$(CONFIG_CMD_NFS) += nfs.o
obj-$(CONFIG_CMD_PING) += ping.o
obj-$(CONFIG_CMD_RARP) += rarp.o
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 10/11] Revert "Kconfig: cmd: Make networking command dependent on NET"
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (8 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 09/11] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 11/11] xilinx: Only enable dist boot pxe when DHCP is enabled Joe Hershberger
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
This reverts the parts of commit 3b3ea2c56ec4bc5588281fd103c744e608f8b25c
where it changed the EFI dependency on NET.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Duncan Hare <dh@synoia.com>
---
Changes in v2: None
Kconfig | 2 +-
cmd/bootefi.c | 4 ++--
lib/efi_loader/Makefile | 2 +-
lib/efi_loader/efi_device_path.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Kconfig b/Kconfig
index 0b73006..081be6c 100644
--- a/Kconfig
+++ b/Kconfig
@@ -71,7 +71,7 @@ config DISTRO_DEFAULTS
select CMD_BOOTI if ARM64
select CMD_DHCP if CMD_NET
select CMD_PING if CMD_NET
- select CMD_PXE if NET && CMD_NET
+ select CMD_PXE if NET
select CMD_EXT2
select CMD_EXT4
select CMD_FAT
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 5a2a810..5498a5f 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -56,7 +56,7 @@ efi_status_t efi_init_obj_list(void)
if (ret != EFI_SUCCESS)
goto out;
#endif
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
ret = efi_net_register();
if (ret != EFI_SUCCESS)
goto out;
@@ -511,7 +511,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
bootefi_device_path = efi_dp_from_part(desc, part);
} else {
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
bootefi_device_path = efi_dp_from_eth();
#endif
}
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index d2ce897..55c97c0 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -22,5 +22,5 @@ obj-y += efi_watchdog.o
obj-$(CONFIG_LCD) += efi_gop.o
obj-$(CONFIG_DM_VIDEO) += efi_gop.o
obj-$(CONFIG_PARTITIONS) += efi_disk.o
-obj-$(CONFIG_CMD_NET) += efi_net.o
+obj-$(CONFIG_NET) += efi_net.o
obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index ab28b2f..e965f1d 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -747,7 +747,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
return start;
}
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
struct efi_device_path *efi_dp_from_eth(void)
{
#ifndef CONFIG_DM_ETH
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 11/11] xilinx: Only enable dist boot pxe when DHCP is enabled
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
` (9 preceding siblings ...)
2018-04-13 20:26 ` [U-Boot] [PATCH v2 10/11] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
@ 2018-04-13 20:26 ` Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
10 siblings, 1 reply; 48+ messages in thread
From: Joe Hershberger @ 2018-04-13 20:26 UTC (permalink / raw)
To: u-boot
Otherwise, we see this:
In file included from include/configs/zynq-common.h:183:0,
from include/config.h:5,
from include/common.h:21,
from env/common.c:11:
include/config_distro_bootcmd.h:319:2: error: expected ?}? before ?BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE?
BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE
^
include/config_distro_bootcmd.h:319:2: note: in definition of macro ?BOOTENV_DEV_NAME_PXE?
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
Changes in v2:
- New patch
include/configs/socfpga_common.h | 2 +-
include/configs/xilinx_zynqmp.h | 2 +-
include/configs/zynq-common.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 6580ffc..cf1f2b1 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -292,7 +292,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#define BOOT_TARGET_DEVICES_DHCP(func)
#endif
-#ifdef CONFIG_CMD_PXE
+#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_DEVICES_PXE(func)
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 56c8b0c..5827911 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -172,7 +172,7 @@
# define BOOT_TARGET_DEVICES_USB(func)
#endif
-#if defined(CONFIG_CMD_PXE)
+#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
# define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
#else
# define BOOT_TARGET_DEVICES_PXE(func)
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 6d99249..ae82a7a 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -162,7 +162,7 @@
#define BOOT_TARGET_DEVICES_USB(func)
#endif
-#if defined(CONFIG_CMD_PXE)
+#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_DEVICES_PXE(func)
--
1.7.11.5
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu
2018-04-13 20:26 ` [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu Joe Hershberger
@ 2018-04-14 2:06 ` Duncan Hare
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
1 sibling, 0 replies; 48+ messages in thread
From: Duncan Hare @ 2018-04-14 2:06 UTC (permalink / raw)
To: u-boot
From: Joe Hershberger <joe.hershberger@ni.com>
To: u-boot at lists.denx.de
Cc: Heinrich <Schuchardt.xypron.debian@gmx.de>; Michal Simek <michal.simek@xilinx.com>; Simon Glass <sjg@chromium.org>; Duncan Hare <dh@synoia.com>; Chris Packham <judge.packham@gmail.com>; Tom Rini <trini@konsulko.com>; Maxime Ripard <maxime.ripard@bootlin.com>; Joe Hershberger <joe.hershberger@ni.com>
Sent: Friday, April 13, 2018 1:28 PM
Subject: [PATCH v2 03/11] net: Move net command options to the cmd menu
Options that controlled the tftp and bootp commands depended on their
commands, but lived in the net menu.
Move them so they are in a consistent location.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>Reviewed-by: Duncan Hare <dh@synoia.com>
config CMD_NFS
bool "nfs"
default y
help
Acquire a network IP address using the link-local protocol
Should Help text be
"Transfer file with NFS Protocol" ?
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Make CMD_NET a menuconfig
2018-04-13 20:26 ` [U-Boot] [PATCH v2 01/11] net: Make CMD_NET a menuconfig Joe Hershberger
@ 2018-04-15 4:16 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:16 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898098/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Fix distro default dependencies
2018-04-13 20:26 ` [U-Boot] [PATCH v2 02/11] net: Fix distro default dependencies Joe Hershberger
@ 2018-04-15 4:16 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:16 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898100/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Move net command options to the cmd menu
2018-04-13 20:26 ` [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu Joe Hershberger
2018-04-14 2:06 ` Duncan Hare
@ 2018-04-15 4:16 ` Joe Hershberger
1 sibling, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:16 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898095/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Move the DHCP command below the BOOTP command
2018-04-13 20:26 ` [U-Boot] [PATCH v2 04/11] net: Move the DHCP command below the BOOTP command Joe Hershberger
@ 2018-04-15 4:16 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:16 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898093/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Improve menu options and help for BOOTP options
2018-04-13 20:26 ` [U-Boot] [PATCH v2 05/11] net: Improve menu options and help for BOOTP options Joe Hershberger
@ 2018-04-15 4:16 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:16 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898099/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Add the BOOTP_DNS2 option to Kconfig
2018-04-13 20:26 ` [U-Boot] [PATCH v2 06/11] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
@ 2018-04-15 4:17 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:17 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898101/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Improve BOOTP PXE config option
2018-04-13 20:26 ` [U-Boot] [PATCH v2 07/11] net: Improve BOOTP PXE config option Joe Hershberger
@ 2018-04-15 4:17 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:17 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898094/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Make the BOOTP options default
2018-04-13 20:26 ` [U-Boot] [PATCH v2 08/11] net: Make the BOOTP options default Joe Hershberger
@ 2018-04-15 4:17 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:17 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898096/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] net: Make core net code depend on NET instead of CMD_NET
2018-04-13 20:26 ` [U-Boot] [PATCH v2 09/11] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
@ 2018-04-15 4:17 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:17 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898103/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] Revert "Kconfig: cmd: Make networking command dependent on NET"
2018-04-13 20:26 ` [U-Boot] [PATCH v2 10/11] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
@ 2018-04-15 4:17 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:17 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898102/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
* [U-Boot] xilinx: Only enable dist boot pxe when DHCP is enabled
2018-04-13 20:26 ` [U-Boot] [PATCH v2 11/11] xilinx: Only enable dist boot pxe when DHCP is enabled Joe Hershberger
@ 2018-04-15 4:17 ` Joe Hershberger
0 siblings, 0 replies; 48+ messages in thread
From: Joe Hershberger @ 2018-04-15 4:17 UTC (permalink / raw)
To: u-boot
Hi Joe,
https://patchwork.ozlabs.org/patch/898097/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2018-04-15 4:17 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-28 20:51 [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Joe Hershberger
2018-03-28 20:51 ` [U-Boot] [PATCH 1/9] net: Make CMD_NET a menuconfig Joe Hershberger
2018-03-29 3:03 ` Chris Packham
2018-03-29 16:19 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 2/9] net: Move net command options to the cmd menu Joe Hershberger
2018-03-29 3:05 ` Chris Packham
2018-03-28 20:51 ` [U-Boot] [PATCH 3/9] net: Move the DHCP command below the BOOTP command Joe Hershberger
2018-03-29 3:14 ` Chris Packham
2018-03-29 16:51 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 4/9] net: Improve menu options and help for BOOTP options Joe Hershberger
2018-03-29 3:18 ` Chris Packham
2018-03-29 3:21 ` Chris Packham
2018-03-28 20:51 ` [U-Boot] [PATCH 5/9] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
2018-03-29 3:19 ` Chris Packham
2018-03-29 16:39 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 6/9] net: Improve BOOTP PXE config option Joe Hershberger
2018-03-29 16:38 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 7/9] net: Make the BOOTP options default Joe Hershberger
2018-03-29 16:35 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 8/9] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
2018-03-29 16:33 ` Duncan Hare
2018-03-28 20:51 ` [U-Boot] [PATCH 9/9] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
2018-03-29 16:32 ` Duncan Hare
2018-03-29 16:18 ` [U-Boot] [PATCH 0/9] net: Clean up the menus and dependencies among commands and options Duncan Hare
2018-04-13 20:26 ` [U-Boot] [PATCH v2 00/11] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 01/11] net: Make CMD_NET a menuconfig Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 02/11] net: Fix distro default dependencies Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 03/11] net: Move net command options to the cmd menu Joe Hershberger
2018-04-14 2:06 ` Duncan Hare
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 04/11] net: Move the DHCP command below the BOOTP command Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 05/11] net: Improve menu options and help for BOOTP options Joe Hershberger
2018-04-15 4:16 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 06/11] net: Add the BOOTP_DNS2 option to Kconfig Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 07/11] net: Improve BOOTP PXE config option Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 08/11] net: Make the BOOTP options default Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 09/11] net: Make core net code depend on NET instead of CMD_NET Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 10/11] Revert "Kconfig: cmd: Make networking command dependent on NET" Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
2018-04-13 20:26 ` [U-Boot] [PATCH v2 11/11] xilinx: Only enable dist boot pxe when DHCP is enabled Joe Hershberger
2018-04-15 4:17 ` [U-Boot] " Joe Hershberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.