sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-02-28 17:53:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed updating of reconfigured bare projects

Browse Source 
Reconfigured bare projects now update with config data
correctly. A path issue was fixed.
This commit is contained in:
Bahadir Balban
2009-09-26 21:52:29 +03:00
parent b6676b9acd
commit aae84b5eb3
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/configuration.py
View File

@@ -163,9 +163,9 @@ class configuration:
print '\nContainer %d' % c.id print '\nContainer %d' % c.id
print 'Container type: %s' % c.type print 'Container type: %s' % c.type
print 'Container Name: %s' % c.name print 'Container Name: %s' % c.name
print 'Container Pager lma: %s' % c.pager_lma print 'Container Pager lma: %s' % hex(c.pager_lma)
print 'Container Pager vma: %s' % c.pager_vma print 'Container Pager vma: %s' % hex(c.pager_vma)
print 'Container Pager size: %s' % c.pager_size print 'Container Pager size: %s' % hex(c.pager_size)
print 'Container Virtual regions: %s' % c.virt_regions print 'Container Virtual regions: %s' % c.virt_regions
print 'Container Physical regions: %s' % c.phys_regions print 'Container Physical regions: %s' % c.phys_regions

28
scripts/bare/bare_generator.py
View File

@@ -90,48 +90,44 @@ class BareContGenerator:
self.main_configurator_name)) self.main_configurator_name))
def create_bare_sources(self, config, cont): def create_bare_sources(self, config, cont):
# Determine container directory name.
self.CONT_SRC_DIR = join(self.BARE_SRC_BASEDIR, cont.dirname.lower())
self.build_readme_out = join(self.CONT_SRC_DIR, self.build_readme_name)
self.build_desc_out = join(self.CONT_SRC_DIR, self.build_desc_name)
self.linker_lds_out = join(join(self.CONT_SRC_DIR, 'include'), \
self.linker_lds_name)
self.create_bare_srctree(config, cont) self.create_bare_srctree(config, cont)
self.copy_bare_build_readme(config, cont) self.copy_bare_build_readme(config, cont)
self.copy_bare_build_desc(config, cont) self.copy_bare_build_desc(config, cont)
self.generate_linker_script(config, cont) self.generate_linker_script(config, cont)
def update_configuration(self, config, cont): def update_configuration(self, config, cont):
self.build_readme_out = join(self.CONT_SRC_DIR, self.build_readme_name)
self.build_desc_out = join(self.CONT_SRC_DIR, self.build_desc_name)
self.linker_lds_out = join(join(self.CONT_SRC_DIR, 'include'), \
self.linker_lds_name)
self.copy_bare_build_desc(config, cont) self.copy_bare_build_desc(config, cont)
self.generate_linker_script(config, cont) self.generate_linker_script(config, cont)
def check_create_bare_sources(self, config): def check_create_bare_sources(self, config):
for cont in config.containers: for cont in config.containers:
if cont.type == "bare": if cont.type == "bare":
# Determine container directory name.
self.CONT_SRC_DIR = join(self.BARE_SRC_BASEDIR, cont.dirname.lower())
self.build_readme_out = join(self.CONT_SRC_DIR, self.build_readme_name)
self.build_desc_out = join(self.CONT_SRC_DIR, self.build_desc_name)
self.linker_lds_out = join(join(self.CONT_SRC_DIR, 'include'), \
self.linker_lds_name)
if not os.path.exists(join(self.BARE_SRC_BASEDIR, cont.dirname)): if not os.path.exists(join(self.BARE_SRC_BASEDIR, cont.dirname)):
self.create_bare_sources(config, cont) self.create_bare_sources(config, cont)
# Don't create new sources but update configuration
else: else:
# Don't create new sources but update configuration
self.update_configuration(config, cont) self.update_configuration(config, cont)
def generate_linker_script(self, config, cont): def generate_linker_script(self, config, cont):
with open(self.linker_lds_in) as fin: with open(self.linker_lds_in) as fin:
str = fin.read() str = fin.read()
with open(self.linker_lds_out, 'w+') as fout: with open(self.linker_lds_out, 'w+') as fout:
fout.write(str % (cont.pager_vma, \ fout.write(str % (hex(cont.pager_vma), \
cont.pager_lma)) hex(cont.pager_lma)))
def bare_container_generate(self, config): def bare_container_generate(self, config):
self.check_create_bare_sources(config) self.check_create_bare_sources(config)
if __name__ == "__main__": if __name__ == "__main__":
config = configuration_retrieve() config = configuration_retrieve()
config.config_print()
bare_cont = BareContGenerator() bare_cont = BareContGenerator()
bare_cont.bare_container_generate(config) bare_cont.bare_container_generate(config)