From 014e728935b028cc1403eaf9a17e94ce2f8c8a65 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Mon, 23 Nov 2009 10:22:23 +0530 Subject: [PATCH] Removed traces of custom container left in bahadir's branch. --- config/cml/container_ruleset.template | 10 +--------- config/configuration.py | 2 -- configure.py | 7 +------ scripts/conts/containers.py | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/config/cml/container_ruleset.template b/config/cml/container_ruleset.template index c46e98e..20688e3 100644 --- a/config/cml/container_ruleset.template +++ b/config/cml/container_ruleset.template @@ -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 diff --git a/config/configuration.py b/config/configuration.py index f656497..10d6894 100644 --- a/config/configuration.py +++ b/config/configuration.py @@ -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) diff --git a/configure.py b/configure.py index deec0e4..b7a3f2e 100755 --- a/configure.py +++ b/configure.py @@ -5,7 +5,6 @@ from os.path import join from config.projpaths import * from config.configuration import * from scripts.baremetal.baremetal_generator import * -from scripts.custom.custom_generator import * from scripts.kernel.generate_kernel_cinfo import * from scripts.cml.generate_container_cml import * from optparse import OptionParser @@ -189,11 +188,7 @@ def configure_system(options, args): baremetal_cont_gen = BaremetalContGenerator() baremetal_cont_gen.baremetal_container_generate(config) - # Generate custom container files if new ones defined - custom_cont_gen = CustomContGenerator() - custom_cont_gen.custom_container_generate(config) - - # Print out the configuration if asked + # Print out the configuration if asked if options.print_config: config.config_print() diff --git a/scripts/conts/containers.py b/scripts/conts/containers.py index 7703d08..ae79ca0 100755 --- a/scripts/conts/containers.py +++ b/scripts/conts/containers.py @@ -103,7 +103,7 @@ def build_all_containers(): if container.type == 'linux': pass cont_images.append(build_linux_container(config, projpaths, container)) - elif container.type == 'baremetal' or container.type == 'custom': + elif container.type == 'baremetal': cont_images.append(build_default_container(config, projpaths, container)) elif container.type == 'posix': cont_images.append(build_posix_container(config, projpaths, container))