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

Safety check-in of the next stage in getting the tasks linked.

Browse Source
This commit is contained in:
Russel Winder
2009-08-05 12:21:02 +01:00
parent 8b9b254f6c
commit eb45780f16
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@@ -197,7 +197,8 @@ else :
LIBS = taskLibraries + ['gcc', libs['userspace']], LIBS = taskLibraries + ['gcc', libs['userspace']],
PROGSUFFIX = '.axf', PROGSUFFIX = '.axf',
CPPDEFINES = ['__USERSPACE__'], CPPDEFINES = ['__USERSPACE__'],
CPPPATH = ['#' + buildDirectory, '#' + buildDirectory + '/l4', '#' + includeDirectory, 'include', '#tasks/libl4/include', '#tasks/libmem', '#tasks/libposix/include']) CPPPATH = ['#' + buildDirectory, '#' + buildDirectory + '/l4', '#' + includeDirectory, 'include', '#tasks/libl4/include', '#tasks/libmem', '#tasks/libposix/include'],
kernel = startAxf)
tasks = [] tasks = []
for task in [f.name for f in Glob('tasks/*') if f.name not in taskLibraryNames + ['bootdesc']]: for task in [f.name for f in Glob('tasks/*') if f.name not in taskLibraryNames + ['bootdesc']]:

9
tasks/fs0/SConscript
View File

@@ -21,9 +21,12 @@ Import('environment')
e = environment.Clone() e = environment.Clone()
e.Append(LINKFLAGS = ['-Ttasks/fs0/include/linker.lds']) e.Append(LINKFLAGS = ['-Ttasks/fs0/include/linker.lds'])
e.Append(LIBPATH=['#build/tasks/fs0', '#build/lib/c/userspace/crt/sys-userspace/arch-arm'])
objects = e.StaticObject(Glob('*.c') + Glob('src/*.c')) objects = e.StaticObject(Glob('*.c') + [Glob(directory + '/*.c') for directory in [ 'src', 'src/lib', 'src/memfs']])
Depends(objects, e['configFiles']) Depends(objects, e['configFiles'])
library = e.Program('fs0', objects + [e['crt0']]) program = e.Program('fs0', objects)
physicalBaseLinkerScript = Command('include/physical_base.lds', e['kernel'], 'tools/pyelf/readelf.py --first-free-page ' + e['kernel'][0].path + ' >> $TARGET')
Depends(program, [physicalBaseLinkerScript, e['crt0']])
Return('library') Return('program')

11
tasks/mm0/SConscript
View File

@@ -20,10 +20,13 @@
Import('environment') Import('environment')
e = environment.Clone() e = environment.Clone()
e.Append(LINKFLAGS = ['-Ttasks/mm0/include/linker.lds']) e.Append(LINKFLAGS=['-Ttasks/mm0/include/linker.lds'])
e.Append(LIBPATH=['#build/tasks/mm0', '#build/lib/c/userspace/crt/sys-userspace/arch-arm'])
objects = e.StaticObject(Glob('*.c') + Glob('src/*.c')) objects = e.StaticObject(Glob('*.c') + Glob('src/*.c') + Glob('src/lib/*.c') + Glob('src/arch/*.c'))
Depends(objects, e['configFiles']) Depends(objects, e['configFiles'])
library = e.Program('mm0', objects + [e['crt0']]) program = e.Program('mm0', objects)
physicalBaseLinkerScript = Command('include/physical_base.lds', e['kernel'], 'tools/pyelf/readelf.py --first-free-page ' + e['kernel'][0].path + ' >> $TARGET')
Depends(program, [physicalBaseLinkerScript, e['crt0']])
Return('library') Return('program')

7
tasks/test0/SConscript
View File

@@ -21,9 +21,12 @@ Import('environment')
e = environment.Clone() e = environment.Clone()
e.Append(LINKFLAGS = ['-Ttasks/test0/include/linker.lds']) e.Append(LINKFLAGS = ['-Ttasks/test0/include/linker.lds'])
e.Append(LIBPATH=['#build/tasks/test0', '#build/lib/c/userspace/crt/sys-userspace/arch-arm'])
objects = e.StaticObject(Glob('*.c') + Glob('src/*.c')) objects = e.StaticObject(Glob('*.c') + Glob('src/*.c'))
Depends(objects, e['configFiles']) Depends(objects, e['configFiles'])
library = e.Program('test0', objects + [e['crt0']]) program = e.Program('test0', objects)
physicalBaseLinkerScript = Command('include/physical_base.lds', e['kernel'], 'tools/pyelf/readelf.py --first-free-page ' + e['kernel'][0].path + ' >> $TARGET')
Depends(program, [physicalBaseLinkerScript, e['crt0']])
Return('library') Return('program')