From b74c5c8fb4de3b2847bc942e57dcf8f0dea705be Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Wed, 13 May 2015 23:58:39 +0200 Subject: fixed libc and 'userspace' --- fs/elf.c | 3 ++- fs/fs.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'fs') diff --git a/fs/elf.c b/fs/elf.c index f5262dd..241b3ae 100644 --- a/fs/elf.c +++ b/fs/elf.c @@ -76,7 +76,8 @@ uint32_t load_elf(char *name, uint32_t *alloc) //TODO: load ELF binary and move this to own compilation unit //load binary - uint32_t vaddr=0x08048000; +// uint32_t vaddr=0x08048000; + uint32_t vaddr=0x08000000; log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"loading %s",name); ext2_check(EXT2_RAM_ADDRESS); diff --git a/fs/fs.h b/fs/fs.h index 0194093..fe35f3f 100644 --- a/fs/fs.h +++ b/fs/fs.h @@ -4,7 +4,7 @@ #include -#define EXT2_RAM_ADDRESS 0x120000 // here the bootloader puts our image +#define EXT2_RAM_ADDRESS 0x124000 // here the bootloader puts our image enum FS_FILE_TYPE{ -- cgit v1.2.3