Changeset 4872160 in mainline for boot/arch/mips32

Timestamp:

2010-05-04T10:44:55Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

568db0f

Parents:

bb252ca

Message:

new boot infrastructure

• more code and metadata unification
• import of up-to-date implementations from the kernel
• the boot loaders should behave more similarly on all platforms
• support for deflate compressed (LZ77) boot components
  • this again allows feasible boot images to be created on mips32
• IA64 is still not booting
  • the broken forked GNU EFI library has been removed, a replacement of the functionality is on its way

Location:

boot/arch/mips32

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (added)
• include/arch.h (moved) (moved from boot/arch/sparc64/loader/asm.h ) (2 diffs)
• include/asm.h (moved) (moved from boot/arch/mips32/loader/asm.h ) (1 diff)
• include/main.h (moved) (moved from boot/arch/ia64/loader/main.h ) (1 diff)
• include/regname.h (moved) (moved from boot/arch/mips32/loader/regname.h ) (1 diff)
• include/types.h (added)
• loader/asm.S (deleted)
• loader/main.c (deleted)
• loader/main.h (deleted)
• src/Makefile (moved) (moved from boot/arch/mips32/loader/Makefile )
• src/Makefile.build (moved) (moved from boot/arch/mips32/loader/Makefile.build )
• src/Makefile.common (moved) (moved from boot/arch/mips32/loader/Makefile.common )
• src/Makefile.toolchain (moved) (moved from boot/arch/mips32/loader/Makefile.toolchain )
• src/asm.S (added)
• src/boot.S (moved) (moved from boot/arch/mips32/loader/boot.S )
• src/main.c (added)
• src/msim.h (moved) (moved from boot/arch/mips32/loader/msim.h )
• src/putchar.c (added)

boot/arch/mips32/Makefile.inc

@@ -27 +27 @@
 #
 
-include Makefile.common
+BFD_ARCH = mips
+BITS = 32
+PAGE_SIZE = 16384
+EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
 
-build: $(BASE)/image.boot
+RD_SRVS += \
+        $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
 
-$(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
-        $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
-        cp arch/$(BARCH)/loader/image.boot $@
+ifeq ($(MACHINE),lgxemul)
+        BFD_NAME = elf32-tradlittlemips
+        BFD_OUTPUT = ecoff-littlemips
+        ENDIANESS = LE
+endif
+ifeq ($(MACHINE),bgxemul)
+        BFD_NAME = elf32-tradbigmips
+        BFD_OUTPUT = ecoff-bigmips
+        ENDIANESS = BE
+endif
+ifeq ($(MACHINE),msim)
+        BFD_NAME = elf32-tradlittlemips
+        BFD_OUTPUT = binary
+        ENDIANESS = LE
+        EXTRA_GCC_CFLAGS = -mhard-float
+endif
 
-clean:
-        $(MAKE) -C arch/$(BARCH)/loader clean
-        rm -f $(BASE)/image.boot
+SOURCES = \
+        arch/$(BARCH)/src/asm.S \
+        arch/$(BARCH)/src/main.c \
+        arch/$(BARCH)/src/putchar.c \
+        $(COMPS_C) \
+        genarch/src/division.c \
+        genarch/src/multiplication.c \
+        generic/src/printf_core.c \
+        generic/src/vprintf.c \
+        generic/src/printf.c \
+        generic/src/str.c \
+        generic/src/version.c \
+        generic/src/inflate.c

boot/arch/mips32/include/arch.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
- * Copyright (c) 2006 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-#ifndef BOOT_sparc64_ASM_H_
-#define BOOT_sparc64_ASM_H_
-
-#include "types.h"
-#include "main.h"
+#ifndef BOOT_mips32_ARCH_H_
+#define BOOT_mips32_ARCH_H_
 
 #define PAGE_WIDTH  14
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define CPUMAP_OFFSET    0x00001000
+#define STACK_OFFSET     0x00002000
+#define BOOTINFO_OFFSET  0x00003000
+#define BOOT_OFFSET      0x00100000
+#define LOADER_OFFSET    0x1fc00000
 
-extern void halt(void);
-extern void jump_to_kernel(void *entry, uint64_t cfg, bootinfo_t *bootinfo,
-    unsigned int bootinfo_size, uint8_t subarchitecture) __attribute__((noreturn));
+#define MSIM_VIDEORAM_ADDRESS  0xb0000000
+#define MSIM_DORDER_ADDRESS    0xb0000004
+
+#ifndef __ASM__
+        #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
+        #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
+#else
+        #define PA2KA(addr)    ((addr) + 0x80000000)
+        #define KSEG2PA(addr)  ((addr) - 0xa0000000)
+#endif
 
 #endif

boot/arch/mips32/include/asm.h

@@ -30 +30 @@
 #define BOOT_mips32_ASM_H_
 
-#define PAGE_SIZE   16384
-#define PAGE_WIDTH  14
-
-void jump_to_kernel(void *entry, void *bootinfo) __attribute__((noreturn));
+extern void jump_to_kernel(void *, void *) __attribute__((noreturn));
 
 #endif

boot/arch/mips32/include/main.h

@@ -27 +27 @@
  */
 
-#ifndef BOOT_ia64_MAIN_H_
-#define BOOT_ia64_MAIN_H_
+#ifndef BOOT_mips32_MAIN_H_
+#define BOOT_mips32_MAIN_H_
 
-#include <types.h>
-#include <../../../../kernel/arch/ia64/include/bootinfo.h> 
-
-
-#define CONFIG_INIT_TASKS  32
-
-extern void start(void);
 extern void bootstrap(void);
 

boot/arch/mips32/include/regname.h

@@ -63 +63 @@
 #define ra      31
 
-#define rindex          0
-#define rrandom         1
-#define entrylo0        2
-#define entrylo1        3
-#define context         4
-#define pagemask        5
-#define wired           6
-#define badvaddr        8
-#define count           9
-#define entryhi         10
-#define compare         11
-#define status          12
-#define cause           13
-#define epc             14
-#define rconfig         16
-#define lladdr          17
-#define watchlo         18
-#define watchhi         19
-#define xcontext        20
-#define rdebug          23
-#define depc            24
-#define eepc            30
+#define rindex    0
+#define rrandom   1
+#define entrylo0  2
+#define entrylo1  3
+#define context   4
+#define pagemask  5
+#define wired     6
+#define badvaddr  8
+#define count     9
+#define entryhi   10
+#define compare   11
+#define status    12
+#define cause     13
+#define epc       14
+#define rconfig   16
+#define lladdr    17
+#define watchlo   18
+#define watchhi   19
+#define xcontext  20
+#define rdebug    23
+#define depc      24
+#define eepc      30
 
-#endif /* _REGNAME_H_ */
+#endif