From 12c4b5b1df418df8553d25b109a3e60723e965e7 Mon Sep 17 00:00:00 2001 From: guozhanxin Date: Tue, 29 Mar 2022 17:36:01 +0800 Subject: [PATCH] [bsp] Fix RTT_ROOT path problem. --- bsp/Vango/v85xx/Kconfig | 2 +- bsp/Vango/v85xx/SConstruct | 2 +- bsp/Vango/v85xxp/Kconfig | 2 +- bsp/Vango/v85xxp/SConstruct | 2 +- bsp/acm32/acm32f0x0-nucleo/Kconfig | 2 +- bsp/acm32/acm32f0x0-nucleo/SConstruct | 2 +- bsp/acm32/acm32f4xx-nucleo/Kconfig | 2 +- bsp/acm32/acm32f4xx-nucleo/SConstruct | 2 +- bsp/at91/at91sam9260/Kconfig | 2 +- bsp/at91/at91sam9260/SConstruct | 2 +- bsp/at91/at91sam9g45/Kconfig | 4 ++-- bsp/at91/at91sam9g45/SConstruct | 2 +- bsp/fujitsu/mb9x/mb9bf500r/SConstruct | 2 +- bsp/fujitsu/mb9x/mb9bf506r/SConstruct | 2 +- bsp/fujitsu/mb9x/mb9bf568r/SConstruct | 2 +- bsp/fujitsu/mb9x/mb9bf618s/SConstruct | 2 +- bsp/loongson/ls1bdev/Kconfig | 2 +- bsp/loongson/ls1bdev/SConstruct | 2 +- bsp/loongson/ls1cdev/Kconfig | 2 +- bsp/loongson/ls1cdev/SConstruct | 2 +- bsp/loongson/ls2kdev/Kconfig | 4 ++-- bsp/loongson/ls2kdev/rtconfig.py | 2 +- bsp/stm32/stm32f207-st-nucleo/Kconfig | 6 +++--- bsp/stm32/stm32f207-st-nucleo/SConstruct | 4 ---- bsp/yichip/yc3121-pos/Kconfig | 2 +- bsp/yichip/yc3121-pos/SConstruct | 2 +- 26 files changed, 29 insertions(+), 33 deletions(-) diff --git a/bsp/Vango/v85xx/Kconfig b/bsp/Vango/v85xx/Kconfig index df8194d747..db71795081 100644 --- a/bsp/Vango/v85xx/Kconfig +++ b/bsp/Vango/v85xx/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." # you can change the RTT_ROOT default: "rt-thread" # example : default "F:/git_repositories/rt-thread" diff --git a/bsp/Vango/v85xx/SConstruct b/bsp/Vango/v85xx/SConstruct index cab08d4950..394f300b22 100644 --- a/bsp/Vango/v85xx/SConstruct +++ b/bsp/Vango/v85xx/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] try: diff --git a/bsp/Vango/v85xxp/Kconfig b/bsp/Vango/v85xxp/Kconfig index 4e3f2d260d..4adc43f033 100644 --- a/bsp/Vango/v85xxp/Kconfig +++ b/bsp/Vango/v85xxp/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." # you can change the RTT_ROOT default: "rt-thread" # example : default "F:/git_repositories/rt-thread" diff --git a/bsp/Vango/v85xxp/SConstruct b/bsp/Vango/v85xxp/SConstruct index 4c860d1e2b..ac0a9dcd0d 100644 --- a/bsp/Vango/v85xxp/SConstruct +++ b/bsp/Vango/v85xxp/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] try: diff --git a/bsp/acm32/acm32f0x0-nucleo/Kconfig b/bsp/acm32/acm32f0x0-nucleo/Kconfig index cf56d6850b..149af66092 100644 --- a/bsp/acm32/acm32f0x0-nucleo/Kconfig +++ b/bsp/acm32/acm32f0x0-nucleo/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." config PKGS_DIR string diff --git a/bsp/acm32/acm32f0x0-nucleo/SConstruct b/bsp/acm32/acm32f0x0-nucleo/SConstruct index 4b462ce660..8886098e95 100644 --- a/bsp/acm32/acm32f0x0-nucleo/SConstruct +++ b/bsp/acm32/acm32f0x0-nucleo/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] try: diff --git a/bsp/acm32/acm32f4xx-nucleo/Kconfig b/bsp/acm32/acm32f4xx-nucleo/Kconfig index 3053a7980a..f02e680ad7 100644 --- a/bsp/acm32/acm32f4xx-nucleo/Kconfig +++ b/bsp/acm32/acm32f4xx-nucleo/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." config PKGS_DIR string diff --git a/bsp/acm32/acm32f4xx-nucleo/SConstruct b/bsp/acm32/acm32f4xx-nucleo/SConstruct index 817b1be071..09dfa83715 100644 --- a/bsp/acm32/acm32f4xx-nucleo/SConstruct +++ b/bsp/acm32/acm32f4xx-nucleo/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/at91/at91sam9260/Kconfig b/bsp/at91/at91sam9260/Kconfig index 23b4eea1d4..61d32c2cc9 100644 --- a/bsp/at91/at91sam9260/Kconfig +++ b/bsp/at91/at91sam9260/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." config PKGS_DIR string diff --git a/bsp/at91/at91sam9260/SConstruct b/bsp/at91/at91sam9260/SConstruct index 32ad8d65fe..31fcc1e822 100644 --- a/bsp/at91/at91sam9260/SConstruct +++ b/bsp/at91/at91sam9260/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/at91/at91sam9g45/Kconfig b/bsp/at91/at91sam9g45/Kconfig index 4de0cd0233..2cc06b28fb 100644 --- a/bsp/at91/at91sam9g45/Kconfig +++ b/bsp/at91/at91sam9g45/Kconfig @@ -8,9 +8,9 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." -# you can change the RTT_ROOT default "../.." to your rtthread_root, +# you can change the RTT_ROOT default "../../.." to your rtthread_root, # example : default "F:/git_repositories/rt-thread" config PKGS_DIR diff --git a/bsp/at91/at91sam9g45/SConstruct b/bsp/at91/at91sam9g45/SConstruct index c9ed1b8c50..1c2d48b42c 100644 --- a/bsp/at91/at91sam9g45/SConstruct +++ b/bsp/at91/at91sam9g45/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/fujitsu/mb9x/mb9bf500r/SConstruct b/bsp/fujitsu/mb9x/mb9bf500r/SConstruct index 67d8d9c3a5..5b6608b353 100644 --- a/bsp/fujitsu/mb9x/mb9bf500r/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf500r/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/fujitsu/mb9x/mb9bf506r/SConstruct b/bsp/fujitsu/mb9x/mb9bf506r/SConstruct index 97f374e663..83fa4a0ca9 100644 --- a/bsp/fujitsu/mb9x/mb9bf506r/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf506r/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/fujitsu/mb9x/mb9bf568r/SConstruct b/bsp/fujitsu/mb9x/mb9bf568r/SConstruct index 1725b1f69c..d8380c4595 100644 --- a/bsp/fujitsu/mb9x/mb9bf568r/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf568r/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/fujitsu/mb9x/mb9bf618s/SConstruct b/bsp/fujitsu/mb9x/mb9bf618s/SConstruct index 97f374e663..83fa4a0ca9 100644 --- a/bsp/fujitsu/mb9x/mb9bf618s/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf618s/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/loongson/ls1bdev/Kconfig b/bsp/loongson/ls1bdev/Kconfig index b02aee337a..eff0e211b4 100644 --- a/bsp/loongson/ls1bdev/Kconfig +++ b/bsp/loongson/ls1bdev/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." config PKGS_DIR string diff --git a/bsp/loongson/ls1bdev/SConstruct b/bsp/loongson/ls1bdev/SConstruct index 38fe7234b9..524115edf7 100644 --- a/bsp/loongson/ls1bdev/SConstruct +++ b/bsp/loongson/ls1bdev/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/loongson/ls1cdev/Kconfig b/bsp/loongson/ls1cdev/Kconfig index 3fb6e3bbdf..256e23a087 100644 --- a/bsp/loongson/ls1cdev/Kconfig +++ b/bsp/loongson/ls1cdev/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." config PKGS_DIR string diff --git a/bsp/loongson/ls1cdev/SConstruct b/bsp/loongson/ls1cdev/SConstruct index 0efa3f8a04..f185f7fb52 100644 --- a/bsp/loongson/ls1cdev/SConstruct +++ b/bsp/loongson/ls1cdev/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/loongson/ls2kdev/Kconfig b/bsp/loongson/ls2kdev/Kconfig index fc2dfe1328..73bdf3eea0 100644 --- a/bsp/loongson/ls2kdev/Kconfig +++ b/bsp/loongson/ls2kdev/Kconfig @@ -8,9 +8,9 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." -# you can change the RTT_ROOT default "../.." to your rtthread_root, +# you can change the RTT_ROOT default "../../.." to your rtthread_root, # example : default "F:/git_repositories/rt-thread" config PKGS_DIR diff --git a/bsp/loongson/ls2kdev/rtconfig.py b/bsp/loongson/ls2kdev/rtconfig.py index 0988198426..450ea89178 100644 --- a/bsp/loongson/ls2kdev/rtconfig.py +++ b/bsp/loongson/ls2kdev/rtconfig.py @@ -6,7 +6,7 @@ CPU ='gs264' if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = '../..' + RTT_ROOT = '../../..' # toolchains options CROSS_TOOL = 'gcc' diff --git a/bsp/stm32/stm32f207-st-nucleo/Kconfig b/bsp/stm32/stm32f207-st-nucleo/Kconfig index 924a7509e0..7a400db91f 100644 --- a/bsp/stm32/stm32f207-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f207-st-nucleo/Kconfig @@ -8,15 +8,15 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "rt-thread" + default "../../.." config PKGS_DIR string option env="PKGS_ROOT" default "packages" - + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" -source "libraries/Kconfig" +source "../libraries/Kconfig" source "board/Kconfig" diff --git a/bsp/stm32/stm32f207-st-nucleo/SConstruct b/bsp/stm32/stm32f207-st-nucleo/SConstruct index 25e11c3060..3b4403a7e4 100644 --- a/bsp/stm32/stm32f207-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f207-st-nucleo/SConstruct @@ -7,10 +7,6 @@ if os.getenv('RTT_ROOT'): else: RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') -# set RTT_ROOT -if not os.getenv("RTT_ROOT"): - RTT_ROOT="rt-thread" - sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] try: from building import * diff --git a/bsp/yichip/yc3121-pos/Kconfig b/bsp/yichip/yc3121-pos/Kconfig index 59dcef1b29..e2e7167ac9 100644 --- a/bsp/yichip/yc3121-pos/Kconfig +++ b/bsp/yichip/yc3121-pos/Kconfig @@ -8,7 +8,7 @@ config BSP_DIR config RTT_DIR string option env="RTT_ROOT" - default "../.." + default "../../.." config PKGS_DIR string diff --git a/bsp/yichip/yc3121-pos/SConstruct b/bsp/yichip/yc3121-pos/SConstruct index afbbe07947..eca0a786c8 100644 --- a/bsp/yichip/yc3121-pos/SConstruct +++ b/bsp/yichip/yc3121-pos/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] try: -- GitLab