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

Merge branch 'master' of git://www.b-labs.co.uk/amit/git/codezero into amit

Browse Source
This commit is contained in:
Bahadir Balban
2009-11-20 13:59:32 +02:00
parent e5b595ba63 3dd41fd53b
commit 6b03ebb05f
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/cml/container_ruleset.template
View File

@@ -91,19 +91,6 @@ when CONT%(cn)d_PHYSMEM_REGIONS < 3 suppress CONT%(cn)d_PHYS3_START CONT%(cn)d_P
when CONT%(cn)d_PHYSMEM_REGIONS < 4 suppress CONT%(cn)d_PHYS3_START CONT%(cn)d_PHYS3_END when CONT%(cn)d_PHYSMEM_REGIONS < 4 suppress CONT%(cn)d_PHYS3_START CONT%(cn)d_PHYS3_END
### Sanity check for memory regions ###
require CONT%(cn)d_PHYS0_START < CONT%(cn)d_PHYS0_END
require CONT%(cn)d_PHYS1_START < CONT%(cn)d_PHYS1_END
require CONT%(cn)d_PHYS2_START < CONT%(cn)d_PHYS2_END
require CONT%(cn)d_PHYS3_START < CONT%(cn)d_PHYS3_END
require CONT%(cn)d_VIRT0_START < CONT%(cn)d_VIRT0_END
require CONT%(cn)d_VIRT1_START < CONT%(cn)d_VIRT1_END
require CONT%(cn)d_VIRT2_START < CONT%(cn)d_VIRT2_END
require CONT%(cn)d_VIRT3_START < CONT%(cn)d_VIRT3_END
require CONT%(cn)d_VIRT4_START < CONT%(cn)d_VIRT4_END
require CONT%(cn)d_VIRT5_START < CONT%(cn)d_VIRT5_END
# We assume kernel uses 0x0 - 0x40000 physical RAM. # We assume kernel uses 0x0 - 0x40000 physical RAM.
# Physical Regions for containers should start after kernel. # Physical Regions for containers should start after kernel.
require CONT%(cn)d_PHYS0_START >= 0x40000 require CONT%(cn)d_PHYS0_START >= 0x40000

4
conts/baremetal/baremetal2/SConstruct
View File

@@ -57,8 +57,8 @@ env = Environment(CC = config.user_toolchain + 'gcc',
ASFLAGS = ['-D__ASSEMBLY__'], ASFLAGS = ['-D__ASSEMBLY__'],
PROGSUFFIX = '.elf', # The suffix to use for final executable PROGSUFFIX = '.elf', # The suffix to use for final executable
ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path
LIBS = ['libl4thread', 'libl4', 'libmalloc', 'libdev-userspace', \ LIBS = ['libl4thread', 'libl4', 'libmalloc', 'c-userspace', \
'c-userspace', 'gcc', 'c-userspace'], # libgcc.a - This is required for division routines. 'libdev-userspace', 'gcc', 'c-userspace'], # libgcc.a - This is required for division routines.
CPPPATH = ["#include", KERNEL_INCLUDE, LIBL4_INCLUDE, LIBDEV_INCLUDE, \ CPPPATH = ["#include", KERNEL_INCLUDE, LIBL4_INCLUDE, LIBDEV_INCLUDE, \
LIBC_INCLUDE, LIBL4THREAD_INCLUDE], LIBC_INCLUDE, LIBL4THREAD_INCLUDE],
LIBPATH = [LIBL4_LIBPATH, LIBDEV_LIBPATH, LIBC_LIBPATH, LIBL4THREAD_LIBPATH, \ LIBPATH = [LIBL4_LIBPATH, LIBDEV_LIBPATH, LIBC_LIBPATH, LIBL4THREAD_LIBPATH, \

0
conts/baremetal/baremetal2/include/test.h Normal file
View File