Changeset 6c68b97 in mainline

Timestamp:

2005-12-15T18:17:59Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

961b5f0

Parents:

10c071e

Message:

ia32: floppy boot image uses GRUB

Files:

• arch/ia32/boot/Makefile (modified) (1 diff)
• arch/ia32/boot/boot.S (deleted)
• arch/ia32/boot/boot.ld (deleted)
• arch/ia32/boot/grub.img.gz (added)
• arch/ia32/src/boot/boot.S (modified) (1 diff)
• generic/include/config.h (modified) (1 diff)
• generic/src/main/main.c (modified) (2 diffs)

arch/ia32/boot/Makefile

@@ -1 +1 @@
 .PHONY: build clean
 
-build: boot.bin
-        dd if=boot.bin of=../../../image.bin bs=512 conv=sync
-        -cat ../../../kernel.bin >> ../../../image.bin
-        dd if=/dev/zero of=../../../image.bin bs=1 seek=1474559 count=1
-
-boot.bin: boot.o
-        $(LD) -T boot.ld -entry _start_0x7c00 --oformat binary boot.o -o $@
-
-boot.o: boot.S
-        $(CC) -E -DKERNEL_SIZE=$(KERNEL_SIZE) boot.S > boot.s
-        $(AS) boot.s -o $@
-        rm boot.s
+build: grub.img.gz
+        gunzip -c grub.img.gz > ../../../image.bin
+        e2cp ../../../kernel.bin ../../../image.bin:/boot/kernel.bin
 
 clean:
-        -rm -f boot.o boot.bin ../../../image.bin
+        -rm -f ../../../image.bin

arch/ia32/src/boot/boot.S

@@ -165 +165 @@
                 
                 mods_valid:
+                movl 20(%ebx), %ecx                                             # mbi->mods_count
+                cmpl $0, %ecx
+                je mods_invalid
+                
+                movl 24(%ebx), %esi                                             # mbi->mods_addr
+                movl 0(%esi), %edx                                              # mods->mod_start
+                movl 4(%esi), %ecx                                              # mods->mod_end
+                subl %edx, %ecx
                 
                 mods_invalid:
-                movl %ecx, init_addr
-                movl %edx, init_size
+                movl %ecx, init_size
+                movl %edx, init_addr
                 
                 bt $6, %eax                                                             # mbi->flags[6] (mmap_length, mmap_addr valid)  

generic/include/config.h

@@ -44 +44 @@
         size_t memory_size;
         size_t kernel_size;
+        
+        __address init_addr;
+        size_t init_size;
 
         count_t cpu_count;

generic/src/main/main.c

@@ -143 +143 @@
         config.base = hardcoded_load_address;
         config.memory_size = get_memory_size();
+        config.init_addr = init_addr;
+        config.init_size = init_size;
 
         heap_size = CONFIG_HEAP_SIZE + (config.memory_size/FRAME_SIZE)*sizeof(frame_t);
@@ -207 +209 @@
         task_init();
         thread_init();
+        
+        if (config.init_size > 0)
+                printf("config.init_addr=%X, config.init_size=%d\n", config.init_addr, config.init_size);
 
         /*