mirror of
https://github.com/drasko/codezero.git
synced 2026-06-30 20:44:11 +02:00
Simplified loader, elf, and c library SConscripts
This commit is contained in:
@@ -44,3 +44,6 @@ kernel_elf = env.Program(BUILDDIR + '/kernel.elf', objects)
|
|||||||
libl4 = SConscript('conts/libl4/SConscript', \
|
libl4 = SConscript('conts/libl4/SConscript', \
|
||||||
exports = { 'arch' : arch }, duplicate = 0, \
|
exports = { 'arch' : arch }, duplicate = 0, \
|
||||||
variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4', PROJROOT)))
|
variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4', PROJROOT)))
|
||||||
|
|
||||||
|
Alias('libl4', libl4)
|
||||||
|
Alias('kernel', kernel_elf)
|
||||||
|
|||||||
@@ -38,8 +38,13 @@ env = Environment(CC = 'arm-none-eabi-gcc',
|
|||||||
LIBPATH = [LIBC_LIBPATH, LIBELF_LIBPATH],
|
LIBPATH = [LIBC_LIBPATH, LIBELF_LIBPATH],
|
||||||
CPPPATH = ['#include', LIBC_INCPATH, LIBELF_INCPATH])
|
CPPPATH = ['#include', LIBC_INCPATH, LIBELF_INCPATH])
|
||||||
|
|
||||||
libc = SConscript('loader/libs/c/SConscript', exports = { 'env' : env }, duplicate = 0, variant_dir = 'build/loader/libs/c')
|
libc = SConscript('loader/libs/c/SConscript', \
|
||||||
libelf = SConscript('loader/libs/elf/SConscript', exports = { 'env' : env }, duplicate = 0, variant_dir = 'build/loader/libs/elf')
|
exports = { 'env' : env, 'arch' : arch, 'platform' : platform }, \
|
||||||
loader_objs = SConscript('loader/SConscript', exports = { 'env' : env }, duplicate = 0, variant_dir = 'build/loader')
|
duplicate = 0, variant_dir = 'build/loader/libs/c')
|
||||||
|
libelf = SConscript('loader/libs/elf/SConscript', exports = { 'env' : env }, \
|
||||||
|
duplicate = 0, variant_dir = 'build/loader/libs/elf')
|
||||||
|
|
||||||
|
loader_objs = SConscript('loader/SConscript', exports = { 'env' : env }, \
|
||||||
|
duplicate = 0, variant_dir = 'build/loader')
|
||||||
|
|
||||||
env.Program('build/final.elf', [loader_objs + libc + libelf])
|
env.Program('build/final.elf', [loader_objs + libc + libelf])
|
||||||
|
|||||||
@@ -9,16 +9,8 @@ from os.path import join
|
|||||||
|
|
||||||
Import('env')
|
Import('env')
|
||||||
|
|
||||||
# Get global paths
|
|
||||||
PROJRELROOT = '../'
|
|
||||||
|
|
||||||
sys.path.append(PROJRELROOT)
|
|
||||||
|
|
||||||
|
|
||||||
e = env.Clone()
|
|
||||||
|
|
||||||
src = Glob('*.[cS]')
|
src = Glob('*.[cS]')
|
||||||
|
|
||||||
objs = e.Object(src)
|
objs = env.Object(src)
|
||||||
|
|
||||||
Return('objs')
|
Return('objs')
|
||||||
|
|||||||
39
loader/libs/c/SConscript
Normal file
39
loader/libs/c/SConscript
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
# -*- mode: python; coding: utf-8; -*-
|
||||||
|
#
|
||||||
|
# Codezero -- a microkernel for embedded systems.
|
||||||
|
#
|
||||||
|
# Copyright © 2009 B Labs Ltd
|
||||||
|
|
||||||
|
import os, sys, shelve
|
||||||
|
from os.path import join
|
||||||
|
|
||||||
|
# Get global paths
|
||||||
|
PROJRELROOT = '../../../'
|
||||||
|
|
||||||
|
sys.path.append(PROJRELROOT)
|
||||||
|
|
||||||
|
from config.configuration import *
|
||||||
|
from config.projpaths import *
|
||||||
|
|
||||||
|
Import('env', 'arch', 'platform')
|
||||||
|
|
||||||
|
variant = 'baremetal'
|
||||||
|
|
||||||
|
e = env.Clone()
|
||||||
|
|
||||||
|
e.Append(CPPPATH = ['include/sys-' + variant + '/arch-' + arch])
|
||||||
|
e.Append(CCFLAGS = '-nostdinc')
|
||||||
|
|
||||||
|
source = \
|
||||||
|
Glob('src/*.c') + \
|
||||||
|
Glob('src/sys-' + variant + '/*.c') + \
|
||||||
|
Glob('src/sys-' + variant + '/arch-' + arch + '/*.c') + \
|
||||||
|
Glob('src/sys-' + variant + '/arch-' + arch + '/plat-' + platform + '/*.c') + \
|
||||||
|
Glob('src/arch-' + arch + '/*.c') + \
|
||||||
|
Glob('src/arch-' + arch + '/*.S') + \
|
||||||
|
Glob('crt/sys-' + variant + '/arch-' + arch + '/*.[cS]')
|
||||||
|
|
||||||
|
objects = e.StaticObject(source)
|
||||||
|
library = e.StaticLibrary('c-' + variant, objects)
|
||||||
|
|
||||||
|
Return('library')
|
||||||
@@ -7,9 +7,7 @@
|
|||||||
|
|
||||||
Import('env')
|
Import('env')
|
||||||
|
|
||||||
arch = 'arm'
|
|
||||||
e = env.Clone()
|
e = env.Clone()
|
||||||
#e.Append(CPPPATH = ['include', '#libs/c/include', '#libs/c/include/arch/' + arch])
|
|
||||||
e.Append(CPPPATH = ['include'])
|
e.Append(CPPPATH = ['include'])
|
||||||
e.Append(CCFLAGS = '-nostdinc')
|
e.Append(CCFLAGS = '-nostdinc')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user