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

Updated container configuration cml for posix container

Browse Source
This commit is contained in:
Bahadir Balban
2009-10-01 00:21:21 +03:00
parent b24fa0772f
commit b642fc5cd3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/cml/container.template.cml
View File

@@ -1,7 +1,7 @@
symbols symbols
CONT%d_TYPE_LINUX 'Linux Container' CONT%d_TYPE_LINUX 'Linux Container'
CONT%d_TYPE_BARE 'Bare Container' CONT%d_TYPE_BARE 'Bare Container'
CONT%d_TYPE_C0_POSIX 'Codezero POSIX Services Container (mm0, fs0 microkernel services)' CONT%d_TYPE_POSIX 'Codezero POSIX Services'
CONT%d_OPT_DIRNAME 'Containers directory name under conts' CONT%d_OPT_DIRNAME 'Containers directory name under conts'
CONT%d_PHYSMEM_REGIONS 'Container %d number of physical regions' CONT%d_PHYSMEM_REGIONS 'Container %d number of physical regions'
@@ -95,16 +95,17 @@ default CONT%d_VIRT4_END from 0x0
default CONT%d_VIRT5_START from 0x0 default CONT%d_VIRT5_START from 0x0
default CONT%d_VIRT5_END from 0x0 default CONT%d_VIRT5_END from 0x0
default CONT%d_OPT_DIRNAME from (CONT%d_TYPE_LINUX==y) ? "linux" : ((CONT%d_TYPE_BARE==y) ? "bare%d" : "noname") default CONT%d_OPT_DIRNAME from (CONT%d_TYPE_LINUX==y) ? "linux%d" : ((CONT%d_TYPE_BARE==y) ? "bare%d" : "posix%d")
when CONT%d_TYPE_LINUX==y suppress cont%d_bare_pager_params when CONT%d_TYPE_LINUX==y suppress cont%d_bare_pager_params
when CONT%d_TYPE_BARE==y suppress cont%d_linux_pager_params when CONT%d_TYPE_BARE==y suppress cont%d_linux_pager_params
when CONT%d_TYPE_POSIX==y suppress cont%d_linux_pager_params
symbols symbols
cont%d_menu 'Container %d Parameters' cont%d_menu 'Container %d Parameters'
cont%d_physmem_list 'Container %d physical memory regions' cont%d_physmem_list 'Container %d physical memory regions'
cont%d_virtmem_list 'Container %d Virtual memory regions' cont%d_virtmem_list 'Container %d Virtual memory regions'
container%d_type 'Container %d Type' container%d_type 'Container %d Type'
container%d_options 'Container %d Options' container%d_options 'Container %d Options'
cont%d_linux_pager_params 'Container %d Pager parameters' cont%d_linux_pager_params 'Container %d Pager parameters'
@@ -156,7 +157,7 @@ menu container%d_options
choices container%d_type choices container%d_type
CONT%d_TYPE_LINUX CONT%d_TYPE_LINUX
CONT%d_TYPE_BARE CONT%d_TYPE_BARE
CONT%d_TYPE_C0_POSIX CONT%d_TYPE_POSIX
default CONT%d_TYPE_BARE default CONT%d_TYPE_BARE
menu cont%d_menu menu cont%d_menu

2
config/configuration.py
View File

@@ -105,7 +105,7 @@ class configuration:
if param1 == "TYPE": if param1 == "TYPE":
if param2 == "LINUX": if param2 == "LINUX":
self.containers[id].type = "linux" self.containers[id].type = "linux"
elif param2 == "C0_POSIX": elif param2 == "POSIX":
self.containers[id].type = "posix" self.containers[id].type = "posix"
elif param2 == "BARE": elif param2 == "BARE":
self.containers[id].type = "bare" self.containers[id].type = "bare"

2
scripts/cml/generate_container_cml.py
View File

@@ -39,7 +39,7 @@ def add_container_constraint(cid):
return cml_string return cml_string
def generate_container_cml(arch, ncont): def generate_container_cml(arch, ncont):
contid_occurence = 219 # Exact number of arguments contid_occurence = 223 # Exact number of arguments
fbody = "" fbody = ""
with open(join(CML2_CONFIG_SRCDIR, arch + '.cml')) as in_cml: with open(join(CML2_CONFIG_SRCDIR, arch + '.cml')) as in_cml:
fbody += in_cml.read() fbody += in_cml.read()