From 06467e4652460f619f8be4bb4859e171d35cc258 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:32 +1300 Subject: Makefile: Move non-DM migration messages to the top At present the driver model migration messages are mixed with the others. Collect them together before starting to refactor them. Signed-off-by: Simon Glass --- Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ebb38b113..64766e2029 100644 --- a/Makefile +++ b/Makefile @@ -1037,6 +1037,21 @@ ifneq ($(CONFIG_DM_SPI)$(CONFIG_OF_CONTROL),yy) endif endif endif +ifeq ($(CONFIG_OF_EMBED),y) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" + @echo >&2 "be used for debugging purposes. Please use" + @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." + @echo >&2 "See doc/README.fdt-control for more info." + @echo >&2 "====================================================" +endif +ifneq ($(CONFIG_SPL_FIT_GENERATOR),) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate" + @echo >&2 "to binman instead, to avoid the proliferation of" + @echo >&2 "arch-specific scripts with no tests." + @echo >&2 "====================================================" +endif ifneq ($(CONFIG_DM),y) @echo >&2 "===================== WARNING ======================" @echo >&2 "This board does not use CONFIG_DM. CONFIG_DM will be" @@ -1106,14 +1121,6 @@ ifneq ($(CONFIG_DM_VIDEO),y) @echo >&2 "====================================================" endif endif -ifeq ($(CONFIG_OF_EMBED),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" - @echo >&2 "be used for debugging purposes. Please use" - @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." - @echo >&2 "See doc/README.fdt-control for more info." - @echo >&2 "====================================================" -endif ifeq ($(CONFIG_SPI_FLASH),y) ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy) @echo >&2 "===================== WARNING ======================" @@ -1145,13 +1152,6 @@ ifneq ($(CONFIG_DM_ETH),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "====================================================" endif -endif -ifneq ($(CONFIG_SPL_FIT_GENERATOR),) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate" - @echo >&2 "to binman instead, to avoid the proliferation of" - @echo >&2 "arch-specific scripts with no tests." - @echo >&2 "====================================================" endif @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG -- cgit v1.2.3 From 13732528516d161ad52e878bdb6b5aec309cf0c0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:33 +1300 Subject: Makefile: Add common code to report deprecation Add a function which can be called to report a migration problem. This will make it easier to add new migration checks, since the logic and strings are not spread out over 8 lines of code. Signed-off-by: Simon Glass --- Makefile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 64766e2029..a816ce74fb 100644 --- a/Makefile +++ b/Makefile @@ -1017,6 +1017,33 @@ quiet_cmd_cfgcheck = CFGCHK $2 cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ $(srctree)/scripts/config_whitelist.txt $(srctree) +# Concat the value of all the CONFIGs (result is 'y' or 'yy', etc. ) +got = $(foreach cfg,$(1),$($(cfg))) + +# expected value 'y for each one +expect = $(foreach cfg,$(1),y) + +# Show a deprecation message +# Args: +# 1: List of CONFIG_DM_... to migrate to (e.g. "CONFIG_DM_MMC CONFIG_BLK") +# 2: Name of component (e.g . "Ethernet drivers") +# 3: Release deadline (e.g. "v202.07") +# 4: Condition to require before checking (e.g. "$(CONFIG_NET)") +# Note: Script avoids bash construct, hence the strange double 'if' +# (patches welcome!) +define deprecated + 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"; \ + echo >&2 "$(firstword $(1)) before the $(3) 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 + +endef + PHONY += inputs inputs: $(INPUTS-y) -- cgit v1.2.3 From 77dc55ea39b3b6ec76bfa2dc32a66e22f1cc59cf Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:34 +1300 Subject: Makefile: Use common code for MMC deprecation warning Update the MMC check to use the 'deprecated' function. Tested with zc5202 Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_MMC. Please update the board to use CONFIG_DM_MMC before the v2019.04 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_DM_MMC (Driver Model for MMC). Please update the board to use CONFIG_DM_MMC before the v2019.04 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a816ce74fb..d166655bde 100644 --- a/Makefile +++ b/Makefile @@ -1087,16 +1087,7 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "====================================================" endif -ifeq ($(CONFIG_MMC),y) -ifneq ($(CONFIG_DM_MMC)$(CONFIG_BLK),yy) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_DM_MMC. Please update" - @echo >&2 "the board to use CONFIG_DM_MMC before the v2019.04 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_DM_MMC CONFIG_BLK,MMC,v2019.04,$(CONFIG_MMC)) ifeq ($(CONFIG_USB),y) ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From 9e035b8ee18e55ecda7c8d88ea03261f953baada Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:35 +1300 Subject: Makefile: Use common code for USB deprecation warning Update the USB check to use the 'deprecated' function. Tested with xpress Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_DM_USB (Driver Model for USB). Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d166655bde..800f6ccaa4 100644 --- a/Makefile +++ b/Makefile @@ -1088,16 +1088,8 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "====================================================" endif $(call deprecated,CONFIG_DM_MMC CONFIG_BLK,MMC,v2019.04,$(CONFIG_MMC)) -ifeq ($(CONFIG_USB),y) -ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_DM_USB. Please update" - @echo >&2 "the board to use CONFIG_DM_USB before the v2019.07 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ + USB,v2019.07,$(CONFIG_USB)) ifeq ($(CONFIG_MVSATA_IDE),y) @echo >&2 "===================== WARNING ======================" @echo >&2 "This board does use CONFIG_MVSATA_IDE which is not" -- cgit v1.2.3 From a8834352982ac03b7e780b66fad944af46204250 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:36 +1300 Subject: Makefile: Use common code for MVSATA_IDE deprecation warning Update the CONFIG_MVSATA_IDE check to use the 'deprecated' function. Tested with nas220 Old message: ===================== WARNING ====================== This board does use CONFIG_MVSATA_IDE which is not ported to driver-model (DM) yet. Please update the storage controller driver to use CONFIG_AHCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_AHCI (Driver Model for AHCI instead of CONFIG_MVSATA_IDE). Please update the board to use CONFIG_AHCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 800f6ccaa4..d650a99fbe 100644 --- a/Makefile +++ b/Makefile @@ -1090,16 +1090,8 @@ endif $(call deprecated,CONFIG_DM_MMC CONFIG_BLK,MMC,v2019.04,$(CONFIG_MMC)) $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ USB,v2019.07,$(CONFIG_USB)) -ifeq ($(CONFIG_MVSATA_IDE),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does use CONFIG_MVSATA_IDE which is not" - @echo >&2 "ported to driver-model (DM) yet. Please update the storage" - @echo >&2 "controller driver to use CONFIG_AHCI before the v2019.07" - @echo >&2 "release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif + $(call deprecated,CONFIG_AHCI,AHCI instead of CONFIG_MVSATA_IDE,v2019.07, \ + $(CONFIG_MVSATA_IDE)) ifeq ($(CONFIG_LIBATA),y) ifneq ($(CONFIG_AHCI),y) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From 099288bf78a5222e633badffc0f3ffeb40b8e376 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:37 +1300 Subject: Makefile: Use common code for LIBATA deprecation warning Update the CONFIG_LIBATA check to use the 'deprecated' function. Tested with MPC8349ITX Old message: ===================== WARNING ====================== This board does use CONFIG_LIBATA but has CONFIG_AHCI not enabled. Please update the storage controller driver to use CONFIG_AHCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_AHCI (Driver Model for AHCI). Please update the board to use CONFIG_AHCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d650a99fbe..8d275da7c6 100644 --- a/Makefile +++ b/Makefile @@ -1092,17 +1092,7 @@ endif USB,v2019.07,$(CONFIG_USB)) $(call deprecated,CONFIG_AHCI,AHCI instead of CONFIG_MVSATA_IDE,v2019.07, \ $(CONFIG_MVSATA_IDE)) -ifeq ($(CONFIG_LIBATA),y) -ifneq ($(CONFIG_AHCI),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does use CONFIG_LIBATA but has CONFIG_AHCI not" - @echo >&2 "enabled. Please update the storage controller driver to use" - @echo >&2 "CONFIG_AHCI before the v2019.07 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_AHCI,AHCI,v2019.07, $(CONFIG_LIBATA)) ifeq ($(CONFIG_PCI),y) ifneq ($(CONFIG_DM_PCI),y) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From 39e526a8ece5624f72c47abbcb2298ce940265f6 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:38 +1300 Subject: Makefile: Use common code for PCI deprecation warning Update the CONFIG_DM_PCI check to use the 'deprecated' function. Tested with MPC8349ITX Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_PCI Please update the board to use CONFIG_DM_PCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_DM_PCI (Driver Model for PCI). Please update the board to use CONFIG_DM_PCI before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8d275da7c6..d1a9b3e9e2 100644 --- a/Makefile +++ b/Makefile @@ -1093,16 +1093,7 @@ endif $(call deprecated,CONFIG_AHCI,AHCI instead of CONFIG_MVSATA_IDE,v2019.07, \ $(CONFIG_MVSATA_IDE)) $(call deprecated,CONFIG_AHCI,AHCI,v2019.07, $(CONFIG_LIBATA)) -ifeq ($(CONFIG_PCI),y) -ifneq ($(CONFIG_DM_PCI),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_DM_PCI Please update" - @echo >&2 "the board to use CONFIG_DM_PCI before the v2019.07 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI)) ifneq ($(CONFIG_LCD)$(CONFIG_VIDEO),) ifneq ($(CONFIG_DM_VIDEO),y) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From d13aee07fdaf81eb5c5b69336840d6a2753e1cd1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:39 +1300 Subject: Makefile: Use common code for DM_VIDEO deprecation warning Update the CONFIG_DM_VIDEO check to use the 'deprecated' function. Tested with pxm2 Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO Please update the board to use CONFIG_DM_VIDEO before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO (Driver Model for video). Please update the board to use CONFIG_DM_VIDEO before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ================================================== Signed-off-by: Simon Glass --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d1a9b3e9e2..0c2f0ab0cf 100644 --- a/Makefile +++ b/Makefile @@ -1094,16 +1094,8 @@ endif $(CONFIG_MVSATA_IDE)) $(call deprecated,CONFIG_AHCI,AHCI,v2019.07, $(CONFIG_LIBATA)) $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI)) -ifneq ($(CONFIG_LCD)$(CONFIG_VIDEO),) -ifneq ($(CONFIG_DM_VIDEO),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_DM_VIDEO Please update" - @echo >&2 "the board to use CONFIG_DM_VIDEO before the v2019.07 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ + $(CONFIG_LCD)$(CONFIG_VIDEO)) ifeq ($(CONFIG_SPI_FLASH),y) ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From ec384f9f1242039742e3955c774669e7d69a48ea Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:40 +1300 Subject: Makefile: Use common code for SPI_FLASH deprecation warning Update the CONFIG_DM_SPI_FLASH check to use the 'deprecated' function. Tested with vinco Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_SPI_FLASH. Please update the board to use CONFIG_SPI_FLASH before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_DM_SPI_FLASH (Driver Model for SPI flash). Please update the board to use CONFIG_DM_SPI_FLASH before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0c2f0ab0cf..c89547f6b7 100644 --- a/Makefile +++ b/Makefile @@ -1096,16 +1096,8 @@ endif $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI)) $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ $(CONFIG_LCD)$(CONFIG_VIDEO)) -ifeq ($(CONFIG_SPI_FLASH),y) -ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_DM_SPI_FLASH. Please update" - @echo >&2 "the board to use CONFIG_SPI_FLASH before the v2019.07 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_DM_SPI_FLASH,SPI flash,v2019.07,\ + $(CONFIG_SPI_FLASH)) ifneq ($(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG),) ifneq ($(CONFIG_WDT),y) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From 78b4a564cb9ab75a2d298a731d05c600eb4400d9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:41 +1300 Subject: Makefile: Use common code for WDT deprecation warning Update the CONFIG_WDT check to use the 'deprecated' function. Tested with kmcent2 Old message: ===================== WARNING ====================== This board does not use CONFIG_WDT (DM watchdog support). Please update the board to use CONFIG_WDT before the v2019.10 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_WDT (Driver Model for DM watchdog). Please update the board to use CONFIG_WDT before the v2019.10 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c89547f6b7..31af66feb3 100644 --- a/Makefile +++ b/Makefile @@ -1098,17 +1098,8 @@ endif $(CONFIG_LCD)$(CONFIG_VIDEO)) $(call deprecated,CONFIG_DM_SPI_FLASH,SPI flash,v2019.07,\ $(CONFIG_SPI_FLASH)) -ifneq ($(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG),) -ifneq ($(CONFIG_WDT),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_WDT (DM watchdog support)." - @echo >&2 "Please update the board to use CONFIG_WDT before the" - @echo >&2 "v2019.10 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif + $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ + $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) ifneq ($(CONFIG_NET),) ifneq ($(CONFIG_DM_ETH),y) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From 8cd1874f4c0414c4d519d16a79d2bc8a0523523a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:42 +1300 Subject: Makefile: Use common code for DM_ETH deprecation warning Update the CONFIG_DM_ETH check to use the 'deprecated' function. Tested with snow Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== New message: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Simon Glass --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 31af66feb3..0613f6d68c 100644 --- a/Makefile +++ b/Makefile @@ -1100,17 +1100,7 @@ endif $(CONFIG_SPI_FLASH)) $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) -ifneq ($(CONFIG_NET),) -ifneq ($(CONFIG_DM_ETH),y) - @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 "====================================================" -endif -endif + $(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET)) @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG @# options are whitelisted, so new ones should not be added. -- cgit v1.2.3 From 782dac5b7d99506ab65276b923d4b2cdc7ff9d13 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:43 +1300 Subject: Makefile: Drop the old SPI flash migration message This message does not seem to make sense. It may be out of date. Drop it. Signed-off-by: Simon Glass --- Makefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0613f6d68c..c6a3983b8f 100644 --- a/Makefile +++ b/Makefile @@ -1058,11 +1058,6 @@ endif ifeq ($(CONFIG_DEPRECATED),y) $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.") -ifeq ($(CONFIG_SPI),y) -ifneq ($(CONFIG_DM_SPI)$(CONFIG_OF_CONTROL),yy) - $(warning "The relevant config item with associated code will remove in v2019.07 release.") -endif -endif endif ifeq ($(CONFIG_OF_EMBED),y) @echo >&2 "===================== WARNING ======================" -- cgit v1.2.3 From 65c8cdc72bca275334f01d1089aef0661f1bd468 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:44 +1300 Subject: dm: i2c: Add a migration method for I2C This probably should have been done a while back since it is a core system. Add a migration deadline of later this year, to catch the stragglers. Signed-off-by: Simon Glass --- Makefile | 1 + doc/driver-model/migration.rst | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c6a3983b8f..e9b9c15808 100644 --- a/Makefile +++ b/Makefile @@ -1096,6 +1096,7 @@ endif $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) $(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET)) + $(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_I2C)) @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG @# options are whitelisted, so new ones should not be added. diff --git a/doc/driver-model/migration.rst b/doc/driver-model/migration.rst index 2284e8a6f7..8d0bb7635b 100644 --- a/doc/driver-model/migration.rst +++ b/doc/driver-model/migration.rst @@ -99,3 +99,11 @@ Deadline: 2020.07 The network subsystem has supported the driver model since early 2015. Maintainers should submit patches switching over to using CONFIG_DM_ETH and other base driver model options in time for inclusion in the 2020.07 release. + +CONFIG_DM_I2C +------------- +Deadline: 2021.10 + +The I2C subsystem has supported the driver model since early 2015. +Maintainers should submit patches switching over to using CONFIG_DM_I2C and +other base driver model options in time for inclusion in the 2021.10 release. -- cgit v1.2.3 From 3b142045e8a7f0ab17b6099e9226296af45967d0 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Sat, 20 Mar 2021 20:43:05 +0000 Subject: Support building on macOS/arm64 On Arm-based Macs, -no_pie is ignored and gives a linker warning. Moreover, the build falls over with: ld: Absolute addressing not allowed in arm64 code but used in '_image_type_ptr_aisimage' referencing '_image_type_aisimage' for dumpimage and mkimage, since we put data structs in text sections not data sections and so cannot have dynamic relocations. Instead, move the sections to __DATA and drop disabling PIE. Signed-off-by: Jessica Clarke Reviewed-by: Tom Rini --- Makefile | 5 ----- tools/imagetool.h | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e9b9c15808..7d73062df3 100644 --- a/Makefile +++ b/Makefile @@ -324,11 +324,6 @@ HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") KBUILD_HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") -# since Lion (10.7) ASLR is on by default, but we use linker generated lists -# in some host tools which is a problem then ... so disable ASLR for these -# tools -KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie") - # macOS Mojave (10.14.X) # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") diff --git a/tools/imagetool.h b/tools/imagetool.h index 8726792c8c..2801ea9e9f 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -273,14 +273,14 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ - char *__cat(pstart_, name) = getsectdata("__TEXT", \ + char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ __cat(__stop_, name) = (void *)__cat(pstop_, name); \ } while (0) -#define SECTION(name) __attribute__((section("__TEXT, " #name))) +#define SECTION(name) __attribute__((section("__DATA, " #name))) struct image_type_params **__start_image_type, **__stop_image_type; #else -- cgit v1.2.3 From d8eafb16c85bc3b5d85d7ba8ebb1438cc0ae168f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 29 Mar 2021 17:20:13 -0400 Subject: Prepare v2021.04-rc5 Signed-off-by: Tom Rini --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7d73062df3..e60717f7a2 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 2021 PATCHLEVEL = 04 SUBLEVEL = -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc5 NAME = # *DOCUMENTATION* -- cgit v1.2.3