Mercurial > lcfOS
changeset 43:e47bfef80baf
Fixed build by commenting out initrd code
| author | windel |
|---|---|
| date | Sat, 18 Feb 2012 16:18:03 +0100 |
| parents | 980b2f14c9be |
| children | cbf199e007c2 |
| files | README cos/Makefile cos/kernel/initrd.c |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/README Fri Feb 03 18:01:18 2012 +0100 +++ b/README Sat Feb 18 16:18:03 2012 +0100 @@ -31,6 +31,11 @@ Running the OS with bochs: $ bochs -q +Running the OS with kvm: +$ kvm -fda bootdisk.img +or: +$ qemu-kvm -fda bootdisk.img + required tools: - bochs: for simulating the OS - mtools: for copying files to the bootdisk
--- a/cos/Makefile Fri Feb 03 18:01:18 2012 +0100 +++ b/cos/Makefile Sat Feb 18 16:18:03 2012 +0100 @@ -2,6 +2,7 @@ all: make -C kernel + make -C hello python utils/makeinitrd.py lcfosinitrd.img hello/hello.bin cp grub/emptybootdisk.img bootdisk.img mcopy -D o -i bootdisk.img kernel/lcfos.bin ::
--- a/cos/kernel/initrd.c Fri Feb 03 18:01:18 2012 +0100 +++ b/cos/kernel/initrd.c Sat Feb 18 16:18:03 2012 +0100 @@ -5,8 +5,9 @@ #include "kernel.h" // Global data struct: -initrd_file_header_t *files; +//initrd_file_header_t *files; +/* fs_node_t* initialize_initrd(uint64_t location) { uint32_t *u32ptr; @@ -39,10 +40,13 @@ return root; } +*/ + void load_ramdisk() { printf("Ramdisk location: %p\n", ramdisk_location); + /* fs_node_t *root = initialize_initrd(ramdisk_location); if (root != 0) @@ -54,8 +58,10 @@ printf("File %s\n", node->name); } } + */ } +/* static uint64_t initrd_read(fs_node_t *node, uint64_t offset, uint64_t size, void *buffer) { // TODO: check errors @@ -81,4 +87,5 @@ return 0; } } +*/