From 9b23c73d5e044aa19883b6528f549fff227f6703 Mon Sep 17 00:00:00 2001 From: Chris Packham <judge.packham@gmail.com> Date: Thu, 3 May 2018 20:19:02 +1200 Subject: [PATCH] net: Add Kconfig option for BOOTP_NTPSERVER Add a Kconfig option for BOOTP_NTPSERVER to enable the DHCP/BOOTP option to configure the sntp server address. Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> --- cmd/Kconfig | 4 ++++ configs/devkit8000_defconfig | 1 + include/configs/devkit8000.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index eb14e08f77..38406fcfda 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1094,6 +1094,10 @@ config BOOTP_SUBNETMASK default y depends on CMD_BOOTP +config BOOTP_NTPSERVER + bool "Request & store 'ntpserverip' from BOOTP/DHCP server" + depends on CMD_BOOTP + config BOOTP_PXE bool "Send PXE client arch to BOOTP/DHCP server" default y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index defed2d65a..4a096b9265 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set +CONFIG_BOOTP_NTPSERVER=y CONFIG_CMD_JFFS2=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 748e456c39..f36dc2dc2c 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -76,7 +76,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_NTPSERVER #define CONFIG_BOOTP_TIMEOFFSET #undef CONFIG_BOOTP_VENDOREX diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bdbfcbeb70..71df6dbebd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -156,7 +156,6 @@ CONFIG_BOOTP_DHCP_REQUEST_DELAY CONFIG_BOOTP_ID_CACHE_SIZE CONFIG_BOOTP_MAY_FAIL CONFIG_BOOTP_NISDOMAIN -CONFIG_BOOTP_NTPSERVER CONFIG_BOOTP_RANDOM_DELAY CONFIG_BOOTP_SEND_HOSTNAME CONFIG_BOOTP_SERVERIP -- 2.39.5