Changeset 656b789 in mainline for boot

Timestamp:

2009-03-16T22:58:11Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

be6038b

Parents:

f36c061

Message:

resurrect big endian support for mips32: switch from mips-sgi-irix5 toolchain to mips-linux-gnu
the kernel is working alright, the user space has some bugs yet

Location:

boot/arch/mips32/loader

Files:

• Makefile (modified) (5 diffs)
• _link.ld.in (moved) (moved from boot/arch/mips32/loader/_link.ld.in.binary ) (2 diffs)
• _link.ld.in.ecoff (deleted)

boot/arch/mips32/loader/Makefile

@@ -37 +37 @@
 endif
 
-ifeq ($(IMAGE),binary)
-        LD_IN = binary
-endif
-
-ifeq ($(IMAGE),ecoff)
-        LD_IN = ecoff
-endif
-
-BFD_NAME = elf32-tradlittlemips
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
+
+ifeq ($(MACHINE),lgxemul)
+        BFD_NAME = elf32-tradlittlemips
+        BFD = ecoff-littlemips
+endif
+ifeq ($(MACHINE),bgxemul)
+        BFD_NAME = elf32-tradbigmips
+        BFD = ecoff-bigmips
+        TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
+        TARGET = mips-linux-gnu
+endif
+ifeq ($(MACHINE),msim)
+        BFD_NAME = elf32-tradlittlemips
+        BFD = binary
+endif
 
 ifeq ($(COMPILER),gcc_native)
@@ -84 +90 @@
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs 
+        $(USPACEDIR)/srv/vfs/vfs
 ifeq ($(RDFMT),tmpfs)
         COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
@@ -115 +121 @@
 -include Makefile.depend
 
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
-        $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
+image.boot: image.raw
+        $(OBJCOPY) -O $(BFD) $< $@
+
+image.raw: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+        $(LD) -no-check-sections -N -T _link.ld -o $@ $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
 
 depend:
@@ -128 +137 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
+        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.raw image.boot Makefile.depend
 
 _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
@@ -147 +156 @@
         ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned int" $(COMPONENTS) ./initrd.img
 
-_link.ld.in: _link.ld.in.$(LD_IN)
-        cp $< $@
-
 %.o: %.S
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

boot/arch/mips32/loader/_link.ld.in

@@ -1 @@
-OUTPUT_FORMAT("binary") 
-ENTRY(start) 
- 
+ENTRY(start)
+
 SECTIONS {
         .boot 0xbfc00000: AT (0) {
@@ -9 +8 @@
                 *(.rodata);
                 *(.rodata.*);
-                *(.data);               /* initialized data */
+                *(.data);       /* initialized data */
                 *(.sdata);
                 *(.sdata2);
                 *(.sbss);
                 *(.scommon);
-                *(.bss);                /* uninitialized static variables */    
-                *(COMMON);              /* global variables */
+                *(.bss);        /* uninitialized static variables */
+                *(COMMON);      /* global variables */
                 *(.reginfo);
 [[COMPONENTS]]