Changeset 339 for soft/giet_vm


Ignore:
Timestamp:
Jun 19, 2014, 1:38:45 PM (10 years ago)
Author:
alain
Message:

Cosmetic

File:
1 edited

Legend:

Unmodified
Added
Removed
  • soft/giet_vm/Makefile

    r327 r339  
    88
    99ARCH ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
    10 X    ?= 2
    11 Y    ?= 2
    12 P    ?= 2
    13 APP  ?= transpose
     10X    ?= 4
     11Y    ?= 4
     12P    ?= 4
     13APP  ?= convol
    1414
    1515.PHONY: map.bin
     
    111111TRANSPOSE_OBJS = build/transpose/main.o  \
    112112                 build/libs/stdio.o      \
    113                  build/libs/malloc.o     \
    114                  build/libs/spin_lock.o  \
    115113                 build/libs/barrier.o
     114
     115### Objects to be linked for convol.elf
     116CONVOL_OBJS  = build/convol/main.o   \
     117               build/libs/stdio.o    \
     118               build/libs/barrier.o
    116119
    117120CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32
     
    147150     build/sort/sort.elf             \
    148151     build/transpose/transpose.elf   \
     152     build/convol/convol.elf         \
    149153     $(DISK_IMAGE)                   
    150154         
     
    153157        mcopy -o -i $(DISK_IMAGE) build/sort/sort.elf ::/build/sort
    154158        mcopy -o -i $(DISK_IMAGE) build/transpose/transpose.elf ::/build/transpose
     159        mcopy -o -i $(DISK_IMAGE) build/convol/convol.elf ::/build/convol
    155160        mcopy -o -i $(DISK_IMAGE) build/hello/hello.elf ::/build/hello
    156161        mcopy -o -i $(DISK_IMAGE) build/pgcd/pgcd.elf ::/build/pgcd
     
    159164        mcopy -o -i $(DISK_IMAGE) build/dhrystone/dhrystone.elf ::/build/dhrystone
    160165        mcopy -o -i $(DISK_IMAGE) transpose/images.raw ::/misc
     166        mcopy -o -i $(DISK_IMAGE) convol/philips_image.raw ::/misc
    161167        mcopy -o -i $(DISK_IMAGE) map.bin ::/
    162168        dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
     
    172178        mmd -o -i $(DISK_IMAGE) ::/build/sort 
    173179        mmd -o -i $(DISK_IMAGE) ::/build/transpose
     180        mmd -o -i $(DISK_IMAGE) ::/build/convol
    174181        mmd -o -i $(DISK_IMAGE) ::/build/hello
    175182        mmd -o -i $(DISK_IMAGE) ::/build/pgcd 
     
    182189
    183190### mapping generation: map.bin / map.xml / hard_config.h / giet_vsegs.ld
    184 map.bin hard_config.h giet_vsegs.ld: $(ARCH)/genmap.py  $(APP)/$(APP).py
     191map.bin hard_config.h giet_vsegs.ld: $(ARCH)/arch.py  $(APP)/$(APP).py
    185192        giet_python/genmap --arch=$(ARCH) --x=$(X) --y=$(Y) --p=$(P) --giet=. --$(APP) --xml=.
    186193
     
    395402
    396403
    397 
    398 
    399404### display compilation
    400 build/display/display.elf: $(DISPLAY_OBJS) display/display.ld
     405build/display/display.elf: $(DISPLAY_OBJS) display/display.ld hard_config.h
    401406        $(LD) -o $@ -T display/display.ld $(DISPLAY_OBJS)
    402407        $(DU) -D $@ > $@.txt
     
    406411
    407412### router compilation
    408 build/router/router.elf: $(ROUTER_OBJS) router/router.ld
     413build/router/router.elf: $(ROUTER_OBJS) router/router.ld hard_config.h
    409414        $(LD) -o $@ -T router/router.ld $(ROUTER_OBJS)
    410415        $(DU) -D $@ > $@.txt
     
    414419
    415420### hello compilation
    416 build/hello/hello.elf: $(HELLO_OBJS) hello/hello.ld
     421build/hello/hello.elf: $(HELLO_OBJS) hello/hello.ld hard_config.h
    417422        $(LD) -o $@ -T hello/hello.ld $(HELLO_OBJS)
    418423        $(DU) -D $@ > $@.txt
     
    422427
    423428### pgcd compilation
    424 build/pgcd/pgcd.elf: $(PGCD_OBJS) pgcd/pgcd.ld
     429build/pgcd/pgcd.elf: $(PGCD_OBJS) pgcd/pgcd.ld hard_config.h
    425430        $(LD) -o $@ -T pgcd/pgcd.ld $(PGCD_OBJS)
    426431        $(DU) -D $@ > $@.txt
     
    438443
    439444### dhrystone compilation
    440 build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) dhrystone/dhrystone.ld
     445build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) dhrystone/dhrystone.ld hard_config.h
    441446        $(LD) -o $@ -T dhrystone/dhrystone.ld $(DHRYSTONE_OBJS)
    442447        $(DU) -D $@ > $@.txt
     
    449454
    450455### sort compilation
    451 build/sort/sort.elf: $(SORT_OBJS) sort/sort.ld
     456build/sort/sort.elf: $(SORT_OBJS) sort/sort.ld hard_config.h
    452457        $(LD) -o $@ -T sort/sort.ld $(SORT_OBJS)
    453458        $(DU) -D $@ > $@.txt
     
    457462
    458463### transpose compilation
    459 build/transpose/transpose.elf: $(TRANSPOSE_OBJS) transpose/transpose.ld
     464build/transpose/transpose.elf: $(TRANSPOSE_OBJS) transpose/transpose.ld hard_config.h
    460465        $(LD) -o $@ -T transpose/transpose.ld $(TRANSPOSE_OBJS)
    461466        $(DU) -D $@ > $@.txt
     
    463468build/transpose/main.o: transpose/main.c
    464469        $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $<
     470
     471### convol compilation
     472build/convol/convol.elf: $(CONVOL_OBJS) convol/convol.ld hard_config.h
     473        $(LD) -o $@ -T convol/convol.ld $(CONVOL_OBJS)
     474        $(DU) -D $@ > $@.txt
     475
     476build/convol/main.o: convol/main.c
     477        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
    465478
    466479### clean
     
    483496        rm -rf build/sort/*
    484497        rm -rf build/transpose/*
     498        rm -rf build/convol/*
    485499        rm -rf hdd/virt_hdd.dmg
Note: See TracChangeset for help on using the changeset viewer.