From 19a113237d175dbafd424d3a17e88b3123e4bf15 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amit.mahajan@b-labs.co.uk>
Date: Tue, 24 Nov 2009 15:02:49 +0530
Subject: [PATCH] Default values added for 4 containers, with 4 Physical and 5
 Virtual memory regions per container.

---
 config/cml/container_ruleset.template | 44 +++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/config/cml/container_ruleset.template b/config/cml/container_ruleset.template
index b10a997..5bb7216 100644
--- a/config/cml/container_ruleset.template
+++ b/config/cml/container_ruleset.template
@@ -40,7 +40,7 @@ CONT%(cn)d_PAGER_TASK_START	'Container %(cn)d Task Address Space Region Start'
 CONT%(cn)d_PAGER_TASK_END	'Container %(cn)d Task Address Space Region End'
 CONT%(cn)d_PAGER_UTCB_START	'Container %(cn)d UTCB Mappings Region Start'
 CONT%(cn)d_PAGER_UTCB_END	'Container %(cn)d UTCB Mappings Region End'
-CONT%(cn)d_LINUX_ZRELADDR       'Container %(cn)d Linux ZRELADDR parameter'
+CONT%(cn)d_LINUX_ZRELADDR       'Container %(cn)d Linux ZRELADDR Parameter'
 CONT%(cn)d_LINUX_PAGE_OFFSET	'Container %(cn)d Linux PAGE_OFFSET Parameter'
 CONT%(cn)d_LINUX_PHYS_OFFSET	'Container %(cn)d Linux PHYS_OFFSET Parameter'
 CONT%(cn)d_LINUX_ROOTFS_ADDRESS	'Container %(cn)d Linux ROOTFS Address'
@@ -106,33 +106,33 @@ require CONT%(cn)d_PHYS3_START >= 0x40000
 require CONT%(cn)d_LINUX_ZRELADDR > CONT%(cn)d_LINUX_PHYS_OFFSET + 0x8000
 
 # TODO: Do we want to check if PAGER_LMA/VMA lies in allocated memory regions
-default CONT%(cn)d_PHYS0_START	from 0x40000
-default CONT%(cn)d_PHYS0_END	from 0x1000000
-default CONT%(cn)d_PHYS1_START	from 0x1000000
-default CONT%(cn)d_PHYS1_END	from 0x1100000
-default CONT%(cn)d_PHYS2_START	from 0x1100000
-default CONT%(cn)d_PHYS2_END	from 0x1200000
-default CONT%(cn)d_PHYS3_START	from 0x1200000
-default CONT%(cn)d_PHYS3_END	from 0x1300000
+default CONT%(cn)d_PHYS0_START	from (%(cn)d == 0 ? 0x100000 : (0x100000 + %(cn)d * 0x1000000))
+default	CONT%(cn)d_PHYS0_END	from (CONT%(cn)d_PHYS0_START + 0xD00000)
+default CONT%(cn)d_PHYS1_START	from CONT%(cn)d_PHYS0_END
+default CONT%(cn)d_PHYS1_END	from (CONT%(cn)d_PHYS1_START + 0x100000)
+default CONT%(cn)d_PHYS2_START	from CONT%(cn)d_PHYS1_END
+default CONT%(cn)d_PHYS2_END	from (CONT%(cn)d_PHYS2_START + 0x100000)
+default CONT%(cn)d_PHYS3_START	from CONT%(cn)d_PHYS2_END
+default CONT%(cn)d_PHYS3_END	from (CONT%(cn)d_PHYS3_START + 0x100000)
 
-default CONT%(cn)d_VIRT0_START	from 0x90000000
-default CONT%(cn)d_VIRT0_END	from 0xa0000000
-default CONT%(cn)d_VIRT1_START	from 0x40000000
-default CONT%(cn)d_VIRT1_END	from 0x50000000
-default CONT%(cn)d_VIRT2_START	from 0x30000000
-default CONT%(cn)d_VIRT2_END	from 0x40000000
-default CONT%(cn)d_VIRT3_START	from 0xf8100000
-default CONT%(cn)d_VIRT3_END	from 0xf8200000
-default CONT%(cn)d_VIRT4_START	from 0xd0000000
-default CONT%(cn)d_VIRT4_END	from 0xe0000000
+default CONT%(cn)d_VIRT0_START	from (%(cn)d == 0 ? 0xa0000000 : (0xa0000000 + %(cn)d * 0x10000000))
+default CONT%(cn)d_VIRT0_END	from (CONT%(cn)d_VIRT0_START + 0x10000000)
+default CONT%(cn)d_VIRT1_START	from (%(cn)d == 0 ? 0x80000000 : (0x80000000 + %(cn)d * 0x8000000))
+default CONT%(cn)d_VIRT1_END	from (CONT%(cn)d_VIRT1_START + 0x8000000)
+default CONT%(cn)d_VIRT2_START	from (%(cn)d == 0 ? 0x40000000 : (0x40000000 + %(cn)d * 0x10000000))
+default CONT%(cn)d_VIRT2_END	from (CONT%(cn)d_VIRT2_START + 0x10000000)
+default CONT%(cn)d_VIRT3_START	from (%(cn)d == 0 ? 0xf8100000 : (0xf8100000 + %(cn)d * 0x100000))
+default CONT%(cn)d_VIRT3_END	from (CONT%(cn)d_VIRT3_START + 0x100000)
+default CONT%(cn)d_VIRT4_START	from (%(cn)d == 0 ? 0x10000000 : (0x10000000 + %(cn)d * 0x10000000))
+default CONT%(cn)d_VIRT4_END	from (CONT%(cn)d_VIRT4_START + 0x10000000)
 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" : "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_LINUX==y suppress cont%(cn)d_default_pager_params
+unless CONT%(cn)d_TYPE_POSIX==y suppress cont%(cn)d_posix_pager_params
+unless CONT%(cn)d_TYPE_LINUX==y suppress cont%(cn)d_linux_pager_params
 unless CONT%(cn)d_TYPE_BAREMETAL==y suppress cont%(cn)d_baremetal_params
 
 # derive symbols, for cinfo.c, depending on the type of container selected