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

Default values for container directories determined by container type expression

Browse Source 
Resolved CML2 language issues such that now default parameters
for containers can be set by expressions on their type.
This commit is contained in:
Bahadir Balban
2009-09-18 12:28:54 +03:00
parent f99c5108e0
commit 34650259da
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/cml/arm.cml
View File

@@ -135,7 +135,7 @@ CONFIG_CONT0_PHYS_START 'Container 0 physical start address'
CONFIG_CONT0_PHYS_END 'Container 0 physical end address'
CONFIG_CONT0_VIRT_START 'Container 0 virtual start address'
CONFIG_CONT0_VIRT_END 'Container 0 virtual end address'
CONFIG_CONT0_OPT_DIRNAME 'Containers directory name under conts/'
CONFIG_CONT0_OPT_DIRNAME 'Containers directory name under conts'
CONFIG_CONT1_TYPE_LINUX 'Linux Container'
CONFIG_CONT1_TYPE_BARE 'Bare Container'
@@ -144,8 +144,7 @@ CONFIG_CONT1_PHYS_START 'Container 1 physical start address'
CONFIG_CONT1_PHYS_END 'Container 1 physical end address'
CONFIG_CONT1_VIRT_START 'Container 1 virtual start address'
CONFIG_CONT1_VIRT_END 'Container 1 virtual end address'
CONFIG_CONT1_OPT_DIRNAME 'Containers directory name under conts/'
CONFIG_CONT1_OPT_DIRNAME 'Containers directory name under conts'
default CONFIG_CONTAINERS from 2
default CONFIG_CONT0_PHYS_START from 0x40000
@@ -158,9 +157,8 @@ default CONFIG_CONT1_PHYS_END from 0x2000000
default CONFIG_CONT1_VIRT_START from 0
default CONFIG_CONT1_VIRT_END from 0
default CONFIG_CONT0_OPT_DIRNAME from "Linux"
default CONFIG_CONT1_OPT_DIRNAME from "Linux"
default CONFIG_CONT0_OPT_DIRNAME from (CONFIG_CONT0_TYPE_LINUX==y) ? "Linux" : ((CONFIG_CONT0_TYPE_BARE==y) ? "Bare" : "Noname")
default CONFIG_CONT1_OPT_DIRNAME from (CONFIG_CONT1_TYPE_LINUX==y) ? "Linux" : ((CONFIG_CONT1_TYPE_BARE==y) ? "Bare" : "Noname")
unless CONFIG_CONTAINERS > 1 suppress cont1_menu

4
config/configuration.py
View File

@@ -1,6 +1,6 @@
#! /usr/bin/env python2.6
# -*- mode: python; coding: utf-8; -*-
import os, sys, shelve, shutil, re, string
import os, sys, shelve, shutil, re
from projpaths import *
class Container:
@@ -68,7 +68,7 @@ class configuration:
elif param[:len("PHYS_END")] == "PHYS_END":
self.containers[id].lma_end = val
else:
param1, param2 = param.split("_", 2)
param1, param2 = param.split("_", 1)
if param1 == "TYPE":
if param2 == "LINUX":
self.containers[id].type = "linux"