From 2096ff67f4f191d6bf07993f51bcffc8bcc92b12 Mon Sep 17 00:00:00 2001 From: CYFS <2805686936@qq.com> Date: Wed, 27 May 2026 11:30:15 +0800 Subject: [PATCH] [bsp][esp]:fix esp32_c3 ci err --- bsp/ESP/ESP32_C3/Kconfig | 2 +- bsp/ESP/ESP32_C3/SConstruct | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bsp/ESP/ESP32_C3/Kconfig b/bsp/ESP/ESP32_C3/Kconfig index 49c80301b3b..98d353037c4 100644 --- a/bsp/ESP/ESP32_C3/Kconfig +++ b/bsp/ESP/ESP32_C3/Kconfig @@ -2,7 +2,7 @@ mainmenu "RT-Thread Configuration" BSP_DIR := . -RTT_DIR := ../.. +RTT_DIR := ../../.. PKGS_DIR := packages diff --git a/bsp/ESP/ESP32_C3/SConstruct b/bsp/ESP/ESP32_C3/SConstruct index 916d12345f4..fc22cb149e4 100644 --- a/bsp/ESP/ESP32_C3/SConstruct +++ b/bsp/ESP/ESP32_C3/SConstruct @@ -37,13 +37,21 @@ def elf2image(target, source, env): if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.join(os.getcwd(), '..', '..') + RTT_ROOT = os.path.join(os.getcwd(), '..', '..', '..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * TARGET = 'rtthread.' + rtconfig.TARGET_EXT +SDK_ROOT = os.path.abspath('./') +if os.path.exists(SDK_ROOT + '/libraries'): + libraries_path_prefix = SDK_ROOT + '/libraries' +else: + libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' + +SDK_LIB = libraries_path_prefix +Export('SDK_LIB') DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, @@ -60,6 +68,7 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, remove_components = ['libc']) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs)