diff options
| -rw-r--r-- | kernel/mem.c | 2 | ||||
| -rw-r--r-- | userspace/Makefile | 5 | ||||
| -rw-r--r-- | userspace/shell.c (renamed from userspace/foolshell.c) | 0 | ||||
| -rw-r--r-- | userspace/sys/crt0.S (renamed from userspace/crt0.S) | 0 | ||||
| -rw-r--r-- | userspace/sys/oldlinker.ld (renamed from userspace/linker.ld) | 0 | ||||
| -rw-r--r-- | userspace/sys/sys.c (renamed from userspace/sys.c) | 0 | ||||
| -rw-r--r-- | userspace/sys/syscalls.c (renamed from userspace/syscalls.c) | 0 |
7 files changed, 2 insertions, 5 deletions
diff --git a/kernel/mem.c b/kernel/mem.c index 9583246..5d3a300 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -224,7 +224,7 @@ void mem_init(uint16_t *memmap,uint16_t entries) } // here is somewhere our kernel stuff ;) // TODO!! better. - pmmngr_deinit_region(0x0,0x150000); + pmmngr_deinit_region(0x0,0x30000); // and here is the memory map that we JUST created! pmmngr_deinit_region(_mmngr_memory_map,mem_array_size*4); diff --git a/userspace/Makefile b/userspace/Makefile index ad2ae1e..29f6c7b 100644 --- a/userspace/Makefile +++ b/userspace/Makefile @@ -3,10 +3,7 @@ CC=i686-foolos-gcc LD=i686-foolos-ld -CFLAGS=-I.. -I/home/miguel/temp/fool-os-stuff/newlib-2.1.0/newlib/libc/include -CFLAGS+=--no-builtin-malloc -CFLAGS+=--no-builtin-free -LDFLAGS=-L/home/miguel/temp/fool-os-stuff/newlib-build-clean-new/i686-elf/newlib +PROGS=shell simple brainfuck add ext2.img: shell simple brainfuck add dd if=/dev/zero of=ext2.img bs=512 count=3500 diff --git a/userspace/foolshell.c b/userspace/shell.c index 36912c8..36912c8 100644 --- a/userspace/foolshell.c +++ b/userspace/shell.c diff --git a/userspace/crt0.S b/userspace/sys/crt0.S index 48eadd9..48eadd9 100644 --- a/userspace/crt0.S +++ b/userspace/sys/crt0.S diff --git a/userspace/linker.ld b/userspace/sys/oldlinker.ld index 4eee8eb..4eee8eb 100644 --- a/userspace/linker.ld +++ b/userspace/sys/oldlinker.ld diff --git a/userspace/sys.c b/userspace/sys/sys.c index 7dcfaee..7dcfaee 100644 --- a/userspace/sys.c +++ b/userspace/sys/sys.c diff --git a/userspace/syscalls.c b/userspace/sys/syscalls.c index 51436fb..51436fb 100644 --- a/userspace/syscalls.c +++ b/userspace/sys/syscalls.c |