sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-10-14 23:27:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separated config.h update to a new function.

Browse Source
This commit is contained in:
Bahadir Balban
2009-09-10 17:00:58 +03:00
parent f5b770dcad
commit 223f6d30fe
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SConstruct
-2
View File
@@ -7,8 +7,6 @@
import os, shelve import os, shelve
from configure import configure_kernel from configure import configure_kernel
env = Environment(CC = 'arm-none-eabi-gcc', env = Environment(CC = 'arm-none-eabi-gcc',
# We don't use -nostdinc because sometimes we need standard headers, # We don't use -nostdinc because sometimes we need standard headers,
# such as stdarg.h e.g. for variable args, as in printk(). # such as stdarg.h e.g. for variable args, as in printk().
configure.py
+13 -7
View File
@@ -34,8 +34,14 @@ def cml2_process(cml2_conf_props):
config_items[item[0].strip()] = (item[1].strip() == 'y') config_items[item[0].strip()] = (item[1].strip() == 'y')
return config_items return config_items
def cml2_config_to_symbols(): def cml2_update_config_h(configuration):
config_h_path = BUILDDIR + '/l4/config.h' config_h_path = BUILDDIR + '/l4/config.h'
with open(config_h_path, "a") as config_h:
config_h.write("#define __ARCH__ " + configuration['ARCH'] + '\n')
config_h.write("#define __PLATFORM__ " + configuration['PLATFORM'] + '\n')
config_h.write("#define __SUBARCH__ " + configuration['SUBARCH'] + '\n')
def cml2_parse_configuration(configuration):
config_data = cml2_process(CML2_CONFIG_PROPERTIES) config_data = cml2_process(CML2_CONFIG_PROPERTIES)
for key, value in config_data.items(): for key, value in config_data.items():
@@ -56,11 +62,6 @@ def cml2_config_to_symbols():
except KeyError: except KeyError:
configuration[items[0]] = [] configuration[items[0]] = []
configuration[items[0]].append(path) configuration[items[0]].append(path)
with open(config_h_path, "a") as config_h:
config_h.write("#define __ARCH__ " + configuration['ARCH'] + '\n')
config_h.write("#define __PLATFORM__ " + configuration['PLATFORM'] + '\n')
config_h.write("#define __SUBARCH__ " + configuration['SUBARCH'] + '\n')
return configuration
def cml2_configure(cml2_config_file): def cml2_configure(cml2_config_file):
os.system(CML2TOOLSDIR + '/cmlcompile.py -o ' + CML2RULES + ' ' + cml2_config_file) os.system(CML2TOOLSDIR + '/cmlcompile.py -o ' + CML2RULES + ' ' + cml2_config_file)
@@ -75,8 +76,13 @@ def configure_kernel(cml_file):
os.mkdir(BUILDDIR) os.mkdir(BUILDDIR)
cml2_configure(cml_file) cml2_configure(cml_file)
configuration = cml2_config_to_symbols()
cml2_parse_configuration(configuration)
cml2_update_config_h(configuration)
save_configuration(configuration) save_configuration(configuration)
return configuration return configuration
if __name__ == "__main__": if __name__ == "__main__":