From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E669AC433F5 for ; Sun, 30 Jan 2022 15:52:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D83583073; Sun, 30 Jan 2022 16:52:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="L32wAilM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 019B58091B; Sun, 30 Jan 2022 16:52:35 +0100 (CET) Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 DD9D78169D for ; Sun, 30 Jan 2022 16:52:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id u5so9594335ilq.9 for ; Sun, 30 Jan 2022 07:52:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QotNfLVh1Yeyq7KuuAMSaH49PIhCM0PjmgBGZp/yrXg=; b=L32wAilMsyApUAu3ubTXvLYF5HAT9GbhJS8BmumyI/x85baHWEgKWb50HQb3X9Ub6I 0IZgawnmrWmcwmuUNt4IZump6OCAKbww9bzLwQF9TPlAX5p9RK1FOX2W15nW5ZFj3x8l PCVwosZW1KMvPkZzcNYbK6inwu9UWFT6hSk/o= 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=QotNfLVh1Yeyq7KuuAMSaH49PIhCM0PjmgBGZp/yrXg=; b=A+L9rSCPqFrQxNF9uJaN9Lpo8leSalBvz5MQs3XniwC8xCYoyj4d0vp5JO2xWpg0jE zjPHvZNljnQuNY6IcCEJAcbWRgwGrHV9LrleRl7c4n+XKc2jmVTpQcHUY/gQ8yUySHTi 2JZQlnN08VAvS/G69WemVroEsL+MXD1EnErOXJclG63RNkF48jDs1hrI60vtxjfOIub4 W8DkxXscy2VMRWzGZ61ih0KiswRdR4xoM1VKeox9ziGF70c1W4rZ/x57KO03hoWqELji kJaC/hiYAzc7DiUBTHBc4OMv8NkP/XLPCXmGAEc9mfRGH+Zk5q8zrpJcj0bpbk22KG7l 9ysw== X-Gm-Message-State: AOAM532ee39ta2jcvFahsMc3muQv78UG9lLweldn+NRhufHKnnpon1iS 2dGYKryjBAMI+Vfb+B5bFjVSUMRoNwjPyw== X-Google-Smtp-Source: ABdhPJxKOjlwGkipbTf6v8yCDlzovZosOESDZ1UyypQMuaYArmDneVzTSSMuT0NNKvzN/G+BDOVdgg== X-Received: by 2002:a05:6e02:1786:: with SMTP id y6mr11256043ilu.97.1643557949500; Sun, 30 Jan 2022 07:52:29 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id r15sm16657042ilo.25.2022.01.30.07.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 07:52:29 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Michal Simek , huang lin , Jeffy Chen , Simon Glass , Kever Yang , Philipp Tomsich , "NXP i . MX U-Boot Team" , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Masahiro Yamada Subject: [PATCH v2 2/2] Makefile: Don't allow new boards with SPL_FIT_GENERATOR Date: Sun, 30 Jan 2022 08:52:25 -0700 Message-Id: <20220130155225.726890-2-sjg@chromium.org> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220130155225.726890-1-sjg@chromium.org> References: <20220130155225.726890-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 More than a year after this migration message appeared, we still have new boards being added with this option. Add a check against this. Signed-off-by: Simon Glass --- Changes in v2: - Rebase to master Makefile | 6 ++++ scripts/fit_gen_whitelist.txt | 65 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 scripts/fit_gen_whitelist.txt diff --git a/Makefile b/Makefile index 212124522e6..55faff3952f 100644 --- a/Makefile +++ b/Makefile @@ -1110,6 +1110,12 @@ ifeq ($(CONFIG_OF_EMBED)$(CONFIG_EFI_APP),y) @echo >&2 "====================================================" endif ifneq ($(CONFIG_SPL_FIT_GENERATOR),) + # Only allow existing users of this deprecated option. Please migrate! + @if ! grep -q $(shell cat .defconfig_name) \ + $(srctree)/scripts/fit_gen_whitelist.txt; then \ + echo >&2 "Error: CONFIG_SPL_FIT_GENERATOR is deprecated"; \ + exit 1; \ + fi @echo >&2 "===================== WARNING ======================" @echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate" @echo >&2 "to binman instead, to avoid the proliferation of" diff --git a/scripts/fit_gen_whitelist.txt b/scripts/fit_gen_whitelist.txt new file mode 100644 index 00000000000..ac0890b3f39 --- /dev/null +++ b/scripts/fit_gen_whitelist.txt @@ -0,0 +1,65 @@ +# List of boards that need to be migrated from SPL_FIT_GENERATOR to binman +# See https://patchwork.ozlabs.org/project/uboot/list/?series=242992&state=* +# for an example series (see patches 7 and 13 in particular) + +# Please do not add to this file + +# Some TI boards need migration +am335x_evm_spiboot +am64x_evm_a53 +am64x_evm_r5 +am65x_evm_r5_usbdfu +am65x_evm_r5_usbmsc + +# MX8 needs migration +cgtqmx8 +imx8mm-icore-mx8mm-ctouch2 +imx8mm-icore-mx8mm-edimm2.2 +imx8qm_rom7720_a1_4G + +# Rockchip needs migration +chromebook_bob +evb-px30 +evb-px5 +evb-rk3308 +evb-rk3328 +evb-rk3399 +evb-rk3568 +ficus-rk3399 +firefly-px30 +firefly-rk3399 +khadas-edge-captain-rk3399 +khadas-edge-rk3399 +khadas-edge-v-rk3399 +leez-rk3399 +lion-rk3368 +nanopc-t4-rk3399 +nanopi-m4-2gb-rk3399 +nanopi-m4b-rk3399 +nanopi-m4-rk3399 +nanopi-neo4-rk3399 +nanopi-r2s-rk3328 +nanopi-r4s-rk3399 +odroid-go2 +roc-cc-rk3308 +orangepi-rk3399 +pinebook-pro-rk3399 +puma-rk3399 +px30-core-ctouch2-of10-px30 +px30-core-ctouch2-px30 +px30-core-edimm2.2-px30 +roc-cc-rk3308 +roc-cc-rk3328 +rock64-rk3328 +rock960-rk3399 +rock-pi-4c-rk3399 +rock-pi-4-rk3399 +rock-pi-e-rk3328 +rock-pi-n10-rk3399pro +rockpro64-rk3399 +roc-pc-mezzanine-rk3399 +roc-pc-rk3399 + +# Zynqmp needs mnigration +avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0 +xilinx_zynqmp_virt -- 2.35.0.rc2.247.g8bbb082509-goog