Hi Sean, Tom, On Sat, 18 Dec 2021 at 09:50, Tom Rini <tr...@konsulko.com> wrote: > > On Sat, Dec 18, 2021 at 10:15:08AM -0500, Sean Anderson wrote: > > On 12/18/21 10:08 AM, Simon Glass wrote: > > > This converts the following to Kconfig: > > > CONFIG_KEEP_SERVERADDR > > > > > > Drop the preprocessor usage also. > > > > > > Signed-off-by: Simon Glass <s...@chromium.org> > > > --- > > > > > > README | 6 ------ > > > include/configs/sandbox.h | 1 - > > > net/Kconfig | 9 +++++++++ > > > net/arp.c | 5 ++--- > > > scripts/config_whitelist.txt | 1 - > > > 5 files changed, 11 insertions(+), 11 deletions(-) > > > > > > diff --git a/README b/README > > > index 056b717557b..eaf9170e952 100644 > > > --- a/README > > > +++ b/README > > > @@ -1193,12 +1193,6 @@ The following options need to be configured: > > > server to contact when using the "tftboot" command. > > > (Environment variable "serverip") > > > - CONFIG_KEEP_SERVERADDR > > > - > > > - Keeps the server's MAC address, in the env 'serveraddr' > > > - for passing to bootargs (like Linux's netconsole option) > > > - > > > -- Gateway IP address: > > > CONFIG_GATEWAYIP > > > Defines a default value for the IP address of the > > > diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h > > > index cd7d99ec69c..1dd21d5e925 100644 > > > --- a/include/configs/sandbox.h > > > +++ b/include/configs/sandbox.h > > > @@ -25,7 +25,6 @@ > > > #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ > > > 115200} > > > -#define CONFIG_KEEP_SERVERADDR > > > #define CONFIG_UDP_CHECKSUM > > > #define CONFIG_TIMESTAMP > > > #define CONFIG_BOOTP_SERVERIP > > > diff --git a/net/Kconfig b/net/Kconfig > > > index 7a2d1450188..fb6420f9bbe 100644 > > > --- a/net/Kconfig > > > +++ b/net/Kconfig > > > @@ -98,4 +98,13 @@ config SERVERIP_FROM_PROXYDHCP_DELAY_MS > > > receiving response from main DHCP server. Has no effect if > > > SERVERIP_FROM_PROXYDHCP is false. > > > +config KEEP_SERVERADDR > > > + bool "Write the server's MAC address to 'serveraddr'" > > > + default y if SANDBOX > > > + help > > > + Keeps the server's MAC address, in the env 'serveraddr' > > > + for passing to bootargs (like Linux's netconsole option). If this is > > > + enabled, when an ARP reply is received, the server's IP address is > > > + written there. > > > + > > > > This loses a bit of context originally present in the README. Can you note > > that > > this is the TFTP server's address we are keeping? > > It also removes a wrong line in the README. In general, you need to be > extra careful with moveconfig.py and README contents.
Actually the problem is that I sent the wrong series, the one before before I fixed it up and pushed to gitlab: https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/10306 It is also missing a patch at the end. I suppose I forgot to select the correct branch when sending (I send on a different machine). I'll try again. Regards, Simon