Changeset e19d667 in mainline


Ignore:
Timestamp:
2008-05-29T15:26:41Z (17 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
136edca
Parents:
33c058d3
Message:

unify pack script

Location:
boot
Files:
4 added
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/mips32/loader/Makefile

    r33c058d3 re19d667  
    3333#
    3434
     35ifeq ($(IMAGE),binary)
     36        BFD = binary
     37endif
     38ifeq ($(IMAGE),ecoff)
     39        BFD = ecoff-littlemips
     40endif
     41BFD_NAME = elf32-tradlittlemips
     42BFD_ARCH = mips
    3543TARGET = mipsel-linux-gnu
    3644TOOLCHAIN_DIR = /usr/local/mipsel/bin
    … …  
    7381        main.c \
    7482        msim.c \
     83        _components.c \
    7584        ../../../generic/printf.c \
    7685        asm.S \
    … …  
    108117
    109118clean:
    110         -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
     119        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
    111120
    112 _components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
    113         ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
     121_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
     122        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
    114123
    115124%.o: %.S

  • boot/arch/mips32/loader/main.c

    r33c058d3 re19d667  
    6060       
    6161        component_t components[COMPONENTS];
     62        init_components(components);
     63       
    6264        bootinfo_t bootinfo;
    63         init_components(components);
    6465       
    6566        printf("\nMemory statistics\n");

  • boot/arch/ppc32/loader/Makefile

    r33c058d3 re19d667  
    3333#
    3434
     35BFD = elf32-powerpc
     36BFD_NAME = elf32-powerpc
     37BFD_ARCH = powerpc:common
    3538TARGET = ppc-linux-gnu
    3639TOOLCHAIN_DIR = /usr/local/ppc/bin
    … …  
    7376        main.c \
    7477        ofwarch.c \
     78        _components.c \
    7579        ../../../genarch/ofw.c \
    7680        ../../../generic/printf.c \
    … …  
    109113
    110114clean:
    111         -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
     115        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
    112116
    113 _components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
    114         ./pack $(OBJCOPY) $(COMPONENTS)
     117_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
     118        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
    115119
    116120%.o: %.S

  • boot/arch/ppc32/loader/main.c

    r33c058d3 re19d667  
    9797        version_print();
    9898       
    99         init_components();
    100        
     99        component_t components[COMPONENTS];
     100        init_components(components);
     101               
    101102        unsigned int i;
    102        
    103103        for (i = 0; i < COMPONENTS; i++)
    104104                check_align(components[i].start, components[i].name);

  • boot/arch/ppc64/loader/Makefile

    r33c058d3 re19d667  
    3333#
    3434
     35BFD = elf64-powerpc
     36BFD_NAME = elf64-powerpc
     37BFD_ARCH = powerpc:common64
    3538TARGET = ppc64-linux-gnu
    3639TOOLCHAIN_DIR = /usr/local/ppc64/bin
    … …  
    7376        main.c \
    7477        ofwarch.c \
     78        _components.c \
    7579        ../../../genarch/ofw.c \
    7680        ../../../generic/printf.c \
    … …  
    109113
    110114clean:
    111         -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
     115        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
    112116
    113 _components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
    114         ./pack $(OBJCOPY) $(COMPONENTS)
     117_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
     118        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
    115119
    116120%.o: %.S

  • boot/arch/ppc64/loader/main.c

    r33c058d3 re19d667  
    9797        version_print();
    9898       
    99         init_components();
    100        
     99        component_t components[COMPONENTS];
     100        init_components(components);
     101               
    101102        unsigned int i;
    102103       
Note: See TracChangeset for help on using the changeset viewer.