summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorJim Mussared <jim.mussared@gmail.com>2023-07-31 17:32:27 +1000
committerJim Mussared <jim.mussared@gmail.com>2023-08-15 17:37:44 +1000
commit9573d31071b069713ac7bc803777fba65c4ead41 (patch)
treed0310e3e5b168879654015112d8aa9beefafc314 /py
parentad123ed01393f34d31c7c9ac0f535a023f9385b7 (diff)
all: Remove query-variants make target.
This is difficult to implement on cmake-based ports, and having the list of variants in mpconfigboard.{cmake,mk} duplicates information that's already in board.json. This removes the existing query-variants make target from stm32 & rp2 and the definition of BOARD_VARIANTS from the various board files. Also renames the cmake variable to MICROPY_BOARD_VARIANT to match other variables such as MICROPY_BOARD. The make variable stays as BOARD_VARIANT. This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Diffstat (limited to 'py')
-rw-r--r--py/mkrules.cmake8
1 files changed, 1 insertions, 7 deletions
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 21d5c2733..02e3148f2 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -178,7 +178,7 @@ if(MICROPY_FROZEN_MANIFEST)
set(MICROPY_LIB_DIR ${MICROPY_DIR}/lib/micropython-lib)
endif()
- if(ECHO_SUBMODULES OR ECHO_QUERY_VARIANTS)
+ if(ECHO_SUBMODULES)
# No-op, we're just doing submodule/variant discovery.
# Note: All the following rules are safe to run in discovery mode even
# though the submodule might not be available as they do not directly depend
@@ -223,9 +223,3 @@ if(ECHO_SUBMODULES)
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "GIT_SUBMODULES=${GIT_SUBMODULES}")
message(FATAL_ERROR "Done")
endif()
-
-# Display BOARD_VARIANTS
-if(ECHO_BOARD_VARIANTS)
- execute_process(COMMAND ${CMAKE_COMMAND} -E echo "BOARD_VARIANTS=${BOARD_VARIANTS}")
- message(FATAL_ERROR "Done")
-endif()