[PATCH] configs: Remove dead CONFIG options

[PATCH] configs: Remove dead CONFIG options

[Adam Ford]

BOOTP_DEFAULT is defined in several boards, but this config
option is never checked or used.

This patch removes this config option from config files and
the whitelist.txt

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index c88067c012..7240ff6901 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -239,7 +239,6 @@
 #undef CONFIG_TIMER
 #endif
 
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_NET_RETRY_COUNT         10
 
 /* I2C configuration */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index a0d815db32..5d36a1429f 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -34,7 +34,6 @@
 /* I2C */
 
 /* Ethernet */
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_NET_RETRY_COUNT		10
 
 /* Board NAND Info. */
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 6788cb01f6..8355b4abc0 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -192,7 +192,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* CPSW Ethernet */
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_NET_RETRY_COUNT		10
 #endif
 
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 857a5d86dd..73205d0de6 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -43,7 +43,6 @@
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
 /* CPSW Ethernet support */
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_SYS_RX_ETH_BUFFER	64
 
 /* USB support */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 6d552b09d4..a37359e6c3 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -152,7 +152,6 @@
  * Network & Ethernet Configuration
  */
 #ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_NET_RETRY_COUNT	10
 #endif
 
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index fc5a8c672b..e48283f685 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -165,7 +165,6 @@
  * 0x442000 - 0x800000 : Userland
  */
 
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_NET_RETRY_COUNT         10
 
 /* NAND support */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index cb20dc01b7..cfc2be7b9f 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -66,7 +66,6 @@
 #define CONFIG_SYS_SPI_CLK		ks_clk_get_rate(KS2_CLK1_6)
 
 /* Network Configuration */
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_NET_RETRY_COUNT		32
 #define CONFIG_SYS_SGMII_REFCLK_MHZ	312
 #define CONFIG_SYS_SGMII_LINERATE_MHZ	1250
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 131678ffb7..b6165c1361 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -126,7 +126,6 @@ CONFIG_BOOTMODE
 CONFIG_BOOTP_
 CONFIG_BOOTP_BOOTFILE
 CONFIG_BOOTP_BOOTFILESIZE
-CONFIG_BOOTP_DEFAULT
 CONFIG_BOOTP_DHCP_REQUEST_DELAY
 CONFIG_BOOTP_ID_CACHE_SIZE
 CONFIG_BOOTP_MAY_FAIL
-- 
2.25.1

[PATCH] configs: Remove dead CONFIG options

[Tom Rini]

On Fri, Jul 03, 2020 at 09:06:36AM -0500, Adam Ford wrote:

> BOOTP_DEFAULT is defined in several boards, but this config
> option is never checked or used.
> 
> This patch removes this config option from config files and
> the whitelist.txt
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
> index c88067c012..7240ff6901 100644

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200728/8e4734f2/attachment.sig>