diff --git a/include/l4/config.h b/include/l4/config.h deleted file mode 100644 index 7d58430..0000000 --- a/include/l4/config.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Automatically generated, don't edit */ -/* Generated on: bahadir-desktop */ -/* At: Sun, 13 Jan 2008 12:03:34 +0000 */ -/* Linux version 2.6.22-14-generic (buildd@terranova) (gcc version 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2)) #1 SMP Tue Dec 18 08:02:57 UTC 2007 */ - -/* L4 Project Kernel Configurator */ - -/* Main architecture */ -#undef ARCH_TEST -#define ARCH_ARM 1 - - -/* ARM Architecture Configuration */ - -/* ARM Processor Type */ -#undef ARM_CPU_ARM920T -#define ARM_CPU_ARM926 1 -#undef ARM_CPU_ARM925 - - -/* ARM Architecture Family */ -#define ARM_SUBARCH_V5 1 -#undef ARM_SUBARCH_V6 - - -/* ARM Platform Type */ -#undef ARM_PLATFORM_EB -#undef ARM_PLATFORM_AB926 -#define ARM_PLATFORM_PB926 1 - - -/* Platform Drivers */ -#define DRIVER_UART_PL011 1 -#define DRIVER_TIMER_SP804 1 -#define DRIVER_IRQCTRL_PL190 1 - - -#undef DUMMY - -/* That's all, folks! */ -/* Symbols derived from this file by SConstruct\derive_symbols() */ -#define __ARCH__ arm -#define __PLATFORM__ pb926 -#define __SUBARCH__ v5 - diff --git a/tasks/blkdev0/include/physical_base.lds b/tasks/blkdev0/include/physical_base.lds deleted file mode 100644 index 1c0860b..0000000 --- a/tasks/blkdev0/include/physical_base.lds +++ /dev/null @@ -1,17 +0,0 @@ -/* - * The next free p_align'ed LMA base address - * - * p_align = 0x8000 - * - * Recap from ELF spec: p_align: Loadable process segments must have - * congruent values for p_vaddr and p_offset, modulo the page size. - * This member gives the value to which the segments are aligned in - * memory and in the file. Values 0 and 1 mean that no alignment is - * required. Otherwise, p_align should be a positive, integral power - * of 2, and p_addr should equal p_offset, modulo p_align. - * This essentially means next available address must be aligned at - * p_align, rather than the page_size, which one (well, I) would - * normally expect. - */ - -physical_base = 0x3000; diff --git a/tasks/bootdesc/bootdesc.c.append b/tasks/bootdesc/bootdesc.c.append deleted file mode 100644 index 94aba81..0000000 --- a/tasks/bootdesc/bootdesc.c.append +++ /dev/null @@ -1,23 +0,0 @@ - -struct bootdesc bootdesc = { - .desc_size = sizeof(struct bootdesc) + sizeof(struct svc_image) * 3, - .total_images = 3, - .images = { - [0] = { - .name = "mm0", - .phys_start = 0x208000, - .phys_end = 0x213140, - }, - [1] = { - .name = "test0", - .phys_start = 0x218000, - .phys_end = 0x21aedc, - }, - [2] = { - .name = "romfs", - .phys_start = 0x220000, - .phys_end = 0x268800, - }, - - }, -}; diff --git a/tasks/bootdesc/fs0.txt b/tasks/bootdesc/fs0.txt deleted file mode 100644 index 16a5c79..0000000 --- a/tasks/bootdesc/fs0.txt +++ /dev/null @@ -1,3 +0,0 @@ -fs0 -image_start 0x218000 -image_end 0x21B26C diff --git a/tasks/bootdesc/inittask.txt b/tasks/bootdesc/inittask.txt deleted file mode 100644 index 2c9fdda..0000000 --- a/tasks/bootdesc/inittask.txt +++ /dev/null @@ -1,3 +0,0 @@ -inittask -image_start 0x208000 -image_end 0x213260 diff --git a/tasks/bootdesc/mm0.txt b/tasks/bootdesc/mm0.txt deleted file mode 100644 index b507cdc..0000000 --- a/tasks/bootdesc/mm0.txt +++ /dev/null @@ -1,3 +0,0 @@ -mm0 -image_start 0x208000 -image_end 0x213140 diff --git a/tasks/bootdesc/romfs.txt b/tasks/bootdesc/romfs.txt deleted file mode 100644 index 8950392..0000000 --- a/tasks/bootdesc/romfs.txt +++ /dev/null @@ -1,3 +0,0 @@ -romfs -image_start 0x220000 -image_end 0x268800 diff --git a/tasks/bootdesc/roottask.txt b/tasks/bootdesc/roottask.txt deleted file mode 100644 index a155b3e..0000000 --- a/tasks/bootdesc/roottask.txt +++ /dev/null @@ -1,3 +0,0 @@ -roottask -image_start 0x218000 -image_end 0x21B344 diff --git a/tasks/bootdesc/start.txt b/tasks/bootdesc/start.txt deleted file mode 100644 index 0ce547c..0000000 --- a/tasks/bootdesc/start.txt +++ /dev/null @@ -1,3 +0,0 @@ -start -image_start 0x100000 -image_end 0x205800 diff --git a/tasks/bootdesc/test0.txt b/tasks/bootdesc/test0.txt deleted file mode 100644 index 7e921eb..0000000 --- a/tasks/bootdesc/test0.txt +++ /dev/null @@ -1,3 +0,0 @@ -test0 -image_start 0x218000 -image_end 0x21AEDC diff --git a/tasks/bootdesc/testtask.txt b/tasks/bootdesc/testtask.txt deleted file mode 100644 index d03f117..0000000 --- a/tasks/bootdesc/testtask.txt +++ /dev/null @@ -1,3 +0,0 @@ -testtask -image_start 0x220000 -image_end 0x223344 diff --git a/tasks/fs0/include/kdata.h b/tasks/fs0/include/kdata.h index d5eb4e7..31bb8d2 100644 --- a/tasks/fs0/include/kdata.h +++ b/tasks/fs0/include/kdata.h @@ -12,7 +12,6 @@ #include INC_GLUE(memory.h) #include INC_GLUE(memlayout.h) #include INC_ARCH(bootdesc.h) -#include struct initdata { struct bootdesc *bootdesc; diff --git a/tasks/fs0/main.c b/tasks/fs0/main.c index c2a82d0..1190d68 100644 --- a/tasks/fs0/main.c +++ b/tasks/fs0/main.c @@ -21,11 +21,6 @@ void wait_pager(l4id_t partner) printf("Pager synced with us.\n"); } -void fs_request_handler(struct fs_request *fsreq) -{ - -} - void handle_fs_requests(void) { u32 mr[MR_UNUSED_TOTAL]; diff --git a/tasks/fs0/src/kdata.c b/tasks/fs0/src/kdata.c index 43b990e..4c90c34 100644 --- a/tasks/fs0/src/kdata.c +++ b/tasks/fs0/src/kdata.c @@ -8,7 +8,7 @@ #include #include #include INC_API(kip.h) -#include +#include /* Kernel data acquired during initialisation */ struct initdata initdata; diff --git a/tasks/fs0/src/vfs.c b/tasks/fs0/src/vfs.c index d95002f..ccd2bd0 100644 --- a/tasks/fs0/src/vfs.c +++ b/tasks/fs0/src/vfs.c @@ -14,8 +14,6 @@ void wait_task(l4id_t partner) void mount_root(void) { - l4id_t blkdev_shmid; - /* * We know the primary block device from compile-time. * It is expected to have the root filesystem. @@ -23,6 +21,5 @@ void mount_root(void) wait_task(BLKDEV_TID); /* Set up a shared memory area with the block device */ - l4_receive_shm( } diff --git a/tasks/libmem/kmalloc/kmalloc.c b/tasks/libmem/kmalloc/kmalloc.c index 748be24..513a3d2 100644 --- a/tasks/libmem/kmalloc/kmalloc.c +++ b/tasks/libmem/kmalloc/kmalloc.c @@ -12,6 +12,7 @@ #include INC_GLUE(memlayout.h) #include INC_SUBARCH(mm.h) #include +#include #include #include #include diff --git a/tasks/libmem/mm/alloc_page.c b/tasks/libmem/mm/alloc_page.c index 8bd4545..b93b989 100644 --- a/tasks/libmem/mm/alloc_page.c +++ b/tasks/libmem/mm/alloc_page.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "alloc_page.h" #include INC_GLUE(memory.h) #include INC_SUBARCH(mm.h) diff --git a/tasks/mm0/include/physical_base.lds b/tasks/mm0/include/physical_base.lds deleted file mode 100644 index 06201b0..0000000 --- a/tasks/mm0/include/physical_base.lds +++ /dev/null @@ -1,17 +0,0 @@ -/* - * The next free p_align'ed LMA base address - * - * p_align = 0x8000 - * - * Recap from ELF spec: p_align: Loadable process segments must have - * congruent values for p_vaddr and p_offset, modulo the page size. - * This member gives the value to which the segments are aligned in - * memory and in the file. Values 0 and 1 mean that no alignment is - * required. Otherwise, p_align should be a positive, integral power - * of 2, and p_addr should equal p_offset, modulo p_align. - * This essentially means next available address must be aligned at - * p_align, rather than the page_size, which one (well, I) would - * normally expect. - */ - -physical_base = 0x20800; diff --git a/tasks/mm0/main.c b/tasks/mm0/main.c index ce5b392..0225c32 100644 --- a/tasks/mm0/main.c +++ b/tasks/mm0/main.c @@ -87,12 +87,12 @@ void handle_requests(void) } case L4_IPC_TAG_MUNMAP: { /* TODO: Use arg struct instead */ - sys_munmap(sender, (void *)mr[0], (int)mr[1]); +// sys_munmap(sender, (void *)mr[0], (int)mr[1]); break; } case L4_IPC_TAG_MSYNC: { /* TODO: Use arg struct instead */ - sys_msync(sender, (void *)mr[0], (int)mr[1], (int)mr[2]); +// sys_msync(sender, (void *)mr[0], (int)mr[1], (int)mr[2]); break; } default: diff --git a/tasks/test0/include/physical_base.lds b/tasks/test0/include/physical_base.lds deleted file mode 100644 index 1c0860b..0000000 --- a/tasks/test0/include/physical_base.lds +++ /dev/null @@ -1,17 +0,0 @@ -/* - * The next free p_align'ed LMA base address - * - * p_align = 0x8000 - * - * Recap from ELF spec: p_align: Loadable process segments must have - * congruent values for p_vaddr and p_offset, modulo the page size. - * This member gives the value to which the segments are aligned in - * memory and in the file. Values 0 and 1 mean that no alignment is - * required. Otherwise, p_align should be a positive, integral power - * of 2, and p_addr should equal p_offset, modulo p_align. - * This essentially means next available address must be aligned at - * p_align, rather than the page_size, which one (well, I) would - * normally expect. - */ - -physical_base = 0x3000; diff --git a/tasks/test0/main.c b/tasks/test0/main.c index ac854c2..8da9f53 100644 --- a/tasks/test0/main.c +++ b/tasks/test0/main.c @@ -28,7 +28,7 @@ void main(void) wait_pager(0); /* Check mmap/munmap */ - mmaptest(); + // mmaptest(); /* Check shmget/shmat/shmdt */ shmtest(); diff --git a/tasks/test1/SConstruct b/tasks/test1/SConstruct index 7645731..5829ada 100644 --- a/tasks/test1/SConstruct +++ b/tasks/test1/SConstruct @@ -14,7 +14,7 @@ task_name = "test1" # The root directory of the repository where this file resides: project_root = "../.." tools_root = join(project_root, "tools") -prev_image = join(project_root, "tasks/mm0/mm0.axf") +prev_image = join(project_root, "tasks/test0/test0.axf") libs_path = join(project_root, "libs") ld_script = "include/linker.lds" physical_base_ld_script = "include/physical_base.lds" diff --git a/tasks/test1/include/.gitignore b/tasks/test1/include/.gitignore new file mode 100644 index 0000000..2c1b19d --- /dev/null +++ b/tasks/test1/include/.gitignore @@ -0,0 +1 @@ +physical_base.lds diff --git a/tasks/test1/include/physical_base.lds b/tasks/test1/include/physical_base.lds deleted file mode 100644 index 1c0860b..0000000 --- a/tasks/test1/include/physical_base.lds +++ /dev/null @@ -1,17 +0,0 @@ -/* - * The next free p_align'ed LMA base address - * - * p_align = 0x8000 - * - * Recap from ELF spec: p_align: Loadable process segments must have - * congruent values for p_vaddr and p_offset, modulo the page size. - * This member gives the value to which the segments are aligned in - * memory and in the file. Values 0 and 1 mean that no alignment is - * required. Otherwise, p_align should be a positive, integral power - * of 2, and p_addr should equal p_offset, modulo p_align. - * This essentially means next available address must be aligned at - * p_align, rather than the page_size, which one (well, I) would - * normally expect. - */ - -physical_base = 0x3000; diff --git a/tools/cml2-tools/cml.pyc b/tools/cml2-tools/cml.pyc deleted file mode 100644 index 9acc854..0000000 Binary files a/tools/cml2-tools/cml.pyc and /dev/null differ diff --git a/tools/cml2-tools/cmlconfigure.pyc b/tools/cml2-tools/cmlconfigure.pyc deleted file mode 100644 index 7f7058c..0000000 Binary files a/tools/cml2-tools/cmlconfigure.pyc and /dev/null differ diff --git a/tools/cml2-tools/cmlsystem.pyc b/tools/cml2-tools/cmlsystem.pyc deleted file mode 100644 index 646de99..0000000 Binary files a/tools/cml2-tools/cmlsystem.pyc and /dev/null differ diff --git a/tools/cml2header.pyc b/tools/cml2header.pyc index 4ae712b..f4272af 100644 Binary files a/tools/cml2header.pyc and b/tools/cml2header.pyc differ diff --git a/tools/pyelf/aistruct.pyc b/tools/pyelf/aistruct.pyc deleted file mode 100644 index 05be21f..0000000 Binary files a/tools/pyelf/aistruct.pyc and /dev/null differ diff --git a/tools/pyelf/elf.pyc b/tools/pyelf/elf.pyc deleted file mode 100644 index 7d0c732..0000000 Binary files a/tools/pyelf/elf.pyc and /dev/null differ diff --git a/tools/pyelf/readelf.py b/tools/pyelf/readelf.py index 6044dff..510e976 100755 --- a/tools/pyelf/readelf.py +++ b/tools/pyelf/readelf.py @@ -80,8 +80,14 @@ def main(): if image_name[-4] == ".": image_name = image_name[:-4] print image_name - print "image_start " + hex(paddr_start)[:-1] - print "image_end " + hex(paddr_end)[:-1] + if hex(paddr_start)[-1] == "L": + print "image_start " + hex(paddr_start)[:-1] + else: + print "image_start " + hex(paddr_start) + if hex(paddr_end)[-1] == "L": + print "image_end " + hex(paddr_end)[:-1] + else: + print "image_end " + hex(paddr_end) if options.ffpage: paddr_max = 0 @@ -112,8 +118,10 @@ def main(): paddr_aligned = paddr_max & ~(p_align.value - 1) if paddr_max & (p_align.value - 1): paddr_aligned += p_align.value - - print "physical_base = " + hex(paddr_aligned)[:-1] + ";" + if hex(paddr_aligned)[-1] == "L": + print "physical_base = " + hex(paddr_aligned)[:-1] + ";" + else: + print "physical_base = " + hex(paddr_aligned) + ";" if __name__ == "__main__":