Changeset aa72859 in mainline

Timestamp:

2005-11-22T18:44:55Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

db41406

Parents:

7453929

Message:

preparation for init task loading

Files:

• arch/ia32/include/boot/boot.h (modified) (1 diff)
• arch/ia32/include/boot/memmap.h (modified) (2 diffs)
• arch/ia32/include/boot/memmapasm.h (deleted)
• arch/ia32/src/boot/boot.S (modified) (2 diffs)
• arch/ia32/src/boot/memmap.S (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• contrib/conf/msim.conf (modified) (1 diff)
• generic/src/main/main.c (modified) (1 diff)

arch/ia32/include/boot/boot.h

@@ -34 +34 @@
 
 #define MULTIBOOT_HEADER_MAGIC  0x1BADB002
-#define MULTIBOOT_HEADER_FLAGS  0x00010003
+#define MULTIBOOT_HEADER_FLAGS  0x0001000B
 
 #define MULTIBOOT_LOADER_MAGIC  0x2BADB002

arch/ia32/include/boot/memmap.h

@@ -30 +30 @@
 #define __ia32_MEMMAP_H__
 
+/* E820h memory range types - other values*/
+        /* Free memory */
+#define MEMMAP_MEMORY_AVAILABLE 1
+        /* Not available for OS */
+#define MEMMAP_MEMORY_RESERVED  2 
+        /* OS may use it after reading ACPI table */
+#define MEMMAP_MEMORY_ACPI      3 
+        /* Unusable, required to be saved and restored across an NVS sleep */
+#define MEMMAP_MEMORY_NVS       4 
+        /* Corrupted memory */
+#define MEMMAP_MEMORY_UNUSABLE  5 
 
-#include <arch/boot/memmapasm.h>
+         /* size of one entry */
+#define MEMMAP_E820_RECORD_SIZE 20 
+        /* maximum entries */
+#define MEMMAP_E820_MAX_RECORDS 32 
+
+
+#ifndef __ASM__
+
 #include <arch/types.h>
 
@@ -47 +65 @@
 
 #endif
+
+#endif

arch/ia32/src/boot/boot.S

@@ -28 +28 @@
 
 #include <arch/boot/boot.h>
-#include <arch/boot/memmapasm.h>
+#include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/pm.h>
@@ -157 +157 @@
                 movl %ecx, e801memorysize
                 
+                bt $3, %eax                                                             # mbi->flags[3] (mods_count, mods_addr valid)   
+                jc mods_valid
+                        
+                        xorl %ecx, %ecx
+                        xorl %edx, %edx
+                        jmp mods_invalid
+                
+                mods_valid:
+                
+                mods_invalid:
+                movl %ecx, init_addr
+                movl %edx, init_size
+                
                 bt $6, %eax                                                             # mbi->flags[6] (mmap_length, mmap_addr valid)  
                 jc mmap_valid

arch/ia32/src/boot/memmap.S

@@ -28 +28 @@
 
 
-#include <arch/boot/memmapasm.h>
+#include <arch/boot/memmap.h>
 
 E820_SMAP = 0x534d4150

arch/mips32/Makefile.inc

@@ -42 +42 @@
 
 KERNEL_LOAD_ADDRESS = 0x80100000
+INIT_ADDRESS = 0x80110000
+INIT_SIZE = 65536
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
-DEFS += -DMACHINE=${MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS}
+DEFS += -DMACHINE=${MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Accepted MACHINEs

contrib/conf/msim.conf

@@ -8 +8 @@
 add rwm mainmem         0x00100000      16M     load "kernel.bin"
 add rom startmem        0x1fc00000      1k      load "load.bin" 
+add rwm init            0x00110000      64k     load "init"
 
 add dprinter printer 0x10000000

generic/src/main/main.c

@@ -85 +85 @@
 size_t hardcoded_kdata_size = 0;
 
+__address init_addr = 0;
+size_t init_size = 0;
+
 /*
  * Size of memory in bytes taken by kernel and heap.