mirror of
https://github.com/drasko/codezero.git
synced 2026-01-26 17:53:14 +01:00
Restrictions on naming of baremetal containers removed and we have an
automation script for integrating containers in baremetal/
This commit is contained in:
@@ -128,7 +128,15 @@ 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")
|
||||
derive baremetal%(cn)d from
|
||||
(CONT%(cn)d_BAREMETAL_PROJ_EMPTY==y) ? "empty%(cn)d" :
|
||||
((CONT%(cn)d_BAREMETAL_PROJ_HELLO_WORLD==y) ? "hello_world%(cn)d" :
|
||||
((CONT%(cn)d_BAREMETAL_PROJ_THREADS_DEMO==y) ? "thread_demo%(cn)d" :
|
||||
((CONT%(cn)d_BAREMETAL_PROJ_TEST==y) ? "test%(cn)d" :
|
||||
((CONT%(cn)d_BAREMETAL_PROJ_UART_SERVICE==y) ? "uart_service%(cn)d" :
|
||||
((CONT%(cn)d_BAREMETAL_PROJ_TIMER_SERVICE==y) ? "timer_service%(cn)d" : "baremetal_noname%(cn)d" )))))
|
||||
|
||||
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
|
||||
unless CONT%(cn)d_TYPE_POSIX==y suppress cont%(cn)d_posix_pager_params
|
||||
@@ -152,22 +160,22 @@ cont%(cn)d_linux_pager_params 'Container %(cn)d Linux Pager Parameters'
|
||||
cont%(cn)d_default_pager_params 'Container %(cn)d Default Pager Parameters'
|
||||
cont%(cn)d_posix_pager_params 'Container %(cn)d POSIX Pager Parameters'
|
||||
|
||||
cont%(cn)d_baremetal_params 'Baremetal Project'
|
||||
CONT%(cn)d_BAREMETAL_PROJ0 'Empty Project'
|
||||
CONT%(cn)d_BAREMETAL_PROJ1 'Hello World'
|
||||
CONT%(cn)d_BAREMETAL_PROJ2 'Thread Library Demo'
|
||||
CONT%(cn)d_BAREMETAL_PROJ3 'Test Project'
|
||||
CONT%(cn)d_BAREMETAL_PROJ4 'UART Service'
|
||||
CONT%(cn)d_BAREMETAL_PROJ5 'Timer Service'
|
||||
cont%(cn)d_baremetal_params 'Baremetal Project'
|
||||
CONT%(cn)d_BAREMETAL_PROJ_EMPTY 'Empty Project'
|
||||
CONT%(cn)d_BAREMETAL_PROJ_HELLO_WORLD 'Hello World'
|
||||
CONT%(cn)d_BAREMETAL_PROJ_THREADS_DEMO 'Thread Library Demo'
|
||||
CONT%(cn)d_BAREMETAL_PROJ_TEST 'Test Project'
|
||||
CONT%(cn)d_BAREMETAL_PROJ_UART_SERVICE 'UART Service'
|
||||
CONT%(cn)d_BAREMETAL_PROJ_TIMER_SERVICE 'Timer Service'
|
||||
|
||||
choices cont%(cn)d_baremetal_params
|
||||
CONT%(cn)d_BAREMETAL_PROJ0
|
||||
CONT%(cn)d_BAREMETAL_PROJ1
|
||||
CONT%(cn)d_BAREMETAL_PROJ2
|
||||
CONT%(cn)d_BAREMETAL_PROJ3
|
||||
CONT%(cn)d_BAREMETAL_PROJ4
|
||||
CONT%(cn)d_BAREMETAL_PROJ5
|
||||
default CONT%(cn)d_BAREMETAL_PROJ0
|
||||
CONT%(cn)d_BAREMETAL_PROJ_EMPTY
|
||||
CONT%(cn)d_BAREMETAL_PROJ_HELLO_WORLD
|
||||
CONT%(cn)d_BAREMETAL_PROJ_THREADS_DEMO
|
||||
CONT%(cn)d_BAREMETAL_PROJ_TEST
|
||||
CONT%(cn)d_BAREMETAL_PROJ_UART_SERVICE
|
||||
CONT%(cn)d_BAREMETAL_PROJ_TIMER_SERVICE
|
||||
default CONT%(cn)d_BAREMETAL_PROJ_EMPTY
|
||||
|
||||
menu cont%(cn)d_default_pager_params
|
||||
CONT%(cn)d_PAGER_LMA@
|
||||
|
||||
@@ -12,7 +12,6 @@ class Container:
|
||||
self.name = None
|
||||
self.type = None
|
||||
self.id = id
|
||||
self.baremetal_id = 0
|
||||
self.pager_lma = 0
|
||||
self.pager_vma = 0
|
||||
self.pager_size = 0
|
||||
@@ -170,12 +169,11 @@ class configuration:
|
||||
if regionid + 1 > self.containers[id].phys_regions:
|
||||
self.containers[id].phys_regions = regionid + 1
|
||||
elif param[:len("OPT_NAME")] == "OPT_NAME":
|
||||
dirname = val[1:-1].lower()
|
||||
self.containers[id].dirname = dirname
|
||||
self.containers[id].name = dirname
|
||||
elif param[:len("BAREMETAL_PROJ")] == "BAREMETAL_PROJ":
|
||||
param1 = param.split("_", 1)
|
||||
self.containers[id].baremetal_id = param1[1][-1:]
|
||||
name = val[1:-1].lower()
|
||||
self.containers[id].name = name
|
||||
elif param[:len("BAREMETAL_PROJ_")] == "BAREMETAL_PROJ_":
|
||||
param1 = param.split("_", 2)
|
||||
self.containers[id].dirname = param1[2].lower()
|
||||
elif param[:len("CAP_")] == "CAP_":
|
||||
prefix, param_rest = param.split('_', 1)
|
||||
prepare_capability(self.containers[id], param_rest, val)
|
||||
|
||||
Reference in New Issue
Block a user