kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/idf_env_fpga_warning_make' into 'master'
cmake, make: fix remaining IDF_ENV_FPGA warnings See merge request espressif/esp-idf!9344pull/5628/head
commit
1d55a3c430
|
@ -92,6 +92,7 @@ define RunConfGen
|
||||||
--env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
|
--env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
|
||||||
--env "COMPONENT_SDKCONFIG_RENAMES=$(strip $(COMPONENT_SDKCONFIG_RENAMES))" \
|
--env "COMPONENT_SDKCONFIG_RENAMES=$(strip $(COMPONENT_SDKCONFIG_RENAMES))" \
|
||||||
--env "IDF_CMAKE=n" \
|
--env "IDF_CMAKE=n" \
|
||||||
|
--env "IDF_ENV_FPGA=n" \
|
||||||
$(DEFAULTS_ARG) \
|
$(DEFAULTS_ARG) \
|
||||||
--output config ${SDKCONFIG} \
|
--output config ${SDKCONFIG} \
|
||||||
--output makefile $(SDKCONFIG_MAKEFILE) \
|
--output makefile $(SDKCONFIG_MAKEFILE) \
|
||||||
|
@ -121,6 +122,7 @@ define RunMenuConf
|
||||||
COMPONENT_KCONFIGS_SOURCE_FILE="$(COMPONENT_KCONFIGS_SOURCE_FILE)" \
|
COMPONENT_KCONFIGS_SOURCE_FILE="$(COMPONENT_KCONFIGS_SOURCE_FILE)" \
|
||||||
COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE="$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
|
COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE="$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
|
||||||
IDF_CMAKE=n \
|
IDF_CMAKE=n \
|
||||||
|
IDF_ENV_FPGA=n \
|
||||||
$(MENUCONFIG_CMD) $(IDF_PATH)/Kconfig
|
$(MENUCONFIG_CMD) $(IDF_PATH)/Kconfig
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ except ImportError:
|
||||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
||||||
from find_build_apps import BuildItem, setup_logging
|
from find_build_apps import BuildItem, setup_logging
|
||||||
|
|
||||||
WARNING_REGEX = re.compile(r"^\s*(?:error|warning)", re.MULTILINE | re.IGNORECASE)
|
WARNING_REGEX = re.compile(r"(?:error|warning)", re.MULTILINE | re.IGNORECASE)
|
||||||
|
|
||||||
IGNORE_WARNS = [
|
IGNORE_WARNS = [
|
||||||
re.compile(r_str) for r_str in [
|
re.compile(r_str) for r_str in [
|
||||||
|
|
|
@ -140,6 +140,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
|
||||||
|
|
||||||
idf_build_get_property(idf_target IDF_TARGET)
|
idf_build_get_property(idf_target IDF_TARGET)
|
||||||
idf_build_get_property(idf_path IDF_PATH)
|
idf_build_get_property(idf_path IDF_PATH)
|
||||||
|
idf_build_get_property(idf_env_fpga __IDF_ENV_FPGA)
|
||||||
|
|
||||||
string(REPLACE ";" " " kconfigs "${kconfigs}")
|
string(REPLACE ";" " " kconfigs "${kconfigs}")
|
||||||
string(REPLACE ";" " " kconfig_projbuilds "${kconfig_projbuilds}")
|
string(REPLACE ";" " " kconfig_projbuilds "${kconfig_projbuilds}")
|
||||||
|
@ -259,8 +260,6 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
|
||||||
set(TERM_CHECK_CMD ${python} ${idf_path}/tools/check_term.py)
|
set(TERM_CHECK_CMD ${python} ${idf_path}/tools/check_term.py)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
idf_build_get_property(idf_env_fpga __IDF_ENV_FPGA)
|
|
||||||
|
|
||||||
# Generate the menuconfig target
|
# Generate the menuconfig target
|
||||||
add_custom_target(menuconfig
|
add_custom_target(menuconfig
|
||||||
${menuconfig_depends}
|
${menuconfig_depends}
|
||||||
|
|
|
@ -25,6 +25,10 @@ SDKCONFIG_TEST_OPTS = [
|
||||||
"EXCLUDE_COMPONENTS",
|
"EXCLUDE_COMPONENTS",
|
||||||
"TEST_EXCLUDE_COMPONENTS",
|
"TEST_EXCLUDE_COMPONENTS",
|
||||||
"TEST_COMPONENTS",
|
"TEST_COMPONENTS",
|
||||||
|
]
|
||||||
|
|
||||||
|
# These keys in sdkconfig.defaults are not propagated to the final sdkconfig file:
|
||||||
|
SDKCONFIG_IGNORE_OPTS = [
|
||||||
"TEST_GROUPS"
|
"TEST_GROUPS"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -268,8 +272,11 @@ class BuildSystem(object):
|
||||||
line += "\n"
|
line += "\n"
|
||||||
if cls.NAME == 'cmake':
|
if cls.NAME == 'cmake':
|
||||||
m = SDKCONFIG_LINE_REGEX.match(line)
|
m = SDKCONFIG_LINE_REGEX.match(line)
|
||||||
if m and m.group(1) in SDKCONFIG_TEST_OPTS:
|
key = m.group(1) if m else None
|
||||||
extra_cmakecache_items[m.group(1)] = m.group(2)
|
if key in SDKCONFIG_TEST_OPTS:
|
||||||
|
extra_cmakecache_items[key] = m.group(2)
|
||||||
|
continue
|
||||||
|
if key in SDKCONFIG_IGNORE_OPTS:
|
||||||
continue
|
continue
|
||||||
f_out.write(os.path.expandvars(line))
|
f_out.write(os.path.expandvars(line))
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
"COMPONENT_SDKCONFIG_RENAMES": "${sdkconfig_renames}",
|
"COMPONENT_SDKCONFIG_RENAMES": "${sdkconfig_renames}",
|
||||||
"IDF_CMAKE": "y",
|
"IDF_CMAKE": "y",
|
||||||
"IDF_TARGET": "${idf_target}",
|
"IDF_TARGET": "${idf_target}",
|
||||||
|
"IDF_ENV_FPGA": "${idf_env_fpga}",
|
||||||
"IDF_PATH": "${idf_path}",
|
"IDF_PATH": "${idf_path}",
|
||||||
"COMPONENT_KCONFIGS_SOURCE_FILE": "${kconfigs_path}",
|
"COMPONENT_KCONFIGS_SOURCE_FILE": "${kconfigs_path}",
|
||||||
"COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}"
|
"COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "${kconfigs_projbuild_path}"
|
||||||
|
|
Ładowanie…
Reference in New Issue