From patchwork Fri Jul 3 14:06:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1322393 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ktA5oX9P; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49yxbf3N4jz9sR4 for ; Sat, 4 Jul 2020 00:06:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6B05081B54; Fri, 3 Jul 2020 16:06:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ktA5oX9P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 118E381BB6; Fri, 3 Jul 2020 16:06:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E07C281B47 for ; Fri, 3 Jul 2020 16:06:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-il1-x142.google.com with SMTP id x9so27414634ila.3 for ; Fri, 03 Jul 2020 07:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PQ9kL/qzeAmMF14iGPnEYOU9m06uN7JspabBgcQPyZA=; b=ktA5oX9PdB6FV/u2sUhgL84EglubF9mpnohqpq0m3mC/jQRuernOg4PX7kHZ/Mn/Fo Ph1axQ5QFrAe8fTEWWNozg7tK0wqhtE4KeQ8xhQPwAerqMnHNtT7K4gROKHCXCSAf2cu g5WgDRWEA8nZ3KzISnTXLwYI7fJoGgN8broh+FK/nby566frdQLAhBwyptXPFeyUQKsY kfxeV4MuYDkcdwc0D5xazkUmImEJQ4b+XnDeS5sYNoi7lBvXMhBPtCuv6tJmUGxgfYAN A0SQrIH0xhqlE29cWKP1foL9XC4r8wO4HtLL1OHkCekXUtLfbDPb7NGqdpbw6P2dnL6B 8AdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PQ9kL/qzeAmMF14iGPnEYOU9m06uN7JspabBgcQPyZA=; b=see7UBR/p7+Ssj0IByBl6WNmmAaUsIadFAV4r8GAGIOKiaYuHlzhtv9lAi6hIzFG70 /85/MLn8HkcwjZI8jLxEJ5ib2mRSw+iRxhKSULsLRA3VZEV389FLCSIuunFWWeihGFYH xwXTE9hftNB9AvyORM+VxHvef0ZpLd09a0WHuanuAlvyp6RQA+VZDysLrUU83trkRNAw aOWGPbxcqwSrH1mtkILEW5mtaTqQsVl2LTG3E2zaTxWobNIz3s0X4j4kzg+l/2IhHLgs Yf0M0NRKa7+Tf93E0AqQ64G+K1U/sKU2NOJkeU0HyCfhwIQKVabZdvSsJrDE/9eXI4u0 8pXQ== X-Gm-Message-State: AOAM531mUXnVWxwpc8epnqy/PUg7qoIXiH3sCfhUZkdzGOrOPTkujXMJ 7M8r2ieL7rw25sEMa+6vddlVDGNS X-Google-Smtp-Source: ABdhPJyn9xE90ob1pSdKjvlAz85Yx//CTJ7z46hYONVZVsSjOqxhDcVrbGGq31EoGH0wZ4V6ZNTedQ== X-Received: by 2002:a92:d4cf:: with SMTP id o15mr18404939ilm.25.1593785203360; Fri, 03 Jul 2020 07:06:43 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id b21sm5965457ioc.36.2020.07.03.07.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2020 07:06:42 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: Adam Ford Subject: [PATCH] configs: Remove dead CONFIG options Date: Fri, 3 Jul 2020 09:06:36 -0500 Message-Id: <20200703140636.586465-1-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 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