From 462e64f3919c069a9e593c32b627bd19c1bfb7e1 Mon Sep 17 00:00:00 2001 From: CYFS <2805686936@qq.com> Date: Fri, 28 Nov 2025 11:34:32 +0800 Subject: [PATCH] [bsp][hpm]:fix scons --dist --- bsp/hpmicro/hpm5300evk/SConstruct | 18 +++++++++++++++++- bsp/hpmicro/hpm5300evk/rtconfig.py | 23 ----------------------- bsp/hpmicro/hpm5301evklite/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm5301evklite/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm5e00evk/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm5e00evk/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6200evk/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6200evk/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6300evk/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6300evk/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6750evk/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6750evk/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6750evk2/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6750evk2/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6750evkmini/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6750evkmini/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6800evk/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6800evk/rtconfig.py | 24 ------------------------ bsp/hpmicro/hpm6p00evk/SConstruct | 17 +++++++++++++++++ bsp/hpmicro/hpm6p00evk/rtconfig.py | 24 ------------------------ bsp/hpmicro/libraries/SConscript | 14 -------------- 21 files changed, 170 insertions(+), 254 deletions(-) delete mode 100644 bsp/hpmicro/libraries/SConscript diff --git a/bsp/hpmicro/hpm5300evk/SConstruct b/bsp/hpmicro/hpm5300evk/SConstruct index ce70828c063..5fcc825f590 100644 --- a/bsp/hpmicro/hpm5300evk/SConstruct +++ b/bsp/hpmicro/hpm5300evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', @@ -56,7 +73,6 @@ GDB = rtconfig.GDB objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) - # includes rtt drivers objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) diff --git a/bsp/hpmicro/hpm5300evk/rtconfig.py b/bsp/hpmicro/hpm5300evk/rtconfig.py index f7a81092002..ab7d843770f 100644 --- a/bsp/hpmicro/hpm5300evk/rtconfig.py +++ b/bsp/hpmicro/hpm5300evk/rtconfig.py @@ -12,29 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) # toolchains options diff --git a/bsp/hpmicro/hpm5301evklite/SConstruct b/bsp/hpmicro/hpm5301evklite/SConstruct index a4d1f600062..3a656aa15b2 100644 --- a/bsp/hpmicro/hpm5301evklite/SConstruct +++ b/bsp/hpmicro/hpm5301evklite/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm5301evklite/rtconfig.py b/bsp/hpmicro/hpm5301evklite/rtconfig.py index c45c1190989..dc209cee21f 100644 --- a/bsp/hpmicro/hpm5301evklite/rtconfig.py +++ b/bsp/hpmicro/hpm5301evklite/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm5e00evk/SConstruct b/bsp/hpmicro/hpm5e00evk/SConstruct index a4d1f600062..3a656aa15b2 100644 --- a/bsp/hpmicro/hpm5e00evk/SConstruct +++ b/bsp/hpmicro/hpm5e00evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm5e00evk/rtconfig.py b/bsp/hpmicro/hpm5e00evk/rtconfig.py index 2c9cbfbda49..14789f56ff4 100644 --- a/bsp/hpmicro/hpm5e00evk/rtconfig.py +++ b/bsp/hpmicro/hpm5e00evk/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6200evk/SConstruct b/bsp/hpmicro/hpm6200evk/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6200evk/SConstruct +++ b/bsp/hpmicro/hpm6200evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6200evk/rtconfig.py b/bsp/hpmicro/hpm6200evk/rtconfig.py index d9c6d27fb6e..28d0b94cb9e 100644 --- a/bsp/hpmicro/hpm6200evk/rtconfig.py +++ b/bsp/hpmicro/hpm6200evk/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6300evk/SConstruct b/bsp/hpmicro/hpm6300evk/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6300evk/SConstruct +++ b/bsp/hpmicro/hpm6300evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6300evk/rtconfig.py b/bsp/hpmicro/hpm6300evk/rtconfig.py index 8d80351c7ce..dcf456c802c 100644 --- a/bsp/hpmicro/hpm6300evk/rtconfig.py +++ b/bsp/hpmicro/hpm6300evk/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6750evk/SConstruct b/bsp/hpmicro/hpm6750evk/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6750evk/SConstruct +++ b/bsp/hpmicro/hpm6750evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6750evk/rtconfig.py b/bsp/hpmicro/hpm6750evk/rtconfig.py index a79c03c4464..14ba9b7129d 100644 --- a/bsp/hpmicro/hpm6750evk/rtconfig.py +++ b/bsp/hpmicro/hpm6750evk/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6750evk2/SConstruct b/bsp/hpmicro/hpm6750evk2/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6750evk2/SConstruct +++ b/bsp/hpmicro/hpm6750evk2/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6750evk2/rtconfig.py b/bsp/hpmicro/hpm6750evk2/rtconfig.py index 0071195b00d..e37092268b9 100644 --- a/bsp/hpmicro/hpm6750evk2/rtconfig.py +++ b/bsp/hpmicro/hpm6750evk2/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6750evkmini/SConstruct b/bsp/hpmicro/hpm6750evkmini/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6750evkmini/SConstruct +++ b/bsp/hpmicro/hpm6750evkmini/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6750evkmini/rtconfig.py b/bsp/hpmicro/hpm6750evkmini/rtconfig.py index 0071195b00d..e37092268b9 100644 --- a/bsp/hpmicro/hpm6750evkmini/rtconfig.py +++ b/bsp/hpmicro/hpm6750evkmini/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6800evk/SConstruct b/bsp/hpmicro/hpm6800evk/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6800evk/SConstruct +++ b/bsp/hpmicro/hpm6800evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6800evk/rtconfig.py b/bsp/hpmicro/hpm6800evk/rtconfig.py index 64aed40637c..31a6e62e5ee 100644 --- a/bsp/hpmicro/hpm6800evk/rtconfig.py +++ b/bsp/hpmicro/hpm6800evk/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/hpm6p00evk/SConstruct b/bsp/hpmicro/hpm6p00evk/SConstruct index ce70828c063..bc5059c9370 100644 --- a/bsp/hpmicro/hpm6p00evk/SConstruct +++ b/bsp/hpmicro/hpm6p00evk/SConstruct @@ -15,6 +15,23 @@ except: print(RTT_ROOT) exit(-1) +def bsp_pkg_check(): + import subprocess + + need_update = True + for p in os.listdir("packages"): + if p.startswith("hpm_sdk-"): + need_update = False + break + if need_update: + print("\n===============================================================================") + print("Dependency packages missing, please running 'pkgs --update'...") + print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") + print("===============================================================================") + exit(1) + +RegisterPreBuildingAction(bsp_pkg_check) + TARGET = 'rtthread.' + rtconfig.TARGET_EXT AddOption('--run', diff --git a/bsp/hpmicro/hpm6p00evk/rtconfig.py b/bsp/hpmicro/hpm6p00evk/rtconfig.py index 34052a80e4a..accc54ed8c1 100644 --- a/bsp/hpmicro/hpm6p00evk/rtconfig.py +++ b/bsp/hpmicro/hpm6p00evk/rtconfig.py @@ -12,30 +12,6 @@ RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] -try: - from building import * -except: - print('Cannot found RT-Thread root directory, please check RTT_ROOT') - print(RTT_ROOT) - exit(-1) - -def bsp_pkg_check(): - import subprocess - - need_update = True - for p in os.listdir("packages"): - if p.startswith("hpm_sdk-"): - need_update = False - break - if need_update: - print("\n===============================================================================") - print("Dependency packages missing, please running 'pkgs --update'...") - print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...") - print("===============================================================================") - exit(1) - -RegisterPreBuildingAction(bsp_pkg_check) - # toolchains options ARCH='risc-v' diff --git a/bsp/hpmicro/libraries/SConscript b/bsp/hpmicro/libraries/SConscript deleted file mode 100644 index 1bc8f912511..00000000000 --- a/bsp/hpmicro/libraries/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -import os -import rtconfig -from building import * - - -objs = [] -cwd = GetCurrentDir() -list = os.listdir(cwd) - -for item in list: - if os.path.isfile(os.path.join(cwd, item, 'SConscript')): - objs = objs + SConscript(os.path.join(item, 'SConscript')) - -Return('objs')