diff --git a/config/cml/container.template.cml b/config/cml/container.template.cml index f0852f6..b9b267e 100644 --- a/config/cml/container.template.cml +++ b/config/cml/container.template.cml @@ -32,7 +32,6 @@ CONT%d_PAGER_LMA 'Container %d Pager LMA' CONT%d_PAGER_VMA 'Container %d Pager VMA' CONT%d_PAGER_SIZE 'Container %d Pager Initial map size (Optional)' CONT%d_LINUX_PAGE_OFFSET 'Container %d Linux PAGE_OFFSET parameter' -CONT%d_LINUX_TEXT_OFFSET 'Container %d Linux TEXT_OFFSET parameter' CONT%d_LINUX_PHYS_OFFSET 'Container %d Linux PHYS_OFFSET parameter' CONT%d_LINUX_MAPSIZE 'Container %d Linux Initial kernel map size parameter' @@ -40,7 +39,6 @@ default CONT%d_PAGER_LMA from 0x0 default CONT%d_PAGER_VMA from 0x0 default CONT%d_PAGER_SIZE from 0x0 default CONT%d_LINUX_PAGE_OFFSET from 0x0 -default CONT%d_LINUX_TEXT_OFFSET from 0x0 default CONT%d_LINUX_PHYS_OFFSET from 0x0 default CONT%d_LINUX_MAPSIZE from 0x0 @@ -119,7 +117,6 @@ menu cont%d_bare_pager_params menu cont%d_linux_pager_params CONT%d_LINUX_PAGE_OFFSET@ - CONT%d_LINUX_TEXT_OFFSET@ CONT%d_LINUX_PHYS_OFFSET@ CONT%d_LINUX_MAPSIZE@ diff --git a/config/configuration.py b/config/configuration.py index e3af07b..cc16989 100644 --- a/config/configuration.py +++ b/config/configuration.py @@ -14,7 +14,6 @@ class Container: self.pager_size = 0 self.linux_page_offset = 0 self.linux_phys_offset = 0 - self.linux_text_offset = 0 self.linux_mapsize = 0 self.physmem = {} self.physmem["START"] = {} @@ -85,10 +84,6 @@ class configuration: elif param[:len("LINUX_PHYS_OFFSET")] == "LINUX_PHYS_OFFSET": self.containers[id].linux_phys_offset = int(val, 0) self.containers[id].pager_lma += int(val, 0) - elif param[:len("LINUX_TEXT_OFFSET")] == "LINUX_TEXT_OFFSET": - self.containers[id].linux_text_offset = int(val, 0) - self.containers[id].pager_lma += int(val, 0) - self.containers[id].pager_vma += int(val, 0) elif re.match(r"(VIRT|PHYS){1}([0-9]){1}(_){1}(START|END){1}", param): matchobj = re.match(r"(VIRT|PHYS){1}([0-9]){1}(_){1}(START|END){1}", param) virtphys, regionidstr, discard1, startend = matchobj.groups()