diff --git a/config/cml/examples/posix/two_posix.cml b/config/cml/examples/posix/two_posix.cml index 84cbc0f..4c2ae13 100644 --- a/config/cml/examples/posix/two_posix.cml +++ b/config/cml/examples/posix/two_posix.cml @@ -2,8 +2,8 @@ # Automatically generated, don't edit # # Generated on: bahadir-laptop -# At: Mon, 23 Nov 2009 11:23:25 +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 +# 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 # # 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 @@ -228,6 +227,35 @@ 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 + + + # @@ -393,6 +421,35 @@ 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 + + + @@ -402,17 +459,17 @@ CONFIG_CONT1_CAP_CUSTOM3_USE=n CONFIG_CONT1_PAGER_LOAD_ADDR=0x1000000 CONFIG_DRIVER_IRQ_PL190=y CONFIG_DRIVER_TIMER_SP804=y -CONFIG_CONT2_START_PC_ADDR=0x90000000 -CONFIG_CONT3_START_PC_ADDR=0x90000000 +CONFIG_CONT3_START_PC_ADDR=0xd0000000 CONFIG_DRIVER_IRQ_GIC=n -CONFIG_CONT2_PAGER_VIRT_ADDR=0x90000000 -CONFIG_CONT2_PAGER_LOAD_ADDR=0x40000 +CONFIG_CONT2_PAGER_VIRT_ADDR=0xc0000000 +CONFIG_CONT2_PAGER_LOAD_ADDR=0x2100000 CONFIG_CONT1_PAGER_VIRT_ADDR=0xb0000000 -CONFIG_CONT3_PAGER_LOAD_ADDR=0x40000 +CONFIG_CONT3_PAGER_LOAD_ADDR=0x3100000 CONFIG_CONT0_PAGER_LOAD_ADDR=0x40000 CONFIG_CONT0_PAGER_VIRT_ADDR=0xa0000000 +CONFIG_CONT2_START_PC_ADDR=0xc0000000 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=0xb0000000 # diff --git a/conts/posix/mm0/mm/capability.c b/conts/posix/mm0/mm/capability.c index 1b9d864..00bf418 100644 --- a/conts/posix/mm0/mm/capability.c +++ b/conts/posix/mm0/mm/capability.c @@ -441,7 +441,7 @@ int cap_read_all() !cont_mem_regions.physmem || !cont_mem_regions.pager) { printf("%s: Error, pager does not have one of the required" - "mem capabilities defined. (TASK, SHM, PHYSMEM, UTCB)\n", + "mem capabilities defined. (TASK, SHM, PHYSMEM, UTCB, PAGER)\n", __TASKNAME__); printf("%p, %p, %p, %p, %p\n", cont_mem_regions.task, cont_mem_regions.shmem, cont_mem_regions.utcb,