@@ -768,10 +768,10 @@ def find_default_component(target_configs):
768
768
# Generate final linker script
769
769
#
770
770
771
- if not env . BoardConfig () .get ("build.ldscript" , "" ):
771
+ if not board .get ("build.ldscript" , "" ):
772
772
linker_script = env .Command (
773
773
join ("$BUILD_DIR" , "esp32_out.ld" ),
774
- env . BoardConfig () .get (
774
+ board .get (
775
775
"build.esp-idf.ldscript" ,
776
776
join (FRAMEWORK_DIR , "components" , "esp32" , "ld" , "esp32.ld" ),
777
777
),
@@ -789,7 +789,7 @@ def find_default_component(target_configs):
789
789
#
790
790
791
791
fwpartitions_dir = join (FRAMEWORK_DIR , "components" , "partition_table" )
792
- partitions_csv = env . BoardConfig () .get ("build.partitions" , "partitions_singleapp.csv" )
792
+ partitions_csv = board .get ("build.partitions" , "partitions_singleapp.csv" )
793
793
env .Replace (
794
794
PARTITIONS_TABLE_CSV = abspath (
795
795
join (fwpartitions_dir , partitions_csv )
@@ -805,7 +805,7 @@ def find_default_component(target_configs):
805
805
'"$PYTHONEXE" "%s" -q --flash-size "%s" $SOURCE $TARGET'
806
806
% (
807
807
join (FRAMEWORK_DIR , "components" , "partition_table" , "gen_esp32part.py" ),
808
- env . BoardConfig () .get ("upload.flash_size" , "detect" ),
808
+ board .get ("upload.flash_size" , "detect" ),
809
809
),
810
810
"Generating partitions $TARGET" ,
811
811
),
@@ -853,9 +853,8 @@ def find_default_component(target_configs):
853
853
project_codemodel = get_cmake_code_model (
854
854
env .subst ("$PROJECT_DIR" ),
855
855
BUILD_DIR ,
856
- ["-DEXTRA_COMPONENT_DIRS:PATH=" + ";" .join (extra_components )]
857
- if extra_components
858
- else [],
856
+ ["-DEXTRA_COMPONENT_DIRS:PATH=" + ";" .join (extra_components )] +
857
+ click .parser .split_arg_string (board .get ("build.cmake_extra_args" , "" ))
859
858
)
860
859
861
860
if not project_codemodel :
0 commit comments