sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-03-03 11:03:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed container configuration parameter DIRNAME to NAME

Browse Source 
Dirname was not a precise description as the name did not always
get used as a directory name.
This commit is contained in:
Bahadir Balban
2009-10-01 17:04:17 +03:00
parent 12aec8d777
commit f6e759c3f0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ 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_POSIX 'Codezero POSIX Services' CONT%d_TYPE_POSIX 'Codezero POSIX Services'
CONT%d_OPT_DIRNAME 'Containers directory name under conts' CONT%d_OPT_NAME 'Container name'
CONT%d_PHYSMEM_REGIONS 'Container %d number of physical regions' CONT%d_PHYSMEM_REGIONS 'Container %d number of physical regions'
CONT%d_PHYS0_START 'Container %d physical start address' CONT%d_PHYS0_START 'Container %d physical start address'
@@ -95,7 +95,7 @@ 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%d" : ((CONT%d_TYPE_BARE==y) ? "bare%d" : "posix%d") default CONT%d_OPT_NAME 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
@@ -148,7 +148,7 @@ menu cont%d_physmem_list
CONT%d_PHYS3_END@ CONT%d_PHYS3_END@
menu container%d_options menu container%d_options
CONT%d_OPT_DIRNAME$ CONT%d_OPT_NAME$
cont%d_linux_pager_params cont%d_linux_pager_params
cont%d_bare_pager_params cont%d_bare_pager_params
cont%d_physmem_list cont%d_physmem_list

2
config/configuration.py
View File

@@ -97,7 +97,7 @@ class configuration:
self.containers[id].physmem[startend][regionid] = val self.containers[id].physmem[startend][regionid] = val
if regionid + 1 > self.containers[id].phys_regions: if regionid + 1 > self.containers[id].phys_regions:
self.containers[id].phys_regions = regionid + 1 self.containers[id].phys_regions = regionid + 1
elif param[:len("OPT_DIRNAME")] == "OPT_DIRNAME": elif param[:len("OPT_NAME")] == "OPT_NAME":
dirname = val[1:-1].lower() dirname = val[1:-1].lower()
self.containers[id].dirname = dirname self.containers[id].dirname = dirname
self.containers[id].name = dirname self.containers[id].name = dirname