From d0e8752a5209a516a0e69cb1db9a641ac3d34aeb Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
Date: Wed, 5 Sep 2018 12:58:05 +0200
Subject: [PATCH] Kconfig: Rename $ENV_VAR_{ARCH,BOARD_DIR} to $ARCH/$BOARD_DIR

The prefixes might be a leftover from the old 'option env="..."' symbols
(which are no longer needed). Since environment variables can be
referenced directly now, there's no point in having a prefix.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
---
 Kconfig.zephyr                 | 6 +++---
 arch/Kconfig                   | 4 ++--
 boards/Kconfig                 | 6 +++---
 cmake/kconfig.cmake            | 8 ++++----
 doc/CMakeLists.txt             | 4 ++--
 scripts/ci/check-compliance.py | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 516f588ee5e..8ac889bc44e 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -15,9 +15,9 @@
 # Board defaults should be parsed before SoC defaults, because boards usually
 # overrides SoC values.
 #
-# Note: $ENV_VAR_ARCH and $ENV_VAR_BOARD_DIR might be glob patterns.
-source "$ENV_VAR_BOARD_DIR/Kconfig.defconfig"
-source "arch/$ENV_VAR_ARCH/soc/*/Kconfig.defconfig"
+# Note: $ARCH and $BOARD_DIR might be glob patterns.
+source "$BOARD_DIR/Kconfig.defconfig"
+source "arch/$ARCH/soc/*/Kconfig.defconfig"
 
 
 source "arch/Kconfig"
diff --git a/arch/Kconfig b/arch/Kconfig
index 67fbc381ba3..c37ed4e597a 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -12,8 +12,8 @@
 # overriden (by defining symbols in multiple locations)
 
 source "boards/Kconfig"
-# Note: $ENV_VAR_ARCH might be a glob pattern
-source "arch/$ENV_VAR_ARCH/Kconfig"
+# Note: $ARCH might be a glob pattern
+source "arch/$ARCH/Kconfig"
 
 
 choice
diff --git a/boards/Kconfig b/boards/Kconfig
index fb15f8c6862..fed6af4c53d 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -13,17 +13,17 @@ config QEMU_TARGET
 	  Mark all QEMU targets with this variable for checking whether we are
 	  running in an emulated environment.
 
-# Note: $ENV_VAR_BOARD_DIR might be a glob pattern
+# Note: $BOARD_DIR might be a glob pattern
 
 choice
 prompt "Board Selection"
-source "$ENV_VAR_BOARD_DIR/Kconfig.board"
+source "$BOARD_DIR/Kconfig.board"
 endchoice
 
 
 menu "Board Options"
 # There might not be any board options, hence the optional source
-osource "$ENV_VAR_BOARD_DIR/Kconfig"
+osource "$BOARD_DIR/Kconfig"
 endmenu
 
 menu "Shields"
diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake
index 8b44a672205..ea7a0698269 100644
--- a/cmake/kconfig.cmake
+++ b/cmake/kconfig.cmake
@@ -20,8 +20,8 @@ set(ENV{KCONFIG_AUTOHEADER} ${AUTOCONF_H})
 
 # Set environment variables so that Kconfig can prune Kconfig source
 # files for other architectures
-set(ENV{ENV_VAR_ARCH}      ${ARCH})
-set(ENV{ENV_VAR_BOARD_DIR} ${BOARD_DIR})
+set(ENV{ARCH}      ${ARCH})
+set(ENV{BOARD_DIR} ${BOARD_DIR})
 
 add_custom_target(
   menuconfig
@@ -29,8 +29,8 @@ add_custom_target(
   srctree=${ZEPHYR_BASE}
   KERNELVERSION=${PROJECT_VERSION}
   KCONFIG_CONFIG=${DOTCONFIG}
-  ENV_VAR_ARCH=$ENV{ENV_VAR_ARCH}
-  ENV_VAR_BOARD_DIR=$ENV{ENV_VAR_BOARD_DIR}
+  ARCH=$ENV{ARCH}
+  BOARD_DIR=$ENV{BOARD_DIR}
   ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/kconfig/menuconfig.py ${KCONFIG_ROOT}
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/kconfig
   USES_TERMINAL
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d9fd1a94b66..f56b7dfda63 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -115,8 +115,8 @@ add_custom_target(
   COMMAND ${CMAKE_COMMAND} -E env
   PYTHONPATH="${ZEPHYR_BASE}/scripts/kconfig${SEP}$ENV{PYTHONPATH}"
   srctree=${ZEPHYR_BASE}
-  ENV_VAR_BOARD_DIR=boards/*/*/
-  ENV_VAR_ARCH=*
+  BOARD_DIR=boards/*/*/
+  ARCH=*
   KERNELVERSION=${PROJECT_VERSION}
   SRCARCH=x86
   ${PYTHON_EXECUTABLE} scripts/genrest.py Kconfig ${RST_OUT}/doc/reference/kconfig/
diff --git a/scripts/ci/check-compliance.py b/scripts/ci/check-compliance.py
index a489c89e509..81f2a6e1e25 100755
--- a/scripts/ci/check-compliance.py
+++ b/scripts/ci/check-compliance.py
@@ -105,8 +105,8 @@ def run_kconfig_undef_ref_check(tc, commit_range):
     os.environ["srctree"] = repository_path
 
     # Parse the entire Kconfig tree, to make sure we see all symbols
-    os.environ["ENV_VAR_BOARD_DIR"] = "boards/*/*"
-    os.environ["ENV_VAR_ARCH"] = "*"
+    os.environ["BOARD_DIR"] = "boards/*/*"
+    os.environ["ARCH"] = "*"
 
     # Enable strict Kconfig mode in Kconfiglib, which assumes there's just a
     # single Kconfig tree and warns for all references to undefined symbols