From 9f851cc2dc7d634182167daaf8ca774cf03c5a04 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Fri, 31 May 2019 17:39:39 -0600 Subject: [PATCH] cmake: delete obsolete deprecation checks FLASH_SCRIPT and DEBUG_SCRIPT are way gone; no need to check for them anymore. Signed-off-by: Marti Bolivar --- cmake/extensions.cmake | 4 ++-- cmake/flash/CMakeLists.txt | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake index cc00381c864..7fa83e8b4f6 100644 --- a/cmake/extensions.cmake +++ b/cmake/extensions.cmake @@ -1273,9 +1273,9 @@ macro(assert test comment) endmacro() # Usage: -# assert_not(FLASH_SCRIPT "FLASH_SCRIPT has been removed; use BOARD_FLASH_RUNNER") +# assert_not(OBSOLETE_VAR "OBSOLETE_VAR has been removed; use NEW_VAR instead") # -# will cause a FATAL_ERROR and print an errorm essage if the first +# will cause a FATAL_ERROR and print an error message if the first # espression is true macro(assert_not test comment) if(${test}) diff --git a/cmake/flash/CMakeLists.txt b/cmake/flash/CMakeLists.txt index be1e3b8acbf..05edc8ddf82 100644 --- a/cmake/flash/CMakeLists.txt +++ b/cmake/flash/CMakeLists.txt @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -assert_not(FLASH_SCRIPT "FLASH_SCRIPT has been removed; use BOARD_FLASH_RUNNER") -assert_not(DEBUG_SCRIPT "DEBUG_SCRIPT has been removed; use BOARD_DEBUG_RUNNER") - get_property(RUNNERS GLOBAL PROPERTY ZEPHYR_RUNNERS) # Enable verbose output, if requested.