ci: use env feat_env branch

bsp/ESP/ESP32_C3/rtconfig.py

@@ -8,7 +8,7 @@
 if os.getenv('RTT_CC'):
     CROSS_TOOL = os.getenv('RTT_CC')
 
-if CROSS_TOOL == 'gcc': 
+if CROSS_TOOL == 'gcc':
     PLATFORM    = 'gcc'
     EXEC_PATH   = r'~/.espressif/tools/riscv32-esp-elf/esp-2022r1-11.2.0/riscv32-esp-elf/bin'
 else:
@@ -21,6 +21,20 @@
 
 BUILD = 'debug'
 
+def _get_package_path(package_name):
+    bsp_root = os.path.dirname(os.path.abspath(__file__))
+    candidates = [
+        os.path.join(bsp_root, 'libraries', package_name),
+        os.path.join(os.path.dirname(bsp_root), 'libraries', package_name),
+        os.path.join(bsp_root, 'packages', package_name),
+    ]
+
+    for path in candidates:
+        if os.path.isdir(path):
+            return os.path.relpath(path, bsp_root).replace('\\', '/')
+
+    return os.path.join('packages', package_name).replace('\\', '/')
+
 if PLATFORM == 'gcc':
     # toolchains
     PREFIX = 'riscv32-esp-elf-'
@@ -38,8 +52,9 @@
     DEVICE  = ' -nostartfiles -march=rv32imc --specs=nosys.specs -fasynchronous-unwind-tables '
     CFLAGS = DEVICE + '-include ../../components/libc/compilers/common/include/sys/ioctl.h -gdwarf-4 -ggdb -Og '
     AFLAGS =  ' -c' + DEVICE + ' -x assembler-with-cpp'
-    LFLAGS = DEVICE + ' -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0 -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,_start -T idf_port/ld/memory.ld -T idf_port/ld/sections.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.libgcc.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.newlib.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.version.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld -T packages/ESP-IDF-latest/components/soc/esp32c3/ld/esp32c3.peripherals.ld  -Wl,--wrap=_Unwind_SetEnableExceptionFdeSorting -Wl,--wrap=__register_frame_info_bases -Wl,--wrap=__register_frame_info -Wl,--wrap=__register_frame -Wl,--wrap=__register_frame_info_table_bases -Wl,--wrap=__register_frame_info_table -Wl,--wrap=__register_frame_table -Wl,--wrap=__deregister_frame_info_bases -Wl,--wrap=__deregister_frame_info -Wl,--wrap=_Unwind_Find_FDE -Wl,--wrap=_Unwind_GetGR -Wl,--wrap=_Unwind_GetCFA -Wl,--wrap=_Unwind_GetIP -Wl,--wrap=_Unwind_GetIPInfo -Wl,--wrap=_Unwind_GetRegionStart -Wl,--wrap=_Unwind_GetDataRelBase -Wl,--wrap=_Unwind_GetTextRelBase -Wl,--wrap=_Unwind_SetIP -Wl,--wrap=_Unwind_SetGR -Wl,--wrap=_Unwind_GetLanguageSpecificData -Wl,--wrap=_Unwind_FindEnclosingFunction -Wl,--wrap=_Unwind_Resume -Wl,--wrap=_Unwind_RaiseException -Wl,--wrap=_Unwind_DeleteException -Wl,--wrap=_Unwind_ForcedUnwind -Wl,--wrap=_Unwind_Resume_or_Rethrow -Wl,--wrap=_Unwind_Backtrace -Wl,--wrap=__cxa_call_unexpected -Wl,--eh-frame-hdr -Wl,--wrap=__gxx_personality_v0  -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0'
-    CXXFLAGS = CFLAGS 
+    idf_path = _get_package_path('ESP-IDF-latest')
+    LFLAGS = DEVICE + ' -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0 -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,_start -T idf_port/ld/memory.ld -T idf_port/ld/sections.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.libgcc.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.newlib.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.version.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld -T ' + idf_path + '/components/soc/esp32c3/ld/esp32c3.peripherals.ld  -Wl,--wrap=_Unwind_SetEnableExceptionFdeSorting -Wl,--wrap=__register_frame_info_bases -Wl,--wrap=__register_frame_info -Wl,--wrap=__register_frame -Wl,--wrap=__register_frame_info_table_bases -Wl,--wrap=__register_frame_info_table -Wl,--wrap=__register_frame_table -Wl,--wrap=__deregister_frame_info_bases -Wl,--wrap=__deregister_frame_info -Wl,--wrap=_Unwind_Find_FDE -Wl,--wrap=_Unwind_GetGR -Wl,--wrap=_Unwind_GetCFA -Wl,--wrap=_Unwind_GetIP -Wl,--wrap=_Unwind_GetIPInfo -Wl,--wrap=_Unwind_GetRegionStart -Wl,--wrap=_Unwind_GetDataRelBase -Wl,--wrap=_Unwind_GetTextRelBase -Wl,--wrap=_Unwind_SetIP -Wl,--wrap=_Unwind_SetGR -Wl,--wrap=_Unwind_GetLanguageSpecificData -Wl,--wrap=_Unwind_FindEnclosingFunction -Wl,--wrap=_Unwind_Resume -Wl,--wrap=_Unwind_RaiseException -Wl,--wrap=_Unwind_DeleteException -Wl,--wrap=_Unwind_ForcedUnwind -Wl,--wrap=_Unwind_Resume_or_Rethrow -Wl,--wrap=_Unwind_Backtrace -Wl,--wrap=__cxa_call_unexpected -Wl,--eh-frame-hdr -Wl,--wrap=__gxx_personality_v0  -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0'
+    CXXFLAGS = CFLAGS
 
     POST_ACTION = OBJCPY + ' -Oihex $TARGET rtthread.hex\n' + SIZE + ' $TARGET \n'
 

bsp/Infineon/libraries/templates/XMC7200D/SConstruct

@@ -36,10 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
+
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/psoc6-cy8ckit-062-BLE/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/psoc6-cy8ckit-062S2-43012/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/psoc6-cy8ckit-062s4/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/psoc6-cy8cproto-062S3-4343W/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/psoc6-evaluationkit-062S2/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/xmc7100d-f144k4160aa/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/Infineon/xmc7200-kit_xmc7200_evk/SConstruct

@@ -36,12 +36,30 @@ Export('rtconfig')
 
 SDK_ROOT = os.path.abspath('./')
 
-libraries_path_prefix = SDK_ROOT
+def _contains_infineon_package(path):
+    if not os.path.isdir(path):
+        return False
 
-if os.path.exists(SDK_ROOT + '/packages'):
-    libraries_path_prefix = SDK_ROOT + '/packages'
-else:
+    for name in os.listdir(path):
+        package_path = os.path.join(path, name)
+        if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
+            return True
+
+    return False
+
+libraries_path_prefix = None
+for path in [
+    os.path.join(SDK_ROOT, 'libraries'),
+    os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
+    os.path.join(SDK_ROOT, 'packages')
+]:
+    if _contains_infineon_package(path):
+        libraries_path_prefix = path
+        break
+
+if not libraries_path_prefix:
     print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
+    libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')
 
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')

bsp/gd32/risc-v/gd32vw553h-eval/SConscript

@@ -13,4 +13,31 @@ for d in list:
     if os.path.isfile(os.path.join(path, 'SConscript')):
         objs = objs + SConscript(os.path.join(d, 'SConscript'))
 
+def _get_package_path(package_name):
+    candidates = [
+        os.path.join(cwd, 'libraries', package_name),
+        os.path.join(os.path.dirname(cwd), 'libraries', package_name),
+        os.path.join(cwd, 'packages', package_name)
+    ]
+
+    for path in candidates:
+        if os.path.isdir(path):
+            return path
+
+    return None
+
+wifi_pkg_path = _get_package_path('gd32vw55x-wifi-latest')
+if wifi_pkg_path and GetDepend(['PKG_USING_GD32VW55X_WIFI']):
+    lwip_mem = os.path.join(RTT_ROOT, 'components', 'net', 'lwip', 'lwip-2.1.2', 'src', 'core', 'mem.c')
+    port_src = [os.path.join(cwd, 'board', 'mbedtls_time_port.c')]
+    if os.path.basename(os.path.dirname(wifi_pkg_path)) == 'libraries' and os.path.isfile(lwip_mem):
+        port_src.append(lwip_mem)
+
+    objs += DefineGroup('gd32vw55x-wifi-port', port_src, depend=['PKG_USING_GD32VW55X_WIFI'],
+                        CPPPATH=[
+                            os.path.join(wifi_pkg_path, 'src', 'lwip', 'port'),
+                            os.path.join(wifi_pkg_path, 'src', 'lwip', 'port', 'arch'),
+                            os.path.join(RTT_ROOT, 'components', 'net', 'lwip', 'lwip-2.1.2', 'src', 'include')
+                        ])
+
 Return('objs')