diff --git a/loader/SConscript b/loader/SConscript index 8c2a276..2890ff5 100644 --- a/loader/SConscript +++ b/loader/SConscript @@ -65,11 +65,29 @@ def createKernelSFile(target, source, env): .incbin "%s" ''' % (os.path.splitext(image.name)[0], image.path)) +def createMainC(target, source, env): + with open(source[0].path) as inFile: + with open(target[0].path, 'w') as outFile: + externs = '' + declarations = '' + loads = '' + for item in source[1:]: + name = os.path.splitext(item.name)[0] + if name == 'start' : name = 'kernel' + externs += 'extern char _start_%s[];\nextern char _end_%s[];\n' % (name, name) + declarations += 'void *%s_entry = NULL;\n' % (name,) + loads += 'printf("Loading the %s...\\n");\nload_image(&%s_entry, _start_%s, _end_%s);\n' %(name, name, name, name) + text = inFile.read() + text = text.replace('__EXTERNAL_SYMBOLS_EDIT_MARKER__', externs) + text = text.replace('__DECLARATIONS_EDIT_MARKER__', declarations) + text = text.replace('__LOAD_STATEMENTS_EDIT_MARKER__', loads) + outFile.write(text) + startAxfS = Command('start.axf.S', images[0], ksymToLds) - kernelS = Command('kernel.S', images + [startAxfS], createKernelSFile) +mainC = Command('main.c', ['main.c.in'] + images, createMainC) -objects = environment.Object(Glob('*.c') + [kernelS, startAxfS]) +objects = environment.Object(Glob('*.c') + [kernelS, startAxfS, mainC]) Depends(objects, environment['configFiles']) Depends(objects, images) program = environment.Program('final', objects + [environment['baremetal_crt0']]) diff --git a/loader/main.c b/loader/main.c.in similarity index 91% rename from loader/main.c rename to loader/main.c.in index 91f4425..2c6ac01 100644 --- a/loader/main.c +++ b/loader/main.c.in @@ -95,17 +95,10 @@ * Extern symbols * *****************/ -/* These symbols are defined by the linker scripts. */ -extern char _start_kernel[]; -extern char _end_kernel[]; -extern char _start_mm0[]; -extern char _end_mm0[]; -extern char _start_fs0[]; -extern char _end_fs0[]; -extern char _start_test0[]; -extern char _end_test0[]; -extern char _start_bootdesc[]; -extern char _end_bootdesc[]; +/* Variable declarations added here for symbols defined by the linker scripts. */ + +__EXTERNAL_SYMBOLS_EDIT_MARKER__ + /* This is a kernel symbol exported to loader's linker script from kernel build */ extern char bkpt_phys_to_virt[]; @@ -118,29 +111,17 @@ static void load_image(void **entry, char *start, char *end); int main(void) { - void *kernel_entry = NULL; - void *mm0_entry = NULL; - void *fs0_entry = NULL; - void *test0_entry = NULL; - void *bootdesc_entry = NULL; + /* Declarations added here.*/ + + __DECLARATIONS_EDIT_MARKER__ + arch_init(); printf("elf-loader:\tStarted\n"); - printf("Loading the kernel...\n"); - load_image(&kernel_entry, _start_kernel, _end_kernel); + /* Loader statements added here. */ - printf("Loading the bootdesc\n"); - load_image(&bootdesc_entry, _start_bootdesc, _end_bootdesc); - - printf("Loading mm0\n"); - load_image(&mm0_entry, _start_mm0, _end_mm0); - - printf("Loading fs0\n"); - load_image(&fs0_entry, _start_fs0, _end_fs0); - - printf("Loading test0\n"); - load_image(&test0_entry, _start_test0, _end_test0); + __LOAD_STATEMENTS_EDIT_MARKER__ printf("elf-loader:\tkernel entry point is %p\n", kernel_entry); arch_start_kernel(kernel_entry);