Changeset 31d9300 in mainline


Ignore:
Timestamp:
2006-06-18T21:38:15Z (19 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9334b93
Parents:
5c82957
Message:

mips32 binary format choice

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • arch/mips32/Makefile.inc

    r5c82957 r31d9300  
    3030
    3131image.boot: kernel uspace
    32         make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     32        make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(CONFIG_IMAGE)
    3333        cp arch/$(ARCH)/loader/image.boot image.boot
    3434

  • arch/mips32/loader/Makefile

    r5c82957 r31d9300  
    8787
    8888_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
    89         ./pack $(OBJCOPY) $(COMPONENTS)
     89        ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
    9090
    9191%.o: %.S

  • arch/mips32/loader/pack

    r5c82957 r31d9300  
    3131[ "$#" -lt 1 ] && exit 1
    3232
    33 OBJCOPY="$1"
     33case "$1" in
     34        "mips")
     35                BFD="binary"
     36                ;;
     37        "ecoff")
     38                BFD="ecoff-littlemips"
     39                ;;
     40        *)
     41                echo "Undefined image format" >&1
     42                exit 1
     43                ;;
     44esac
     45
     46OBJCOPY="$2"
    3447LINK="_link.ld"
    3548HEADER="_components.h"
    3649
    37 shift
     50shift 2
    3851
    39 echo 'OUTPUT_FORMAT("binary")
     52echo "OUTPUT_FORMAT(\"${BFD}\")
    4053ENTRY(start)
    4154
    … …  
    5467                *(.bss);                /* uninitialized static variables */   
    5568                *(COMMON);              /* global variables */
    56                 *(.reginfo);' > "$LINK"
     69                *(.reginfo);" > "$LINK"
    5770
    5871echo '#ifndef ___COMPONENTS_H__

  • boot.config

    r5c82957 r31d9300  
    1717% [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER
    1818
    19 # Debug bootloader
    20 ! [ARCH=ppc32] CONFIG_DEBUG (n/y)
    21 
    22 # Use Block Address Translation
    23 ! [ARCH=ppc32] CONFIG_BAT (y/n)
    24 
    2519# PPC64 Compiler
    2620@ "cross" Cross-compiler
    … …  
    3428! [ARCH=mips32] MIPS32_COMPILER (choice)
    3529% [ARCH=mips32] SAVEAS MIPS32_COMPILER COMPILER
     30
     31# Debug bootloader
     32! [ARCH=ppc32] CONFIG_DEBUG (n/y)
     33
     34# Use Block Address Translation
     35! [ARCH=ppc32] CONFIG_BAT (y/n)
     36
     37# Target image
     38@ "binary" Binary image (MSIM)
     39@ "ecoff" Ecoff image (GXEmul)
     40! [ARCH=mips32] CONFIG_IMAGE (choice)
Note: See TracChangeset for help on using the changeset viewer.