Skip to content

Rename mbed_conf.h to mbed_config.h #1968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 21, 2016
Merged

Rename mbed_conf.h to mbed_config.h #1968

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54a1e61
mbed lib revision - 121
0xc0170 May 24, 2016
a387a74
Merge https://github.com/mbedmicro/mbed
screamerbg Jun 16, 2016
d0e58ab
Merge https://github.com/mbedmicro/mbed
screamerbg Jun 21, 2016
4d68152
Rename mbed_conf.h to mbed_config.h
screamerbg Jun 17, 2016
541c478
Remove tracking of existing mbed_config.h in the source tree
screamerbg Jun 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions tools/toolchains/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,
# Labels generated from toolchain and target rules/features (used for selective build)
self.labels = None

self.has_config = False
# config_header_content will hold the content of the config header (if used)
self.config_header_content = None

Expand Down Expand Up @@ -359,10 +358,6 @@ def get_symbols(self):
self.symbols = ["TARGET_%s" % t for t in labels['TARGET']]
self.symbols.extend(["TOOLCHAIN_%s" % t for t in labels['TOOLCHAIN']])

# Config support
if self.has_config:
self.symbols.append('HAVE_MBED_CONFIG_H')

# Cortex CPU symbols
if self.target.core in mbedToolchain.CORTEX_SYMBOLS:
self.symbols.extend(mbedToolchain.CORTEX_SYMBOLS[self.target.core])
Expand Down Expand Up @@ -437,8 +432,6 @@ def scan_resources(self, path, exclude_paths=None, base_path=None):
base_path = path
resources.base_path = base_path

self.has_config = False

""" os.walk(top[, topdown=True[, onerror=None[, followlinks=False]]])
When topdown is True, the caller can modify the dirnames list in-place
(perhaps using del or slice assignment), and walk() will only recurse into
Expand Down Expand Up @@ -512,8 +505,6 @@ def scan_resources(self, path, exclude_paths=None, base_path=None):
resources.cpp_sources.append(file_path)

elif ext == '.h' or ext == '.hpp':
if basename(file_path) == "mbed_config.h":
self.has_config = True
resources.headers.append(file_path)

elif ext == '.o':
Expand Down Expand Up @@ -910,7 +901,7 @@ def set_config_header_content(self, header_content):
def get_config_header(self):
if self.config_header_content is None:
return None
config_file = join(self.build_dir, "mbed_conf.h")
config_file = join(self.build_dir, "mbed_config.h")
if not exists(config_file):
with open(config_file, "wt") as f:
f.write(self.config_header_content)
Expand Down