Skip to content

Commit f92d3ec

Browse files
committed
Move name of config file to one location
1 parent 3a273f7 commit f92d3ec

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tools/export/exporters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def scan_and_copy_resources(self, prj_paths, trg_path, relative=False):
174174

175175
if hasattr(self, "MBED_CONF_ACTIVE") and self.MBED_CONF_ACTIVE :
176176
# Add the configuration file to the target directory
177-
self.config_header = "mbed_conf.h"
177+
self.config_header = self.toolchain.MBED_CONFIG_FILE_NAME
178178
config.get_config_data_header(join(trg_path, self.config_header))
179179
self.config_macros = []
180180
else :

tools/toolchains/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ class mbedToolchain:
227227
GOANNA_FORMAT = "[Goanna] warning [%FILENAME%:%LINENO%] - [%CHECKNAME%(%SEVERITY%)] %MESSAGE%"
228228
GOANNA_DIAGNOSTIC_PATTERN = re.compile(r'"\[Goanna\] (?P<severity>warning) \[(?P<file>[^:]+):(?P<line>\d+)\] \- (?P<message>.*)"')
229229

230+
MBED_CONFIG_FILE_NAME="mbed_config.h"
231+
230232
def __init__(self, target, options=None, notify=None, macros=None, silent=False, extra_verbose=False):
231233
self.target = target
232234
self.name = self.__class__.__name__
@@ -908,7 +910,7 @@ def set_config_data(self, config_data):
908910
def get_config_header(self):
909911
if self.config_data is None:
910912
return None
911-
config_file = join(self.build_dir, "mbed_config.h")
913+
config_file = join(self.build_dir, self.MBED_CONFIG_FILE_NAME)
912914
if not exists(config_file):
913915
with open(config_file, "wt") as f:
914916
f.write(Config.config_to_header(self.config_data))

0 commit comments

Comments
 (0)