Changeset 94c05b89 in mainline for boot


Ignore:
Timestamp:
2017-07-12T15:02:49Z (8 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5772aa1
Parents:
f3504c1
Message:

use the .incbin directive instead of marshalling the data manually
(this is the fastest and also the most resource-conservative method)

Location:
boot
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    rf3504c1 r94c05b89  
    122122
    123123clean_dist:
    124         rm -f $(INITRD).img $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPS).o $(COMPS)_desc.o $(COMPS).zip $(LINK)
     124        rm -f $(INITRD).img $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE) $(COMPS).o $(COMPS)_desc.o $(COMPS).zip $(LINK)
    125125        find $(USPACE_PATH)/dist -mindepth 1 -maxdepth 1 -type f -exec rm \{\} \;
    126126        rm -f $(USPACE_PATH)/dist/srv/*

  • boot/Makefile.build

    rf3504c1 r94c05b89  
    145145        unzip -p $< $@ > $@
    146146
     147$(COMPONENTS_DEFLATE): $(COMPS).zip
     148        unzip -p $< $@ > $@
     149
    147150$(COMPS).zip: $(COMPONENTS)
    148151        $(MKARRAY) --deflate $(COMPS) $(COMP) "$(AS_PROLOG)" ".section .components, \"a\"" $^

  • boot/Makefile.common

    rf3504c1 r94c05b89  
    250250        $(INITRD).img
    251251
     252COMPONENTS_DEFLATE := $(addsuffix .deflate,$(notdir $(COMPONENTS)))
     253
    252254LINK = arch/$(BARCH)/_link.ld
    253255COMP = component

  • boot/arch/arm32/Makefile.inc

    rf3504c1 r94c05b89  
    107107        generic/src/inflate.c
    108108
    109 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c
     109PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

  • boot/arch/ia64/Makefile.inc

    rf3504c1 r94c05b89  
    8989        bus/isa
    9090
    91 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c
     91PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

  • boot/arch/mips32/Makefile.inc

    rf3504c1 r94c05b89  
    8787        generic/src/inflate.c
    8888
    89 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c
     89PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

  • boot/arch/ppc32/Makefile.inc

    rf3504c1 r94c05b89  
    7272        generic/src/inflate.c
    7373
    74 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c
     74PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

  • boot/arch/riscv64/Makefile.inc

    rf3504c1 r94c05b89  
    5050        generic/src/inflate.c
    5151
    52 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c
     52PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

  • boot/arch/sparc64/Makefile.inc

    rf3504c1 r94c05b89  
    7070        generic/src/inflate.c
    7171
    72 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c
     72PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)
Note: See TracChangeset for help on using the changeset viewer.