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

Removed traces of custom container left in bahadir's branch.

Browse Source
This commit is contained in:
Amit Mahajan
2009-11-23 10:22:23 +05:30
parent 1e8c0f1d3a
commit 014e728935
4 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/cml/container_ruleset.template
View File

@@ -2,9 +2,7 @@ symbols
CONT%(cn)d_TYPE_LINUX 'Linux Container'
CONT%(cn)d_TYPE_BAREMETAL 'Baremetal Container'
CONT%(cn)d_TYPE_POSIX 'POSIX Container'
CONT%(cn)d_TYPE_CUSTOM 'Add New Customized Container'
CONT%(cn)d_OPT_NAME 'Container Name'
CONT%(cn)d_SOURCE_PATH 'Container Source Path'
CONT%(cn)d_PHYSMEM_REGIONS 'Container %(cn)d Number of Physical Regions'
CONT%(cn)d_PHYS0_START 'Container %(cn)d Physical Region 0 Start Address'
@@ -127,16 +125,12 @@ default CONT%(cn)d_VIRT4_END from 0xe0000000
default CONT%(cn)d_VIRT5_START from 0xe0000000
default CONT%(cn)d_VIRT5_END from 0xf0000000
default CONT%(cn)d_OPT_NAME from (CONT%(cn)d_TYPE_LINUX==y) ? "linux%(cn)d" : ((CONT%(cn)d_TYPE_BAREMETAL==y) ? "baremetal%(cn)d" : ((CONT%(cn)d_TYPE_CUSTOM==y) ? "custom%(cn)d" :"posix%(cn)d"))
default CONT%(cn)d_SOURCE_PATH from "conts/timer"
default CONT%(cn)d_OPT_NAME from (CONT%(cn)d_TYPE_LINUX==y) ? "linux%(cn)d" : ((CONT%(cn)d_TYPE_BAREMETAL==y) ? "baremetal%(cn)d" : "posix%(cn)d")
when CONT%(cn)d_TYPE_LINUX==y suppress cont%(cn)d_default_pager_params cont%(cn)d_posix_pager_params
when CONT%(cn)d_TYPE_BAREMETAL==y suppress cont%(cn)d_linux_pager_params cont%(cn)d_posix_pager_params
when CONT%(cn)d_TYPE_POSIX==y suppress cont%(cn)d_linux_pager_params
when CONT%(cn)d_TYPE_CUSTOM==y suppress cont%(cn)d_linux_pager_params cont%(cn)d_posix_pager_params
unless CONT%(cn)d_TYPE_BAREMETAL==y suppress cont%(cn)d_baremetal_params
unless CONT%(cn)d_TYPE_CUSTOM==y suppress CONT%(cn)d_SOURCE_PATH
symbols
cont%(cn)d_menu 'Container %(cn)d Parameters'
@@ -630,7 +624,6 @@ menu cont%(cn)d_capability_list
menu container%(cn)d_options
CONT%(cn)d_OPT_NAME$
CONT%(cn)d_SOURCE_PATH$
cont%(cn)d_baremetal_params
cont%(cn)d_linux_pager_params
cont%(cn)d_default_pager_params
@@ -642,7 +635,6 @@ menu container%(cn)d_options
choices container%(cn)d_type
CONT%(cn)d_TYPE_BAREMETAL
CONT%(cn)d_TYPE_POSIX
CONT%(cn)d_TYPE_CUSTOM
CONT%(cn)d_TYPE_LINUX
default CONT%(cn)d_TYPE_BAREMETAL

2
config/configuration.py
View File

@@ -192,8 +192,6 @@ class configuration:
self.containers[id].type = "posix"
elif param2 == "BAREMETAL":
self.containers[id].type = "baremetal"
elif param2 == "CUSTOM":
self.containers[id].type = "custom"
# Extract parameters for containers
def get_container_parameters(self, name, val):
matchobj = re.match(r"(CONFIG_CONT){1}([0-9]){1}(\w+)", name)