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 904CEC433EF for ; Sun, 30 Jan 2022 23:15:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3911C836C3; Mon, 31 Jan 2022 00:15:06 +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="X7wPTGi8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6513B835BE; Mon, 31 Jan 2022 00:14:52 +0100 (CET) Received: from mail-vk1-xa31.google.com (mail-vk1-xa31.google.com [IPv6:2607:f8b0:4864:20::a31]) (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 4737F835BA for ; Mon, 31 Jan 2022 00:14:49 +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@google.com Received: by mail-vk1-xa31.google.com with SMTP id 48so7270911vki.0 for ; Sun, 30 Jan 2022 15:14:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=b6Ahd4YAWKrxbCJDfm98BIuzppCRRL+IIqoNG5rJKVI=; b=X7wPTGi8GVhDGQ7196GVqNmYI0ruDt/XzuJ3Jixv/hoMDlT+Z+TzJK8tsWss7iFz9V Un3cw6UZ3uPTVhq9VyuaiBT7SoImiA/hDoMBF0yyBt/C141CBZfCqTf1BeMxZ9UtKTm5 d7vjjeTIKb0j6kbvWSBiVqSQKMtlAkjzMLY58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=b6Ahd4YAWKrxbCJDfm98BIuzppCRRL+IIqoNG5rJKVI=; b=XGcUq/0PbzhZXzMhSfm9x7cljbBmkU2AgHDBKw3FOsayf3UXUWnW59sxr7XFrHeo9+ 7gEUYhDh+TWsb1RPpJ6MqV8aA0ZcDBK8V2I3AKIyV7SDDKu79nrgD8UTS2KC18thbbbI urpxVVrk6/Hq5JGN+GXWYPYbA0cE/OtXabfcRT1WJ+gm8qG8BrU5+DUjeF/8OcPx8zAP AFMbEY1P+V5FSDxEkygAHHOwRY5X0KLpd+AWByiO66dMxHkPpQoDLmvWpHQCM0zb5EG1 xbl0jquo0U5XbLrQVNNVT5eHHJilBYIbRl+Oh0OBFgkRWXtdTefH1oCCX6pWFauj3DLA esNg== X-Gm-Message-State: AOAM532Wrko6HZ4gYrq82QLnxVxxvNINPChLqSQJdUQlabp2cawfE9se 2E2OnUevbJ1QJyXUyVf25DZk4ygFRbx/zq/+9HNGOA== X-Google-Smtp-Source: ABdhPJx0UdRsJ9+AantwodkB1H3OSLk82xOEwVKxkYJGTO11JPoar6Jv6SAIvmrIVaZucJ0HGbr/NQBBp2PEB2SBWu4= X-Received: by 2002:a05:6122:2194:: with SMTP id j20mr7001936vkd.21.1643584487928; Sun, 30 Jan 2022 15:14:47 -0800 (PST) MIME-Version: 1.0 References: <20220130155225.726890-1-sjg@chromium.org> <20220130155225.726890-2-sjg@chromium.org> <2115dbc0-8cd2-9749-f511-6a0c252e5b9f@monstr.eu> In-Reply-To: <2115dbc0-8cd2-9749-f511-6a0c252e5b9f@monstr.eu> From: Simon Glass Date: Sun, 30 Jan 2022 16:14:37 -0700 Message-ID: Subject: Re: [PATCH v2 2/2] Makefile: Don't allow new boards with SPL_FIT_GENERATOR To: Michal Simek Cc: U-Boot Mailing List , Tom Rini , huang lin , Jeffy Chen , Kever Yang , Philipp Tomsich , "NXP i . MX U-Boot Team" , =?UTF-8?B?TWFyZWsgQmVow7pu?= , Masahiro Yamada Content-Type: text/plain; charset="UTF-8" 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 Hi Michal, On Sun, 30 Jan 2022 at 12:41, Michal Simek wrote: > > > > On 1/30/22 16:52, Simon Glass wrote: > > 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 > > nit: I normally use zynqmp or ZynqMP. > But there is typo. OK will fix. > > What's the migration path? Buildman? Actually it is a binman description, see the imx8 ones, for example. It can generate a FIT for you. Regards, Simon