From patchwork Sat May 28 23:13:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1636635 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=jUlljxZt; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L9ctd18QHz9s75 for ; Sun, 29 May 2022 09:14:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F69984398; Sun, 29 May 2022 01:13:48 +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="jUlljxZt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84F5483F40; Sun, 29 May 2022 01:13:42 +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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) (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 5FD3E8438F for ; Sun, 29 May 2022 01:13:36 +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=judge.packham@gmail.com Received: by mail-pg1-x52f.google.com with SMTP id 129so2725245pgc.2 for ; Sat, 28 May 2022 16:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IKgmvESg5jmSdnJPxIArB4vDsF+YW+3yZeZETbPh62k=; b=jUlljxZtw0haLbhT6WQunRWp16mBqvbmEFH9QhtmKjLUzRXlXt23UNoGHdAJp1dzG+ xX9RLdtgmioKy/DJi+elzwmTLRTEzOSJ5sqcsYrYLrUPQx40BxCxIK5zoEpg+AiDk/m0 G/3JFaiLYCAVbJrL5vWkOF9wqmQYDeuUH2a5o0j/NPpbIF44yA7IHNSDRcjIRq2RpGXd 1uoTDqYO6k3505vDDm9ueudnGgIDmGM0nHYDWq1JSKYJme6kI7Eg0HRKjBc1+UDs5YiC dOQWc7IF+PgwaDnXCvmtELxo/Ft5urFUiWR/TTRV76nwGqbL4ZjDUPsLjprObo6xjXQc FlkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IKgmvESg5jmSdnJPxIArB4vDsF+YW+3yZeZETbPh62k=; b=0iVE32UI1zSWvX3ttPKXlwATF8Pfst8DinLSB82b1pVriRlWO35VpkWDvLmriTUdtL X6D58DdpIpaI7C4nK5H5AQAgyI2RJrXXvDRoQtqvAKZED8EmznQLgVRP6ARt8HTylq5P zeZvxVisJXx7kFkQ9gBFW0Bgw6tHIoEeFbPk3mkTDzo3r1jq8a7+AsGnkgfrYAhZhjVb ftXkpleelfW110ye+ktuUGwmM3vGaScQDzY8peLd3pP1cfVXgRSG5qSBtbBDzouThdME ff7seQ8EKZVSUdyDt6krcZfGKF14fh8VCFvMf4Nuavwhu6aDE5MpbCQoYUUFKVn2ULle Vs2A== X-Gm-Message-State: AOAM530je9bwWstzxnHqke8Md8woXOA2UGQlsr0UlcdpErHs7G7CvAUR 70lAAhhtcPe1cbnS91tn2npThIvBHmQ= X-Google-Smtp-Source: ABdhPJyckQLql72GDawKrbb9W8noCIL7wrqwWwIc9SFDdZjHExPdp90VDWfgL/TFMZkGYnruekgA/w== X-Received: by 2002:a05:6a00:23ce:b0:50d:823f:981 with SMTP id g14-20020a056a0023ce00b0050d823f0981mr51412036pfc.10.1653779614576; Sat, 28 May 2022 16:13:34 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:a9ab:7a5c:69ce:1e38]) by smtp.gmail.com with ESMTPSA id b9-20020a17090a488900b001df68146a20sm595308pjh.56.2022.05.28.16.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 May 2022 16:13:34 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Chris Packham , =?utf-8?q?Marek_Beh?= =?utf-8?q?=C3=BAn?= , Mario Six , Patrick Delaunay , Simon Glass , Stefan Roese , Tom Rini Subject: [PATCH 3/3] arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE Date: Sun, 29 May 2022 11:13:18 +1200 Message-Id: <20220528231318.359510-3-judge.packham@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220528231318.359510-1-judge.packham@gmail.com> References: <20220528231318.359510-1-judge.packham@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean CONFIG_SPL_BOOT_DEVICE was made obsolete by CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}. CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of CONFIG_SPL_BOOT_DEVICE can simply have the option removed. Signed-off-by: Chris Packham Reviewed-by: Marek Behún Reviewed-by: Stefan Roese --- include/configs/controlcenterdc.h | 11 ----------- include/configs/db-88f6820-amc.h | 12 ------------ include/configs/db-88f6820-gp.h | 11 ----------- scripts/config_whitelist.txt | 1 - 4 files changed, 35 deletions(-) diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index a8534e59d9b1..3d7da4b2a33e 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -23,17 +23,6 @@ #endif /* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */ #define CONFIG_SPL_SIZE (160 << 10) diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 6538e66052aa..d044292d6b5a 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -27,18 +27,6 @@ "initrd_high=0x10000000\0" /* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * - * MMC is not populated on this board. - * NAND support may be added in the future. - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */ #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000)) diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index b4b58e0bcb8a..35ff6a876fde 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -28,17 +28,6 @@ "initrd_high=0x10000000\0" /* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */ #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000)) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 25962b735f27..a8766c9755ab 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -565,7 +565,6 @@ CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_SPL_BOARD_LOAD_IMAGE CONFIG_SPL_BOOTROM_SAVE -CONFIG_SPL_BOOT_DEVICE CONFIG_SPL_BSS_MAX_SIZE CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_CMT