On Wed, Mar 31, 2021 at 02:46:54PM +0800, Bin Meng wrote: > Hi Simon and Tom, > > On Thu, Mar 25, 2021 at 4:26 PM Simon Glass <[email protected]> wrote: > > > > The code that produces the migration warnings is quite tedious to > > understanding and modify. This series updates it to use a common function > > to handle the logic, so that the message definition is quite short and has > > no duplication in it. > > > > It is still necessary to write a message in migration.rst however. > > > > This series came out of a patch intended to add an I2C warning. > > > > It also renames CONFIG_DM_RESET; it does not need to be migrated since it > > already uses driver model. > > > > Changes in v4: > > - Refactored the warning code to make it easier to get this right > > - Add GPIO deprecation as well > > - Add patches to rename DM_RESET to RESET > > This series caused a bunch of output message when building a board > without "V=1": > > $ make > if [ -n "y" ]; then if [ "y y" != "y y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_MMC (Driver Model"; echo >&2 "for MMC). > Please update the board to use"; echo >&2 "CONFIG_DM_MMC before the > v2019.04 release. Failure to"; echo >&2 "update by the deadline may > result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ " y y" != "y y y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_USB (Driver Model"; echo >&2 "for USB). > Please update the board to use"; echo >&2 "CONFIG_DM_USB before the > v2019.07 release. Failure to"; echo >&2 "update by the deadline may > result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_AHCI (Driver Model"; echo >&2 "for AHCI > instead of CONFIG_MVSATA_IDE). Please update the board to use"; echo > >&2 "CONFIG_AHCI before the v2019.07 release. Failure to"; echo >&2 > "update by the deadline may result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_AHCI (Driver Model"; echo >&2 "for AHCI). > Please update the board to use"; echo >&2 "CONFIG_AHCI before the > v2019.07 release. Failure to"; echo >&2 "update by the deadline may > result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_PCI (Driver Model"; echo >&2 "for PCI). > Please update the board to use"; echo >&2 "CONFIG_DM_PCI before the > v2019.07 release. Failure to"; echo >&2 "update by the deadline may > result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_VIDEO (Driver Model"; echo >&2 "for > video). Please update the board to use"; echo >&2 "CONFIG_DM_VIDEO > before the v2019.07 release. Failure to"; echo >&2 "update by the > deadline may result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_SPI_FLASH (Driver Model"; echo >&2 "for > SPI flash). Please update the board to use"; echo >&2 > "CONFIG_DM_SPI_FLASH before the v2019.07 release. Failure to"; echo > >&2 "update by the deadline may result in board removal."; echo >&2 > "See doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_WDT (Driver Model"; echo >&2 "for DM > watchdog). Please update the board to use"; echo >&2 "CONFIG_WDT > before the v2019.10 release. Failure to"; echo >&2 "update by the > deadline may result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "y" ]; then if [ "y" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_ETH (Driver Model"; echo >&2 "for > Ethernet drivers). Please update the board to use"; echo >&2 > "CONFIG_DM_ETH before the v2020.07 release. Failure to"; echo >&2 > "update by the deadline may result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > if [ -n "" ]; then if [ "" != "y" ]; then echo >&2 > "===================== WARNING ======================"; echo >&2 "This > board does not use CONFIG_DM_I2C (Driver Model"; echo >&2 "for I2C > drivers). Please update the board to use"; echo >&2 "CONFIG_DM_I2C > before the v2022.04 release. Failure to"; echo >&2 "update by the > deadline may result in board removal."; echo >&2 "See > doc/driver-model/migration.rst for more info."; echo >&2 > "===================================================="; fi; fi > CFGCHK u-boot.cfg > cat: u-boot.cfg: No such file or directory > > > Also these warnings do not sound correct to this board as the board > does not support AHCI or VIDEO, etc.
Yes, it looks like we should have:
diff --git a/Makefile b/Makefile
index 94c31d1bb876..48f24e81245e 100644
--- a/Makefile
+++ b/Makefile
@@ -1031,7 +1031,7 @@ expect = $(foreach cfg,$(1),y)
# Note: Script avoids bash construct, hence the strange double 'if'
# (patches welcome!)
define deprecated
- if [ -n "$(strip $(4))" ]; then if [ "$(got)" != "$(expect)" ]; then \
+ @if [ -n "$(strip $(4))" ]; then if [ "$(got)" != "$(expect)" ]; then \
echo >&2 "===================== WARNING
======================"; \
echo >&2 "This board does not use $(firstword $(1)) (Driver
Model"; \
echo >&2 "for $(2)). Please update the board to use"; \
--
Tom
signature.asc
Description: PGP signature
