diff --git a/bsp/Vango/v85xx/Kconfig b/bsp/Vango/v85xx/Kconfig index df8194d7475e0f0576b4d6ce0c55ecf4954bd611..db7179508163bbd7644a541df4438b159f6717e9 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 cab08d495003693147af89b2ac459c66715e40c2..394f300b2233ccfbf49729c9940231c206a34157 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 4e3f2d260d138895f419b68a03bbbb13b6e0aeab..4adc43f0338c3609aa9809245d48fede901e6cf7 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 4c860d1e2b9782b64e2404b19c4156be241c1dfd..ac0a9dcd0d19adeb4fdeb7f83f119e3f0eff9a2e 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 cf56d6850b00d2ee4de610c14aafc2326f64ea8a..149af66092ee57572fc004f8fe96f1f9e11e965a 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 4b462ce66058260e112d1409856a4141ba06bb3f..8886098e955fbf34463ea6bbdce9a349861b0c2d 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 3053a7980ae06372ebceb96bfcdd61aa4df3ef7c..f02e680ad77804d7880185ca192a95fd1b6a34f5 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 817b1be071bb976c0b12b9509224aca68c5ad3ab..09dfa83715b533c08a5c7f7ca3a9dc829ccbb53d 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 23b4eea1d415d6b6d173171b61974822bfb5e21e..61d32c2cc9f331653a6f65d527d9918b521b584e 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 32ad8d65feeff6938e13037bf70c2c049d05a369..31fcc1e822f524d295c5d02867a5e416c5624704 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 4de0cd0233e64293023c931c5620a31fe2ccfd05..2cc06b28fb175c8e13dc37eda8efa223f74a9c8f 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 c9ed1b8c50d7a6422182d99c80e56a9ab67587f2..1c2d48b42ccf1dc7dac7a82e7cc6efb7935a0112 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 67d8d9c3a53f012e536bd8090f9f7c4f3a1ef873..5b6608b353214e731b1f0208c534ede41cf9d388 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 97f374e66334e72f7f8dd410bd4754f8ba2858a5..83fa4a0ca9710cc3b7df0fc84d4124ef49a855f7 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 1725b1f69c86e0034d687ef7a6578605f51ff473..d8380c4595f4484f0b34210e8017bb57e7ebf551 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 97f374e66334e72f7f8dd410bd4754f8ba2858a5..83fa4a0ca9710cc3b7df0fc84d4124ef49a855f7 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 b02aee337a32bf2320c7258c067ca2e9e07b3b7e..eff0e211b4a81e29c155c5cc183ca09abe9b428b 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 38fe7234b9e37a71f3d7fc307625a9154f6662c2..524115edf76e0aec50d7f4f6b2b838dba5706719 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 3fb6e3bbdf174662dc4c892c3cb17bed78429ef5..256e23a0876b4be7d443462da2482933296dd629 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 0efa3f8a04a6d8ecf5ee6a3adb8235ec5e401170..f185f7fb5259ddc1cdd897e2c6fc036720ddc447 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 fc2dfe1328d737567872f1a19da4e0e70d259286..73bdf3eea0dba73027beeebf971c4645bf0662cd 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 09881984265406a41a07857e4ccaf094998e69dd..450ea89178b286a806c39e6cfe700128205ba2a2 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 924a7509e0af66dc4887aa73a7b65529eed9db8d..7a400db91f4a82292908c8b2b99e87e4193f78d0 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 25e11c30604e24e3a1d5ccff0222edf868a27fdb..3b4403a7e453b532217b4e4362b6aada582c216a 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 59dcef1b29543e6bc44ba4ad513af828fdb9cb91..e2e7167ac9ac546f278b50d45e9a1a156c8cdc98 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 afbbe07947fa14b4d3e1d1e47385f5baa4792584..eca0a786c881fbf7e492f062d5458875f4265977 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: