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

Simplify the configuration file parsing so as to prepare for more generality.

Browse Source
This commit is contained in:
Russel Winder
2009-08-28 10:19:45 +01:00
parent 079b031616
commit f6707e3ca7
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SConstruct
View File

@@ -92,31 +92,22 @@ else :
configHPath = buildDirectory + '/l4/config.h'
configuration = Configure(baseEnvironment, config_h = configHPath)
configData = processCML2Config()
arch = None
platform = None
subarch = None
for key, value in configData.items():
if value:
items = key.split('_')
if items[0] == 'ARCH':
arch = items[1].lower()
configuration.env['ARCH'] = items[1].lower()
for key, value in configData.items():
if value:
items = key.split('_')
if items[0] == arch.upper():
if items[1] == 'PLATFORM':
platform = items[2].lower()
if items[1] == 'SUBARCH':
subarch = items[2].lower()
if items[0] == 'DRIVER':
if items[0] == configuration.env['ARCH'].upper():
configuration.env[items[1]] = items[2].lower()
elif items[0] == 'DRIVER':
# Add data to the environment about which driver paths to include in the build.
configuration.env.Append(driverList = [items[1].lower() + '/' + items[2].lower()])
configuration.Define('__ARCH__', arch)
configuration.Define('__PLATFORM__', platform)
configuration.Define('__SUBARCH__', subarch)
configuration.env['ARCH'] = arch
configuration.env['PLATFORM'] = platform
configuration.env['SUBARCH'] = subarch
configuration.Define('__ARCH__', configuration.env['ARCH'])
configuration.Define('__PLATFORM__', configuration.env['PLATFORM'])
configuration.Define('__SUBARCH__', configuration.env['SUBARCH'])
baseEnvironment = configuration.Finish()
baseEnvironment.Append(configFiles = ('#' + configHPath,))
@@ -126,9 +117,7 @@ else :
CC = 'arm-none-linux-gnueabi-gcc',
CCFLAGS = ['-g', '-nostdinc', '-nostdlib', '-ffreestanding', '-std=gnu99', '-Wall', '-Werror'],
LINKFLAGS = ['-nostdlib'],
LIBS = ['gcc'],
ARCH = arch,
PLATFORM = platform)
LIBS = ['gcc'])
libs = {}
crts = {}
@@ -149,7 +138,7 @@ else :
# We don't use -nostdinc because sometimes we need standard headers, such as stdarg.h e.g. for variable
# args, as in printk().
CCFLAGS = ['-mcpu=arm926ej-s', '-g', '-nostdlib', '-ffreestanding', '-std=gnu99', '-Wall', '-Werror'],
LINKFLAGS = ['-nostdlib', '-T' + includeDirectory + '/l4/arch/' + arch + '/linker.lds'],
LINKFLAGS = ['-nostdlib', '-T' + includeDirectory + '/l4/arch/' + baseEnvironment['ARCH'] + '/linker.lds'],
ASFLAGS = ['-D__ASSEMBLY__'],
PROGSUFFIX = '.axf',
LIBS = ['gcc'],