mirror of
https://github.com/drasko/codezero.git
synced 2026-07-22 07:05:24 +02:00
Taking UART code out from libc and loader and putting in libdev
This commit is contained in:
@@ -32,6 +32,11 @@ LIBC_LIBPATH = join(BUILDDIR, LIBC_RELDIR)
|
||||
LIBC_INCLUDE = [join(LIBC_DIR, 'include'), \
|
||||
join(LIBC_DIR, 'include/arch' + '/' + arch)]
|
||||
|
||||
LIBDEV_RELDIR = 'conts/libdev'
|
||||
LIBDEV_DIR = join(PROJROOT, LIBDEV_RELDIR)
|
||||
LIBDEV_LIBPATH = join(BUILDDIR, LIBDEV_RELDIR)
|
||||
LIBDEV_INCLUDE = [join(LIBDEV_DIR, 'uart/include')]
|
||||
|
||||
LIBMEM_RELDIR = 'conts/libmem'
|
||||
LIBMEM_DIR = join(PROJROOT, LIBMEM_RELDIR)
|
||||
LIBMEM_LIBPATH = join(BUILDDIR, LIBMEM_RELDIR)
|
||||
@@ -50,9 +55,12 @@ env = Environment(CC = config.user_toolchain + 'gcc',
|
||||
ASFLAGS = ['-D__ASSEMBLY__'],
|
||||
PROGSUFFIX = '.elf',
|
||||
ENV = {'PATH' : os.environ['PATH']},
|
||||
LIBS = ['gcc', 'libl4', 'c-userspace', 'libmm', 'libmc', 'libmalloc', 'gcc'],
|
||||
CPPPATH = ['include', LIBC_INCLUDE, KERNEL_INCLUDE, LIBL4_INCLUDE, LIBMEM_INCLUDE],
|
||||
LIBPATH = [LIBC_LIBPATH, LIBL4_LIBPATH, LIBMEM_LIBPATH, LIBPOSIX_LIBPATH],
|
||||
LIBS = ['gcc', 'libl4', 'c-userspace','libdev-userspace', \
|
||||
'libmm', 'libmc', 'libmalloc', 'gcc'],
|
||||
CPPPATH = ['include', LIBDEV_INCLUDE, LIBC_INCLUDE, KERNEL_INCLUDE,
|
||||
LIBL4_INCLUDE, LIBMEM_INCLUDE],
|
||||
LIBPATH = [LIBDEV_LIBPATH, LIBC_LIBPATH, LIBL4_LIBPATH,
|
||||
LIBMEM_LIBPATH, LIBPOSIX_LIBPATH],
|
||||
CPPFLAGS = '-include l4/config.h -include l4/macros.h -include l4/types.h')
|
||||
|
||||
contid = ARGUMENTS.get('cont', '0')
|
||||
|
||||
@@ -52,7 +52,7 @@ def generate_vma_lma_lds(target, source, env):
|
||||
lma_lds = Command('include/linker.lds', 'include/linker.lds.in', generate_vma_lma_lds)
|
||||
|
||||
container_h = Command('include/container.h', 'include/container.h.in', generate_container_h)
|
||||
src = [Glob('*.c') + Glob('mm/*.c') + Glob('lib/*.c') + Glob('fs/*.c') + Glob('fs/memfs/*.c') + Glob('lib/elf/*.c') + Glob('mm/arch/*.c')]
|
||||
src = [Glob('*.c') + Glob('mm/*.c') + Glob('lib/*.c') + Glob('fs/*.c') + Glob('fs/memfs/*.c') + Glob('lib/elf/*.c') + Glob('mm/arch/*.[Sc]')]
|
||||
|
||||
e = env.Clone()
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
.global _start;
|
||||
.align;
|
||||
_start:
|
||||
bl platform_init
|
||||
mov fp, #0 @ Clear frame pointer
|
||||
mov lr, #0 @ Clear link register
|
||||
ldmfd sp!, {r0} @ Argc value in r0
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
.global _start;
|
||||
.align;
|
||||
_start:
|
||||
bl platform_init
|
||||
mov fp, #0 @ Clear frame pointer
|
||||
mov lr, #0 @ Clear link register
|
||||
ldmfd sp!, {r0} @ Argc value in r0
|
||||
|
||||
Reference in New Issue
Block a user