From 9350cf7fca83bcfe224e2f818d1e1331d5a88b76 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Jul 2026 16:33:02 +0000
Subject: [PATCH 1/2] Initial plan


From c5001a0877a28528699829ce76ffa9735f591628 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Jul 2026 16:35:00 +0000
Subject: [PATCH 2/2] Fix menuconfig legacy Kconfig environment variables

---
 cmds/cmd_menuconfig.py | 8 +++++---
 env.py                 | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmds/cmd_menuconfig.py b/cmds/cmd_menuconfig.py
index 348be4e..96efc1c 100644
--- a/cmds/cmd_menuconfig.py
+++ b/cmds/cmd_menuconfig.py
@@ -190,9 +190,11 @@ def cmd(args):
 
     env_root = Import('env_root')
 
-    # get RTT_DIR from environment or Kconfig file
-    if get_rtt_root():
-        os.environ['RTT_DIR'] = get_rtt_root()
+    # Keep both legacy Kconfig symbol names and their environment variables set.
+    rtt_root = get_rtt_root()
+    if rtt_root:
+        os.environ['RTT_ROOT'] = rtt_root
+        os.environ['RTT_DIR'] = rtt_root
 
     if not os.path.exists('Kconfig'):
         if platform.system() == "Windows":
diff --git a/env.py b/env.py
index d240476..5b3e2bf 100644
--- a/env.py
+++ b/env.py
@@ -198,6 +198,7 @@ def export_environment_variable():
     os.environ["ENV_ROOT"] = env_root
     os.environ['PKGS_ROOT'] = pkgs_root
     os.environ['PKGS_DIR'] = pkgs_root
+    os.environ['BSP_ROOT'] = bsp_root
     os.environ['BSP_DIR'] = bsp_root
 
     Export('env_root')