From 3213217dd5482c195fd355d826245a12c09832cc Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Fri, 20 Nov 2009 16:04:57 +0530 Subject: [PATCH 1/2] Removed compilation error for baremetal2 container, due to missing include folder --- conts/baremetal/baremetal2/SConstruct | 4 ++-- conts/baremetal/baremetal2/include/test.h | 0 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 conts/baremetal/baremetal2/include/test.h diff --git a/conts/baremetal/baremetal2/SConstruct b/conts/baremetal/baremetal2/SConstruct index 7e5351c..5d242cb 100644 --- a/conts/baremetal/baremetal2/SConstruct +++ b/conts/baremetal/baremetal2/SConstruct @@ -57,8 +57,8 @@ env = Environment(CC = config.user_toolchain + 'gcc', ASFLAGS = ['-D__ASSEMBLY__'], PROGSUFFIX = '.elf', # The suffix to use for final executable ENV = {'PATH' : os.environ['PATH']}, # Inherit shell path - LIBS = ['libl4thread', 'libl4', 'libmalloc', 'libdev-userspace', \ - 'c-userspace', 'gcc', 'c-userspace'], # libgcc.a - This is required for division routines. + LIBS = ['libl4thread', 'libl4', 'libmalloc', 'c-userspace', \ + 'libdev-userspace', 'gcc', 'c-userspace'], # libgcc.a - This is required for division routines. CPPPATH = ["#include", KERNEL_INCLUDE, LIBL4_INCLUDE, LIBDEV_INCLUDE, \ LIBC_INCLUDE, LIBL4THREAD_INCLUDE], LIBPATH = [LIBL4_LIBPATH, LIBDEV_LIBPATH, LIBC_LIBPATH, LIBL4THREAD_LIBPATH, \ diff --git a/conts/baremetal/baremetal2/include/test.h b/conts/baremetal/baremetal2/include/test.h new file mode 100644 index 0000000..e69de29 From 3dd41fd53baa53ca44e615613800f91bde397c7b Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Fri, 20 Nov 2009 16:08:55 +0530 Subject: [PATCH 2/2] Remove container_start < container_end restriction --- config/cml/container_ruleset.template | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/config/cml/container_ruleset.template b/config/cml/container_ruleset.template index 1f109ee..1a67ecd 100644 --- a/config/cml/container_ruleset.template +++ b/config/cml/container_ruleset.template @@ -89,19 +89,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 -### 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. # Physical Regions for containers should start after kernel. require CONT%(cn)d_PHYS0_START >= 0x40000