Merge ELF loader.

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 25522e26c7cdffe8a14945a0066ad247f9454554..03e2143ba7d6970a8ab967f9ee33fd0f4024ac0b 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -38,7 +38,8 @@ void c_start(unsigned int magic, struct mb_info *wee)
        puts("Grubptr is: ");
        puthex(*grubptr);
        puts("\n");
-       
+
+
        for (i = 0; i < wee->mod_cnt; i++)
        {
                puts("Module:\n");
@@ -47,7 +48,15 @@ void c_start(unsigned int magic, struct mb_info *wee)
                puts("  Name: "); puts(wee->mods[i].mod_string); puts("\n");
        }
 
+       if ((wee->mod_cnt != 1) || (strcmp(wee->mods[0].mod_string, "aseg.elf")))
+       {
+               puts("Expected 1 module called aseg.elf.\n");
+               while(1) asm("hlt");
+       }
+
+       load_elf(wee->mods[0].mod_start, wee->mods[0].mod_end - wee->mods[0].mod_start);
+
        puts("Now returning to real mode.\n");  
        memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
-       realmode();
+       realmode();     // goodbye!
 }