diff --git a/config/cml/examples/helloworld/config.cml b/config/cml/examples/helloworld/config.cml index 9621065..af77149 100644 --- a/config/cml/examples/helloworld/config.cml +++ b/config/cml/examples/helloworld/config.cml @@ -1,9 +1,9 @@ # # Automatically generated, don't edit # -# Generated on: bahadir-laptop -# At: Sun, 29 Nov 2009 15:31:45 +0000 -# Linux version 2.6.24-22-generic (buildd@vernadsky) (gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7)) #1 SMP Mon Nov 24 18:32:42 UTC 2008 +# Generated on: amit-laptop +# At: Fri, 04 Dec 2009 05:31:11 +0000 +# Linux version 2.6.28-11-generic (buildd@palmer) (gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) ) #42-Ubuntu SMP Fri Apr 17 01:57:59 UTC 2009 # # Codezero Microkernel Configurator @@ -57,7 +57,7 @@ CONFIG_PLATFORM_PB926=y CONFIG_TOOLCHAIN_KERNEL="arm-none-eabi-" CONFIG_TOOLCHAIN_USER="arm-none-linux-gnueabi-" -CONFIG_CONTAINERS=4 +CONFIG_CONTAINERS=1 # # Container Setup @@ -79,40 +79,40 @@ CONFIG_CONT0_TYPE_LINUX=n # # Container 0 Options # -CONFIG_CONT0_OPT_NAME="hello0" +CONFIG_CONT0_OPT_NAME="hello_world0" # # Baremetal Project # -CONFIG_CONT0_BAREMETAL_PROJ0=n -CONFIG_CONT0_BAREMETAL_PROJ1=y -CONFIG_CONT0_BAREMETAL_PROJ2=n -CONFIG_CONT0_BAREMETAL_PROJ3=n -CONFIG_CONT0_BAREMETAL_PROJ4=n -CONFIG_CONT0_BAREMETAL_PROJ5=n +CONFIG_CONT0_BAREMETAL_PROJ_EMPTY=n +CONFIG_CONT0_BAREMETAL_PROJ_HELLO_WORLD=y +CONFIG_CONT0_BAREMETAL_PROJ_THREADS_DEMO=n +CONFIG_CONT0_BAREMETAL_PROJ_TEST=n +CONFIG_CONT0_BAREMETAL_PROJ_UART_SERVICE=n +CONFIG_CONT0_BAREMETAL_PROJ_TIMER_SERVICE=n # # Container 0 Default Pager Parameters # -CONFIG_CONT0_PAGER_LMA=0x40000 -CONFIG_CONT0_PAGER_VMA=0x10000000 +CONFIG_CONT0_PAGER_LMA=0x100000 +CONFIG_CONT0_PAGER_VMA=0xa0000000 # # Container 0 Physical Memory Regions (Capabilities) # CONFIG_CONT0_PHYSMEM_REGIONS=1 -CONFIG_CONT0_PHYS0_START=0x40000 -CONFIG_CONT0_PHYS0_END=0x100000 +CONFIG_CONT0_PHYS0_START=0x100000 +CONFIG_CONT0_PHYS0_END=0xe00000 # # Container 0 Virtual Memory Regions (Capabilities) # CONFIG_CONT0_VIRTMEM_REGIONS=1 -CONFIG_CONT0_VIRT0_START=0x10000000 -CONFIG_CONT0_VIRT0_END=0x20000000 +CONFIG_CONT0_VIRT0_START=0xa0000000 +CONFIG_CONT0_VIRT0_END=0xb0000000 # @@ -252,589 +252,29 @@ CONFIG_CONT0_CAP_DEVICE_TIMER1_USE=n -# -# Container 1 Parameters -# - -# -# Container 1 Type -# -CONFIG_CONT1_TYPE_BAREMETAL=y -CONFIG_CONT1_TYPE_POSIX=n -CONFIG_CONT1_TYPE_LINUX=n - - -# -# Container 1 Options -# -CONFIG_CONT1_OPT_NAME="hello1" - -# -# Baremetal Project -# -CONFIG_CONT1_BAREMETAL_PROJ0=n -CONFIG_CONT1_BAREMETAL_PROJ1=y -CONFIG_CONT1_BAREMETAL_PROJ2=n -CONFIG_CONT1_BAREMETAL_PROJ3=n -CONFIG_CONT1_BAREMETAL_PROJ4=n -CONFIG_CONT1_BAREMETAL_PROJ5=n - - -# -# Container 1 Default Pager Parameters -# -CONFIG_CONT1_PAGER_LMA=0x100000 -CONFIG_CONT1_PAGER_VMA=0x20000000 - - -# -# Container 1 Physical Memory Regions (Capabilities) -# -CONFIG_CONT1_PHYSMEM_REGIONS=1 -CONFIG_CONT1_PHYS0_START=0x100000 -CONFIG_CONT1_PHYS0_END=0x200000 - - -# -# Container 1 Virtual Memory Regions (Capabilities) -# -CONFIG_CONT1_VIRTMEM_REGIONS=1 -CONFIG_CONT1_VIRT0_START=0x20000000 -CONFIG_CONT1_VIRT0_END=0x30000000 - - -# -# Container 1 Capability List -# - -# -# Container 1 Thread Pool Capability -# -CONFIG_CONT1_CAP_THREADPOOL_USE=y -CONFIG_CONT1_CAP_THREADPOOL_SIZE=64 - - -# -# Container 1 Space Pool Capability -# -CONFIG_CONT1_CAP_SPACEPOOL_USE=y -CONFIG_CONT1_CAP_SPACEPOOL_SIZE=64 - - -# -# Container 1 Mutex Pool Capability -# -CONFIG_CONT1_CAP_MUTEXPOOL_USE=y -CONFIG_CONT1_CAP_MUTEXPOOL_SIZE=100 - - -# -# Container 1 Map Pool Capability -# -CONFIG_CONT1_CAP_MAPPOOL_USE=y -CONFIG_CONT1_CAP_MAPPOOL_SIZE=800 - - -# -# Container 1 Capability Pool Capability -# -CONFIG_CONT1_CAP_CAPPOOL_USE=y -CONFIG_CONT1_CAP_CAPPOOL_SIZE=32 - - -# -# Container 1 Thread Control Capability -# -CONFIG_CONT1_CAP_TCTRL_USE=y -CONFIG_CONT1_CAP_TCTRL_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT1_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 1 Exchange Registers Capability -# -CONFIG_CONT1_CAP_EXREGS_USE=y -CONFIG_CONT1_CAP_EXREGS_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT1_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 1 IPC Capability -# -CONFIG_CONT1_CAP_IPC_USE=y -CONFIG_CONT1_CAP_IPC_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT1_CAP_IPC_TARGET_CURRENT_PAGER_SPACE=n -CONFIG_CONT1_CAP_IPC_TARGET_ANOTHER_CONTAINER=n -CONFIG_CONT1_CAP_IPC_TARGET_ANOTHER_PAGER=n - - -# -# Container 1 Capability Control Capability -# -CONFIG_CONT1_CAP_CAPCTRL_USE=y -CONFIG_CONT1_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT1_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 1 Userspace Mutex Control Capability -# -CONFIG_CONT1_CAP_UMUTEX_USE=y -CONFIG_CONT1_CAP_UMUTEX_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT1_CAP_UMUTEX_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 1 Custom Capability 0 Parameters -# -CONFIG_CONT1_CAP_CUSTOM0_USE=n - - -# -# Container 1 Custom Capability 1 Parameters -# -CONFIG_CONT1_CAP_CUSTOM1_USE=n - - -# -# Container 1 Custom Capability 2 Parameters -# -CONFIG_CONT1_CAP_CUSTOM2_USE=n - - -# -# Container 1 Custom Capability 3 Parameters -# -CONFIG_CONT1_CAP_CUSTOM3_USE=n - - - -# -# Container 1 Devices (Capabilities) -# - -# -# Container 1 UART1 Menu -# -CONFIG_CONT1_CAP_DEVICE_UART1_USE=n - - -# -# Container 1 UART2 Menu -# -CONFIG_CONT1_CAP_DEVICE_UART2_USE=n - - -# -# Container 1 UART3 Menu -# -CONFIG_CONT1_CAP_DEVICE_UART3_USE=n - - -# -# Container 1 TIMER23 Menu -# -CONFIG_CONT1_CAP_DEVICE_TIMER1_USE=n - - - - - -# -# Container 2 Parameters -# - -# -# Container 2 Type -# -CONFIG_CONT2_TYPE_BAREMETAL=y -CONFIG_CONT2_TYPE_POSIX=n -CONFIG_CONT2_TYPE_LINUX=n - - -# -# Container 2 Options -# -CONFIG_CONT2_OPT_NAME="hello2" - -# -# Baremetal Project -# -CONFIG_CONT2_BAREMETAL_PROJ0=n -CONFIG_CONT2_BAREMETAL_PROJ1=y -CONFIG_CONT2_BAREMETAL_PROJ2=n -CONFIG_CONT2_BAREMETAL_PROJ3=n -CONFIG_CONT2_BAREMETAL_PROJ4=n -CONFIG_CONT2_BAREMETAL_PROJ5=n - - -# -# Container 2 Default Pager Parameters -# -CONFIG_CONT2_PAGER_LMA=0x200000 -CONFIG_CONT2_PAGER_VMA=0x30000000 - - -# -# Container 2 Physical Memory Regions (Capabilities) -# -CONFIG_CONT2_PHYSMEM_REGIONS=1 -CONFIG_CONT2_PHYS0_START=0x200000 -CONFIG_CONT2_PHYS0_END=0x300000 - - -# -# Container 2 Virtual Memory Regions (Capabilities) -# -CONFIG_CONT2_VIRTMEM_REGIONS=1 -CONFIG_CONT2_VIRT0_START=0x30000000 -CONFIG_CONT2_VIRT0_END=0x40000000 - - -# -# Container 2 Capability List -# - -# -# Container 2 Thread Pool Capability -# -CONFIG_CONT2_CAP_THREADPOOL_USE=y -CONFIG_CONT2_CAP_THREADPOOL_SIZE=64 - - -# -# Container 2 Space Pool Capability -# -CONFIG_CONT2_CAP_SPACEPOOL_USE=y -CONFIG_CONT2_CAP_SPACEPOOL_SIZE=64 - - -# -# Container 2 Mutex Pool Capability -# -CONFIG_CONT2_CAP_MUTEXPOOL_USE=y -CONFIG_CONT2_CAP_MUTEXPOOL_SIZE=100 - - -# -# Container 2 Map Pool Capability -# -CONFIG_CONT2_CAP_MAPPOOL_USE=y -CONFIG_CONT2_CAP_MAPPOOL_SIZE=800 - - -# -# Container 2 Capability Pool Capability -# -CONFIG_CONT2_CAP_CAPPOOL_USE=y -CONFIG_CONT2_CAP_CAPPOOL_SIZE=32 - - -# -# Container 2 Thread Control Capability -# -CONFIG_CONT2_CAP_TCTRL_USE=y -CONFIG_CONT2_CAP_TCTRL_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT2_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 2 Exchange Registers Capability -# -CONFIG_CONT2_CAP_EXREGS_USE=y -CONFIG_CONT2_CAP_EXREGS_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT2_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 2 IPC Capability -# -CONFIG_CONT2_CAP_IPC_USE=y -CONFIG_CONT2_CAP_IPC_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT2_CAP_IPC_TARGET_CURRENT_PAGER_SPACE=n -CONFIG_CONT2_CAP_IPC_TARGET_ANOTHER_CONTAINER=n -CONFIG_CONT2_CAP_IPC_TARGET_ANOTHER_PAGER=n - - -# -# Container 2 Capability Control Capability -# -CONFIG_CONT2_CAP_CAPCTRL_USE=y -CONFIG_CONT2_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT2_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 2 Userspace Mutex Control Capability -# -CONFIG_CONT2_CAP_UMUTEX_USE=y -CONFIG_CONT2_CAP_UMUTEX_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT2_CAP_UMUTEX_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 2 Custom Capability 0 Parameters -# -CONFIG_CONT2_CAP_CUSTOM0_USE=n - - -# -# Container 2 Custom Capability 1 Parameters -# -CONFIG_CONT2_CAP_CUSTOM1_USE=n - - -# -# Container 2 Custom Capability 2 Parameters -# -CONFIG_CONT2_CAP_CUSTOM2_USE=n - - -# -# Container 2 Custom Capability 3 Parameters -# -CONFIG_CONT2_CAP_CUSTOM3_USE=n - - - -# -# Container 2 Devices (Capabilities) -# - -# -# Container 2 UART1 Menu -# -CONFIG_CONT2_CAP_DEVICE_UART1_USE=n - - -# -# Container 2 UART2 Menu -# -CONFIG_CONT2_CAP_DEVICE_UART2_USE=n - - -# -# Container 2 UART3 Menu -# -CONFIG_CONT2_CAP_DEVICE_UART3_USE=n - - -# -# Container 2 TIMER23 Menu -# -CONFIG_CONT2_CAP_DEVICE_TIMER1_USE=n - - - - - -# -# Container 3 Parameters -# - -# -# Container 3 Type -# -CONFIG_CONT3_TYPE_BAREMETAL=y -CONFIG_CONT3_TYPE_POSIX=n -CONFIG_CONT3_TYPE_LINUX=n - - -# -# Container 3 Options -# -CONFIG_CONT3_OPT_NAME="hello3" - -# -# Baremetal Project -# -CONFIG_CONT3_BAREMETAL_PROJ0=n -CONFIG_CONT3_BAREMETAL_PROJ1=y -CONFIG_CONT3_BAREMETAL_PROJ2=n -CONFIG_CONT3_BAREMETAL_PROJ3=n -CONFIG_CONT3_BAREMETAL_PROJ4=n -CONFIG_CONT3_BAREMETAL_PROJ5=n - - -# -# Container 3 Default Pager Parameters -# -CONFIG_CONT3_PAGER_LMA=0x300000 -CONFIG_CONT3_PAGER_VMA=0x40000000 - - -# -# Container 3 Physical Memory Regions (Capabilities) -# -CONFIG_CONT3_PHYSMEM_REGIONS=1 -CONFIG_CONT3_PHYS0_START=0x300000 -CONFIG_CONT3_PHYS0_END=0x400000 - - -# -# Container 3 Virtual Memory Regions (Capabilities) -# -CONFIG_CONT3_VIRTMEM_REGIONS=1 -CONFIG_CONT3_VIRT0_START=0x40000000 -CONFIG_CONT3_VIRT0_END=0x50000000 - - -# -# Container 3 Capability List -# - -# -# Container 3 Thread Pool Capability -# -CONFIG_CONT3_CAP_THREADPOOL_USE=y -CONFIG_CONT3_CAP_THREADPOOL_SIZE=64 - - -# -# Container 3 Space Pool Capability -# -CONFIG_CONT3_CAP_SPACEPOOL_USE=y -CONFIG_CONT3_CAP_SPACEPOOL_SIZE=64 - - -# -# Container 3 Mutex Pool Capability -# -CONFIG_CONT3_CAP_MUTEXPOOL_USE=y -CONFIG_CONT3_CAP_MUTEXPOOL_SIZE=100 - - -# -# Container 3 Map Pool Capability -# -CONFIG_CONT3_CAP_MAPPOOL_USE=y -CONFIG_CONT3_CAP_MAPPOOL_SIZE=800 - - -# -# Container 3 Capability Pool Capability -# -CONFIG_CONT3_CAP_CAPPOOL_USE=y -CONFIG_CONT3_CAP_CAPPOOL_SIZE=32 - - -# -# Container 3 Thread Control Capability -# -CONFIG_CONT3_CAP_TCTRL_USE=y -CONFIG_CONT3_CAP_TCTRL_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT3_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 3 Exchange Registers Capability -# -CONFIG_CONT3_CAP_EXREGS_USE=y -CONFIG_CONT3_CAP_EXREGS_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT3_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 3 IPC Capability -# -CONFIG_CONT3_CAP_IPC_USE=y -CONFIG_CONT3_CAP_IPC_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT3_CAP_IPC_TARGET_CURRENT_PAGER_SPACE=n -CONFIG_CONT3_CAP_IPC_TARGET_ANOTHER_CONTAINER=n -CONFIG_CONT3_CAP_IPC_TARGET_ANOTHER_PAGER=n - - -# -# Container 3 Capability Control Capability -# -CONFIG_CONT3_CAP_CAPCTRL_USE=y -CONFIG_CONT3_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT3_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 3 Userspace Mutex Control Capability -# -CONFIG_CONT3_CAP_UMUTEX_USE=y -CONFIG_CONT3_CAP_UMUTEX_TARGET_CURRENT_CONTAINER=y -CONFIG_CONT3_CAP_UMUTEX_TARGET_CURRENT_PAGER_SPACE=n - - -# -# Container 3 Custom Capability 0 Parameters -# -CONFIG_CONT3_CAP_CUSTOM0_USE=n - - -# -# Container 3 Custom Capability 1 Parameters -# -CONFIG_CONT3_CAP_CUSTOM1_USE=n - - -# -# Container 3 Custom Capability 2 Parameters -# -CONFIG_CONT3_CAP_CUSTOM2_USE=n - - -# -# Container 3 Custom Capability 3 Parameters -# -CONFIG_CONT3_CAP_CUSTOM3_USE=n - - - -# -# Container 3 Devices (Capabilities) -# - -# -# Container 3 UART1 Menu -# -CONFIG_CONT3_CAP_DEVICE_UART1_USE=n - - -# -# Container 3 UART2 Menu -# -CONFIG_CONT3_CAP_DEVICE_UART2_USE=n - - -# -# Container 3 UART3 Menu -# -CONFIG_CONT3_CAP_DEVICE_UART3_USE=n - - -# -# Container 3 TIMER23 Menu -# -CONFIG_CONT3_CAP_DEVICE_TIMER1_USE=n - - - - - # # Derived symbols # -CONFIG_CONT1_PAGER_LOAD_ADDR=0x100000 +CONFIG_CONT1_PAGER_LOAD_ADDR=0x1100000 CONFIG_DRIVER_IRQ_PL190=y CONFIG_DRIVER_TIMER_SP804=y -CONFIG_CONT3_START_PC_ADDR=0x40000000 +CONFIG_CONT2_START_PC_ADDR=0xc0000000 +CONFIG_CONT3_START_PC_ADDR=0xd0000000 CONFIG_DRIVER_IRQ_GIC=n -CONFIG_CONT2_PAGER_VIRT_ADDR=0x30000000 -CONFIG_CONT2_PAGER_LOAD_ADDR=0x200000 -CONFIG_CONT1_PAGER_VIRT_ADDR=0x20000000 -CONFIG_CONT3_PAGER_LOAD_ADDR=0x300000 -CONFIG_CONT0_PAGER_LOAD_ADDR=0x40000 -CONFIG_CONT0_PAGER_VIRT_ADDR=0x10000000 -CONFIG_CONT2_START_PC_ADDR=0x30000000 +CONFIG_CONT2_PAGER_VIRT_ADDR=0xc0000000 +CONFIG_baremetal2="baremetal_noname2" +CONFIG_CONT2_PAGER_LOAD_ADDR=0x2100000 +CONFIG_CONT1_PAGER_VIRT_ADDR=0xb0000000 +CONFIG_CONT3_PAGER_LOAD_ADDR=0x3100000 +CONFIG_CONT0_PAGER_LOAD_ADDR=0x100000 +CONFIG_CONT0_PAGER_VIRT_ADDR=0xa0000000 +CONFIG_baremetal1="baremetal_noname1" +CONFIG_baremetal0="hello_world0" +CONFIG_baremetal3="baremetal_noname3" CONFIG_DRIVER_UART_PL011=y -CONFIG_CONT3_PAGER_VIRT_ADDR=0x40000000 -CONFIG_CONT0_START_PC_ADDR=0x10000000 -CONFIG_CONT1_START_PC_ADDR=0x20000000 +CONFIG_CONT3_PAGER_VIRT_ADDR=0xd0000000 +CONFIG_CONT0_START_PC_ADDR=0xa0000000 +CONFIG_CONT1_START_PC_ADDR=0xb0000000 # # That's all, folks! diff --git a/config/cml/examples/linux/config.cml b/config/cml/examples/linux/config.cml index 0ee02e6..dc756db 100644 --- a/config/cml/examples/linux/config.cml +++ b/config/cml/examples/linux/config.cml @@ -2,7 +2,7 @@ # Automatically generated, don't edit # # Generated on: amit-laptop -# At: Wed, 21 Oct 2009 18:22:52 +0000 +# At: Fri, 04 Dec 2009 05:32:36 +0000 # Linux version 2.6.28-11-generic (buildd@palmer) (gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) ) #42-Ubuntu SMP Fri Apr 17 01:57:59 UTC 2009 # @@ -46,24 +46,23 @@ CONFIG_CPU_ARM926=y # ARM Platform Type # CONFIG_PLATFORM_EB=n -CONFIG_PLATFORM_AB926=n CONFIG_PLATFORM_PB926=y -# -# Platform Drivers -# -CONFIG_DRIVER_UART_PL011=y -CONFIG_DRIVER_TIMER_SP804=y -CONFIG_DRIVER_IRQ_PL190=y +# +# Toolchain Prefix +# +CONFIG_TOOLCHAIN_KERNEL="arm-none-eabi-" +CONFIG_TOOLCHAIN_USER="arm-none-linux-gnueabi-" CONFIG_CONTAINERS=1 # # Container Setup # +CONFIG_CAPABILITIES=y # # Container 0 Parameters @@ -72,9 +71,9 @@ CONFIG_CONTAINERS=1 # # Container 0 Type # -CONFIG_CONT0_TYPE_LINUX=y -CONFIG_CONT0_TYPE_BARE=n +CONFIG_CONT0_TYPE_BAREMETAL=n CONFIG_CONT0_TYPE_POSIX=n +CONFIG_CONT0_TYPE_LINUX=y # @@ -85,30 +84,188 @@ CONFIG_CONT0_OPT_NAME="linux0" # # Container 0 Linux Pager Parameters # -CONFIG_CONT0_LINUX_ZRELADDR=0x208000 -CONFIG_CONT0_LINUX_PAGE_OFFSET=0xc0000000 -CONFIG_CONT0_LINUX_PHYS_OFFSET=0x200000 -CONFIG_CONT0_LINUX_ROOTFS_ADDRESS=0x1000000 +CONFIG_CONT0_LINUX_PHYS_OFFSET=0x100000 +CONFIG_CONT0_LINUX_ZRELADDR=0x108000 +CONFIG_CONT0_LINUX_ROOTFS_ADDRESS=0x600000 +CONFIG_CONT0_LINUX_PAGE_OFFSET=0xa0000000 # -# Container 0 Physical Memory Regions +# Container 0 Physical Memory Regions (Capabilities) # CONFIG_CONT0_PHYSMEM_REGIONS=1 -CONFIG_CONT0_PHYS0_START=0x200000 -CONFIG_CONT0_PHYS0_END=0x2200000 +CONFIG_CONT0_PHYS0_START=0x100000 +CONFIG_CONT0_PHYS0_END=0xe00000 # -# Container 0 Virtual Memory Regions +# Container 0 Virtual Memory Regions (Capabilities) # CONFIG_CONT0_VIRTMEM_REGIONS=1 -CONFIG_CONT0_VIRT0_START=0xc0000000 -CONFIG_CONT0_VIRT0_END=0xd0000000 +CONFIG_CONT0_VIRT0_START=0xa0000000 +CONFIG_CONT0_VIRT0_END=0xb0000000 + + +# +# Container 0 Capability List +# + +# +# Container 0 Thread Pool Capability +# +CONFIG_CONT0_CAP_THREADPOOL_USE=y +CONFIG_CONT0_CAP_THREADPOOL_SIZE=64 + + +# +# Container 0 Space Pool Capability +# +CONFIG_CONT0_CAP_SPACEPOOL_USE=y +CONFIG_CONT0_CAP_SPACEPOOL_SIZE=64 + + +# +# Container 0 Mutex Pool Capability +# +CONFIG_CONT0_CAP_MUTEXPOOL_USE=y +CONFIG_CONT0_CAP_MUTEXPOOL_SIZE=100 + + +# +# Container 0 Map Pool Capability +# +CONFIG_CONT0_CAP_MAPPOOL_USE=y +CONFIG_CONT0_CAP_MAPPOOL_SIZE=800 + + +# +# Container 0 Capability Pool Capability +# +CONFIG_CONT0_CAP_CAPPOOL_USE=y +CONFIG_CONT0_CAP_CAPPOOL_SIZE=32 + + +# +# Container 0 Thread Control Capability +# +CONFIG_CONT0_CAP_TCTRL_USE=y +CONFIG_CONT0_CAP_TCTRL_TARGET_CURRENT_CONTAINER=y +CONFIG_CONT0_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE=n + + +# +# Container 0 Exchange Registers Capability +# +CONFIG_CONT0_CAP_EXREGS_USE=y +CONFIG_CONT0_CAP_EXREGS_TARGET_CURRENT_CONTAINER=y +CONFIG_CONT0_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE=n + + +# +# Container 0 IPC Capability +# +CONFIG_CONT0_CAP_IPC_USE=y +CONFIG_CONT0_CAP_IPC_TARGET_CURRENT_CONTAINER=y +CONFIG_CONT0_CAP_IPC_TARGET_CURRENT_PAGER_SPACE=n +CONFIG_CONT0_CAP_IPC_TARGET_ANOTHER_CONTAINER=n +CONFIG_CONT0_CAP_IPC_TARGET_ANOTHER_PAGER=n + + +# +# Container 0 Capability Control Capability +# +CONFIG_CONT0_CAP_CAPCTRL_USE=y +CONFIG_CONT0_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER=y +CONFIG_CONT0_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE=n + + +# +# Container 0 Userspace Mutex Control Capability +# +CONFIG_CONT0_CAP_UMUTEX_USE=y +CONFIG_CONT0_CAP_UMUTEX_TARGET_CURRENT_CONTAINER=y +CONFIG_CONT0_CAP_UMUTEX_TARGET_CURRENT_PAGER_SPACE=n + + +# +# Container 0 Custom Capability 0 Parameters +# +CONFIG_CONT0_CAP_CUSTOM0_USE=n + + +# +# Container 0 Custom Capability 1 Parameters +# +CONFIG_CONT0_CAP_CUSTOM1_USE=n + + +# +# Container 0 Custom Capability 2 Parameters +# +CONFIG_CONT0_CAP_CUSTOM2_USE=n + + +# +# Container 0 Custom Capability 3 Parameters +# +CONFIG_CONT0_CAP_CUSTOM3_USE=n + + + +# +# Container 0 Devices (Capabilities) +# + +# +# Container 0 UART1 Menu +# +CONFIG_CONT0_CAP_DEVICE_UART1_USE=n + + +# +# Container 0 UART2 Menu +# +CONFIG_CONT0_CAP_DEVICE_UART2_USE=n + + +# +# Container 0 UART3 Menu +# +CONFIG_CONT0_CAP_DEVICE_UART3_USE=n + + +# +# Container 0 TIMER23 Menu +# +CONFIG_CONT0_CAP_DEVICE_TIMER1_USE=n + +# +# Derived symbols +# +CONFIG_CONT1_PAGER_LOAD_ADDR=0x1100000 +CONFIG_DRIVER_IRQ_PL190=y +CONFIG_DRIVER_TIMER_SP804=y +CONFIG_CONT2_START_PC_ADDR=0xc0000000 +CONFIG_CONT3_START_PC_ADDR=0xd0000000 +CONFIG_DRIVER_IRQ_GIC=n +CONFIG_CONT2_PAGER_VIRT_ADDR=0xc0000000 +CONFIG_baremetal2="baremetal_noname2" +CONFIG_CONT2_PAGER_LOAD_ADDR=0x2100000 +CONFIG_CONT1_PAGER_VIRT_ADDR=0xb0000000 +CONFIG_CONT3_PAGER_LOAD_ADDR=0x3100000 +CONFIG_CONT0_PAGER_LOAD_ADDR=0x100000 +CONFIG_CONT0_PAGER_VIRT_ADDR=0xa0000000 +CONFIG_baremetal1="baremetal_noname1" +CONFIG_baremetal0="empty0" +CONFIG_baremetal3="baremetal_noname3" +CONFIG_DRIVER_UART_PL011=y +CONFIG_CONT3_PAGER_VIRT_ADDR=0xd0000000 +CONFIG_CONT0_START_PC_ADDR=0xa0008000 +CONFIG_CONT1_START_PC_ADDR=0xb0000000 # # That's all, folks! diff --git a/config/cml/examples/posix/single_posix.cml b/config/cml/examples/posix/single_posix.cml index 8924de7..26a2f17 100644 --- a/config/cml/examples/posix/single_posix.cml +++ b/config/cml/examples/posix/single_posix.cml @@ -1,9 +1,9 @@ # # Automatically generated, don't edit # -# Generated on: bahadir-laptop -# At: Mon, 23 Nov 2009 11:23:47 +0000 -# Linux version 2.6.24-22-generic (buildd@vernadsky) (gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7)) #1 SMP Mon Nov 24 18:32:42 UTC 2008 +# Generated on: amit-laptop +# At: Fri, 04 Dec 2009 05:37:15 +0000 +# Linux version 2.6.28-11-generic (buildd@palmer) (gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) ) #42-Ubuntu SMP Fri Apr 17 01:57:59 UTC 2009 # # Codezero Microkernel Configurator @@ -46,7 +46,6 @@ CONFIG_CPU_ARM926=y # ARM Platform Type # CONFIG_PLATFORM_EB=n -CONFIG_PLATFORM_AB926=n CONFIG_PLATFORM_PB926=y @@ -80,22 +79,22 @@ CONFIG_CONT0_TYPE_LINUX=n # # Container 0 Options # -CONFIG_CONT0_OPT_NAME="posix" +CONFIG_CONT0_OPT_NAME="posix0" # # Container 0 Default Pager Parameters # -CONFIG_CONT0_PAGER_LMA=0x40000 +CONFIG_CONT0_PAGER_LMA=0x100000 CONFIG_CONT0_PAGER_VMA=0xa0000000 # # Container 0 POSIX Pager Parameters # -CONFIG_CONT0_PAGER_SHM_START=0x40000000 -CONFIG_CONT0_PAGER_SHM_END=0x50000000 -CONFIG_CONT0_PAGER_TASK_START=0x30000000 -CONFIG_CONT0_PAGER_TASK_END=0x40000000 +CONFIG_CONT0_PAGER_SHM_START=0x80000000 +CONFIG_CONT0_PAGER_SHM_END=0x88000000 +CONFIG_CONT0_PAGER_TASK_START=0x40000000 +CONFIG_CONT0_PAGER_TASK_END=0x50000000 CONFIG_CONT0_PAGER_UTCB_START=0xf8100000 CONFIG_CONT0_PAGER_UTCB_END=0xf8200000 @@ -104,8 +103,8 @@ CONFIG_CONT0_PAGER_UTCB_END=0xf8200000 # Container 0 Physical Memory Regions (Capabilities) # CONFIG_CONT0_PHYSMEM_REGIONS=1 -CONFIG_CONT0_PHYS0_START=0x40000 -CONFIG_CONT0_PHYS0_END=0x1000000 +CONFIG_CONT0_PHYS0_START=0x100000 +CONFIG_CONT0_PHYS0_END=0xe00000 # @@ -114,12 +113,12 @@ CONFIG_CONT0_PHYS0_END=0x1000000 CONFIG_CONT0_VIRTMEM_REGIONS=4 CONFIG_CONT0_VIRT0_START=0xa0000000 CONFIG_CONT0_VIRT0_END=0xb0000000 -CONFIG_CONT0_VIRT1_START=0x40000000 -CONFIG_CONT0_VIRT1_END=0x50000000 -CONFIG_CONT0_VIRT2_START=0xf8100000 -CONFIG_CONT0_VIRT2_END=0xf8200000 -CONFIG_CONT0_VIRT3_START=0x30000000 -CONFIG_CONT0_VIRT3_END=0x40000000 +CONFIG_CONT0_VIRT1_START=0x80000000 +CONFIG_CONT0_VIRT1_END=0x88000000 +CONFIG_CONT0_VIRT2_START=0x40000000 +CONFIG_CONT0_VIRT2_END=0x50000000 +CONFIG_CONT0_VIRT3_START=0xf8100000 +CONFIG_CONT0_VIRT3_END=0xf8200000 # @@ -228,27 +227,60 @@ CONFIG_CONT0_CAP_CUSTOM3_USE=n +# +# Container 0 Devices (Capabilities) +# + +# +# Container 0 UART1 Menu +# +CONFIG_CONT0_CAP_DEVICE_UART1_USE=n + + +# +# Container 0 UART2 Menu +# +CONFIG_CONT0_CAP_DEVICE_UART2_USE=n + + +# +# Container 0 UART3 Menu +# +CONFIG_CONT0_CAP_DEVICE_UART3_USE=n + + +# +# Container 0 TIMER23 Menu +# +CONFIG_CONT0_CAP_DEVICE_TIMER1_USE=n + + + # # Derived symbols # -CONFIG_CONT1_PAGER_LOAD_ADDR=0x40000 +CONFIG_CONT1_PAGER_LOAD_ADDR=0x1100000 CONFIG_DRIVER_IRQ_PL190=y CONFIG_DRIVER_TIMER_SP804=y -CONFIG_CONT2_START_PC_ADDR=0x90000000 -CONFIG_CONT3_START_PC_ADDR=0x90000000 +CONFIG_CONT2_START_PC_ADDR=0xc0000000 +CONFIG_CONT3_START_PC_ADDR=0xd0000000 CONFIG_DRIVER_IRQ_GIC=n -CONFIG_CONT2_PAGER_VIRT_ADDR=0x90000000 -CONFIG_CONT2_PAGER_LOAD_ADDR=0x40000 -CONFIG_CONT1_PAGER_VIRT_ADDR=0x90000000 -CONFIG_CONT3_PAGER_LOAD_ADDR=0x40000 -CONFIG_CONT0_PAGER_LOAD_ADDR=0x40000 +CONFIG_CONT2_PAGER_VIRT_ADDR=0xc0000000 +CONFIG_baremetal2="baremetal_noname2" +CONFIG_CONT2_PAGER_LOAD_ADDR=0x2100000 +CONFIG_CONT1_PAGER_VIRT_ADDR=0xb0000000 +CONFIG_CONT3_PAGER_LOAD_ADDR=0x3100000 +CONFIG_CONT0_PAGER_LOAD_ADDR=0x100000 CONFIG_CONT0_PAGER_VIRT_ADDR=0xa0000000 +CONFIG_baremetal1="baremetal_noname1" +CONFIG_baremetal0="empty0" +CONFIG_baremetal3="baremetal_noname3" CONFIG_DRIVER_UART_PL011=y -CONFIG_CONT3_PAGER_VIRT_ADDR=0x90000000 +CONFIG_CONT3_PAGER_VIRT_ADDR=0xd0000000 CONFIG_CONT0_START_PC_ADDR=0xa0000000 -CONFIG_CONT1_START_PC_ADDR=0x90000000 +CONFIG_CONT1_START_PC_ADDR=0xb0000000 # # That's all, folks! diff --git a/config/cml/examples/posix/two_posix.cml b/config/cml/examples/posix/two_posix.cml index 4c2ae13..8ecfbc7 100644 --- a/config/cml/examples/posix/two_posix.cml +++ b/config/cml/examples/posix/two_posix.cml @@ -1,9 +1,9 @@ # # Automatically generated, don't edit # -# Generated on: bahadir-laptop -# At: Tue, 01 Dec 2009 12:35:32 +0000 -# Linux version 2.6.24-25-generic (buildd@rothera) (gcc version 4.2.4 (Ubuntu 4.2.4-1ubuntu3)) #1 SMP Tue Oct 20 07:31:10 UTC 2009 +# Generated on: amit-laptop +# At: Fri, 04 Dec 2009 05:19:22 +0000 +# Linux version 2.6.28-11-generic (buildd@palmer) (gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) ) #42-Ubuntu SMP Fri Apr 17 01:57:59 UTC 2009 # # Codezero Microkernel Configurator @@ -79,22 +79,22 @@ CONFIG_CONT0_TYPE_LINUX=n # # Container 0 Options # -CONFIG_CONT0_OPT_NAME="posix" +CONFIG_CONT0_OPT_NAME="posix0" # # Container 0 Default Pager Parameters # -CONFIG_CONT0_PAGER_LMA=0x40000 +CONFIG_CONT0_PAGER_LMA=0x100000 CONFIG_CONT0_PAGER_VMA=0xa0000000 # # Container 0 POSIX Pager Parameters # -CONFIG_CONT0_PAGER_SHM_START=0x40000000 -CONFIG_CONT0_PAGER_SHM_END=0x50000000 -CONFIG_CONT0_PAGER_TASK_START=0x30000000 -CONFIG_CONT0_PAGER_TASK_END=0x40000000 +CONFIG_CONT0_PAGER_SHM_START=0x80000000 +CONFIG_CONT0_PAGER_SHM_END=0x88000000 +CONFIG_CONT0_PAGER_TASK_START=0x40000000 +CONFIG_CONT0_PAGER_TASK_END=0x50000000 CONFIG_CONT0_PAGER_UTCB_START=0xf8100000 CONFIG_CONT0_PAGER_UTCB_END=0xf8200000 @@ -103,8 +103,8 @@ CONFIG_CONT0_PAGER_UTCB_END=0xf8200000 # Container 0 Physical Memory Regions (Capabilities) # CONFIG_CONT0_PHYSMEM_REGIONS=1 -CONFIG_CONT0_PHYS0_START=0x40000 -CONFIG_CONT0_PHYS0_END=0x1000000 +CONFIG_CONT0_PHYS0_START=0x100000 +CONFIG_CONT0_PHYS0_END=0xe00000 # @@ -113,12 +113,12 @@ CONFIG_CONT0_PHYS0_END=0x1000000 CONFIG_CONT0_VIRTMEM_REGIONS=4 CONFIG_CONT0_VIRT0_START=0xa0000000 CONFIG_CONT0_VIRT0_END=0xb0000000 -CONFIG_CONT0_VIRT1_START=0x40000000 -CONFIG_CONT0_VIRT1_END=0x50000000 -CONFIG_CONT0_VIRT2_START=0xf8100000 -CONFIG_CONT0_VIRT2_END=0xf8200000 -CONFIG_CONT0_VIRT3_START=0x30000000 -CONFIG_CONT0_VIRT3_END=0x40000000 +CONFIG_CONT0_VIRT1_START=0x80000000 +CONFIG_CONT0_VIRT1_END=0x88000000 +CONFIG_CONT0_VIRT2_START=0x40000000 +CONFIG_CONT0_VIRT2_END=0x50000000 +CONFIG_CONT0_VIRT3_START=0xf8100000 +CONFIG_CONT0_VIRT3_END=0xf8200000 # @@ -278,17 +278,17 @@ CONFIG_CONT1_OPT_NAME="posix1" # # Container 1 Default Pager Parameters # -CONFIG_CONT1_PAGER_LMA=0x1000000 +CONFIG_CONT1_PAGER_LMA=0x1100000 CONFIG_CONT1_PAGER_VMA=0xb0000000 # # Container 1 POSIX Pager Parameters # -CONFIG_CONT1_PAGER_SHM_START=0x20000000 -CONFIG_CONT1_PAGER_SHM_END=0x30000000 -CONFIG_CONT1_PAGER_TASK_START=0x10000000 -CONFIG_CONT1_PAGER_TASK_END=0x20000000 +CONFIG_CONT1_PAGER_SHM_START=0x88000000 +CONFIG_CONT1_PAGER_SHM_END=0x90000000 +CONFIG_CONT1_PAGER_TASK_START=0x50000000 +CONFIG_CONT1_PAGER_TASK_END=0x60000000 CONFIG_CONT1_PAGER_UTCB_START=0xf8200000 CONFIG_CONT1_PAGER_UTCB_END=0xf8300000 @@ -297,20 +297,20 @@ CONFIG_CONT1_PAGER_UTCB_END=0xf8300000 # Container 1 Physical Memory Regions (Capabilities) # CONFIG_CONT1_PHYSMEM_REGIONS=1 -CONFIG_CONT1_PHYS0_START=0x1000000 -CONFIG_CONT1_PHYS0_END=0x2000000 +CONFIG_CONT1_PHYS0_START=0x1100000 +CONFIG_CONT1_PHYS0_END=0x1e00000 # # Container 1 Virtual Memory Regions (Capabilities) # CONFIG_CONT1_VIRTMEM_REGIONS=4 -CONFIG_CONT1_VIRT0_START=0x10000000 -CONFIG_CONT1_VIRT0_END=0x20000000 -CONFIG_CONT1_VIRT1_START=0x20000000 -CONFIG_CONT1_VIRT1_END=0x30000000 -CONFIG_CONT1_VIRT2_START=0xb0000000 -CONFIG_CONT1_VIRT2_END=0xc0000000 +CONFIG_CONT1_VIRT0_START=0xb0000000 +CONFIG_CONT1_VIRT0_END=0xc0000000 +CONFIG_CONT1_VIRT1_START=0x88000000 +CONFIG_CONT1_VIRT1_END=0x90000000 +CONFIG_CONT1_VIRT2_START=0x50000000 +CONFIG_CONT1_VIRT2_END=0x60000000 CONFIG_CONT1_VIRT3_START=0xf8200000 CONFIG_CONT1_VIRT3_END=0xf8300000 @@ -456,18 +456,22 @@ CONFIG_CONT1_CAP_DEVICE_TIMER1_USE=n # # Derived symbols # -CONFIG_CONT1_PAGER_LOAD_ADDR=0x1000000 +CONFIG_CONT1_PAGER_LOAD_ADDR=0x1100000 CONFIG_DRIVER_IRQ_PL190=y CONFIG_DRIVER_TIMER_SP804=y +CONFIG_CONT2_START_PC_ADDR=0xc0000000 CONFIG_CONT3_START_PC_ADDR=0xd0000000 CONFIG_DRIVER_IRQ_GIC=n CONFIG_CONT2_PAGER_VIRT_ADDR=0xc0000000 +CONFIG_baremetal2="baremetal_noname2" CONFIG_CONT2_PAGER_LOAD_ADDR=0x2100000 CONFIG_CONT1_PAGER_VIRT_ADDR=0xb0000000 CONFIG_CONT3_PAGER_LOAD_ADDR=0x3100000 -CONFIG_CONT0_PAGER_LOAD_ADDR=0x40000 +CONFIG_CONT0_PAGER_LOAD_ADDR=0x100000 CONFIG_CONT0_PAGER_VIRT_ADDR=0xa0000000 -CONFIG_CONT2_START_PC_ADDR=0xc0000000 +CONFIG_baremetal1="empty1" +CONFIG_baremetal0="empty0" +CONFIG_baremetal3="baremetal_noname3" CONFIG_DRIVER_UART_PL011=y CONFIG_CONT3_PAGER_VIRT_ADDR=0xd0000000 CONFIG_CONT0_START_PC_ADDR=0xa0000000 diff --git a/conts/posix/test0/src/mutextest.c b/conts/posix/test0/src/mutextest.c index 8ad784e..60669fd 100644 --- a/conts/posix/test0/src/mutextest.c +++ b/conts/posix/test0/src/mutextest.c @@ -51,7 +51,7 @@ int user_mutex_test(void) */ if ((int)(base = mmap(0, map_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0)) < 0) { - printf("%s: mmap for extended ipc buffer failed: %d\n", + printf("%s: mmap for extended ipc buffer failed: %x\n", __FUNCTION__, (int)base); goto out_err; } else