From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: "Tom Rini" <trini@konsulko.com>,
"Michal Simek" <monstr@monstr.eu>,
"huang lin" <hl@rock-chips.com>,
"Jeffy Chen" <jeffy.chen@rock-chips.com>,
"Simon Glass" <sjg@chromium.org>,
"Kever Yang" <kever.yang@rock-chips.com>,
"Philipp Tomsich" <philipp.tomsich@theobroma-systems.com>,
"NXP i . MX U-Boot Team" <uboot-imx@nxp.com>,
"Marek Behún" <marek.behun@nic.cz>,
"Masahiro Yamada" <yamada.masahiro@socionext.com>
Subject: [PATCH v2 2/2] Makefile: Don't allow new boards with SPL_FIT_GENERATOR
Date: Sun, 30 Jan 2022 08:52:25 -0700 [thread overview]
Message-ID: <20220130155225.726890-2-sjg@chromium.org> (raw)
In-Reply-To: <20220130155225.726890-1-sjg@chromium.org>
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 <sjg@chromium.org>
---
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
next prev parent reply other threads:[~2022-01-30 15:52 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-30 15:52 [PATCH v2 1/2] Makefile: Create a file to indicate the config Simon Glass
2022-01-30 15:52 ` Simon Glass [this message]
2022-01-30 19:40 ` [PATCH v2 2/2] Makefile: Don't allow new boards with SPL_FIT_GENERATOR Michal Simek
2022-01-30 23:14 ` Simon Glass
2022-01-31 14:24 ` Tom Rini
2022-01-31 16:13 ` Simon Glass
2022-01-31 16:15 ` Tom Rini
2022-01-31 17:27 ` Simon Glass
2022-01-31 18:00 ` Tom Rini
2022-01-31 19:57 ` Simon Glass
2022-01-31 20:40 ` Tom Rini
2022-01-31 21:22 ` Simon Glass
2022-01-31 22:05 ` Tom Rini
2022-01-31 22:59 ` Simon Glass
2022-01-31 23:25 ` Tom Rini
2022-01-31 23:32 ` Tom Rini
2022-02-01 14:05 ` Simon Glass
2022-02-01 15:42 ` Simon Glass
2022-02-01 16:08 ` Mark Kettenis
2022-02-01 16:24 ` Simon Glass
2022-01-31 22:02 ` Mark Kettenis
2022-01-31 14:24 ` [PATCH v2 1/2] Makefile: Create a file to indicate the config Tom Rini
2022-01-31 16:13 ` Simon Glass
2022-01-31 16:21 ` Tom Rini
2022-01-31 17:27 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220130155225.726890-2-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=hl@rock-chips.com \
--cc=jeffy.chen@rock-chips.com \
--cc=kever.yang@rock-chips.com \
--cc=marek.behun@nic.cz \
--cc=monstr@monstr.eu \
--cc=philipp.tomsich@theobroma-systems.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=uboot-imx@nxp.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox