Changeset 432 for soft/giet_vm/Makefile


Ignore:
Timestamp:
Oct 4, 2014, 4:33:31 PM (10 years ago)
Author:
alain
Message:

1) Introduce the "applications" directory.
2) Introduce the fixed format (X_WIDTH / Y_WIDTH / P_WIDTH) for processor index in all applications.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/Makefile

    r420 r432  
    165165        mcopy -o -i $(DISK_IMAGE) build/gameoflife/gameoflife.elf ::/build/gameoflife
    166166        mcopy -o -i $(DISK_IMAGE) build/dhrystone/dhrystone.elf ::/build/dhrystone
    167         mcopy -o -i $(DISK_IMAGE) transpose/images.raw ::/misc
    168         mcopy -o -i $(DISK_IMAGE) convol/philips_image.raw ::/misc
     167        mcopy -o -i $(DISK_IMAGE) applications/transpose/images.raw ::/misc
     168        mcopy -o -i $(DISK_IMAGE) applications/convol/philips_image.raw ::/misc
    169169        mcopy -o -i $(DISK_IMAGE) map.bin ::/
    170170### Copy bootloader into sector 2 of disk image
    … …  
    194194
    195195### mapping generation: map.bin / map.xml / hard_config.h / giet_vsegs.ld
    196 map.bin hard_config.h giet_vsegs.ld: $(ARCH)/arch.py  $(APP)/$(APP).py
     196map.bin hard_config.h giet_vsegs.ld: $(ARCH)/arch.py  applications/$(APP)/$(APP).py
    197197        giet_python/genmap --arch=$(ARCH)     \
    198198                           --x=$(X_SIZE)      \
    … …  
    436436########################################
    437437### display application compilation
    438 build/display/display.elf: $(DISPLAY_OBJS) display/display.ld hard_config.h
    439         $(LD) -o $@ -T display/display.ld $(DISPLAY_OBJS)
    440         $(DU) -D $@ > $@.txt
    441 
    442 build/display/main.o: display/main_cma.c
     438build/display/display.elf: $(DISPLAY_OBJS) applications/display/display.ld hard_config.h
     439        $(LD) -o $@ -T applications/display/display.ld $(DISPLAY_OBJS)
     440        $(DU) -D $@ > $@.txt
     441
     442build/display/main.o: applications/display/main_cma.c
    443443        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
    444444
    445445########################################
    446446### router compilation
    447 build/router/router.elf: $(ROUTER_OBJS) router/router.ld hard_config.h
    448         $(LD) -o $@ -T router/router.ld $(ROUTER_OBJS)
    449         $(DU) -D $@ > $@.txt
    450 
    451 build/router/main.o: router/main.c
     447build/router/router.elf: $(ROUTER_OBJS) applications/router/router.ld hard_config.h
     448        $(LD) -o $@ -T applications/router/router.ld $(ROUTER_OBJS)
     449        $(DU) -D $@ > $@.txt
     450
     451build/router/main.o: applications/router/main.c
    452452        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
    453453
    454454########################################
    455455### hello compilation
    456 build/hello/hello.elf: $(HELLO_OBJS) hello/hello.ld hard_config.h
    457         $(LD) -o $@ -T hello/hello.ld $(HELLO_OBJS)
    458         $(DU) -D $@ > $@.txt
    459 
    460 build/hello/main.o: hello/main.c
     456build/hello/hello.elf: $(HELLO_OBJS) applications/hello/hello.ld hard_config.h
     457        $(LD) -o $@ -T applications/hello/hello.ld $(HELLO_OBJS)
     458        $(DU) -D $@ > $@.txt
     459
     460build/hello/main.o: applications/hello/main.c
    461461        $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $<
    462462
    463463########################################
    464464### pgcd compilation
    465 build/pgcd/pgcd.elf: $(PGCD_OBJS) pgcd/pgcd.ld hard_config.h
    466         $(LD) -o $@ -T pgcd/pgcd.ld $(PGCD_OBJS)
    467         $(DU) -D $@ > $@.txt
    468 
    469 build/pgcd/main.o: pgcd/main.c
     465build/pgcd/pgcd.elf: $(PGCD_OBJS) applications/pgcd/pgcd.ld hard_config.h
     466        $(LD) -o $@ -T applications/pgcd/pgcd.ld $(PGCD_OBJS)
     467        $(DU) -D $@ > $@.txt
     468
     469build/pgcd/main.o: applications/pgcd/main.c
    470470        $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $<
    471471
    472472########################################
    473473### gameoflife compilation
    474 build/gameoflife/gameoflife.elf: $(GAMEOFLIFE_OBJS) gameoflife/gameoflife.ld
    475         $(LD) -o $@ -T gameoflife/gameoflife.ld $(GAMEOFLIFE_OBJS)
    476         $(DU) -D $@ > $@.txt
    477 
    478 build/gameoflife/main.o: gameoflife/main.c
     474build/gameoflife/gameoflife.elf: $(GAMEOFLIFE_OBJS) applications/gameoflife/gameoflife.ld
     475        $(LD) -o $@ -T applications/gameoflife/gameoflife.ld $(GAMEOFLIFE_OBJS)
     476        $(DU) -D $@ > $@.txt
     477
     478build/gameoflife/main.o: applications/gameoflife/main.c
    479479        $(CC) $(USER_INCLUDE) $(CFLAGS) -O3 -c -o $@ $<
    480480
    481481########################################
    482482### dhrystone compilation
    483 build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) dhrystone/dhrystone.ld hard_config.h
    484         $(LD) -o $@ -T dhrystone/dhrystone.ld $(DHRYSTONE_OBJS)
    485         $(DU) -D $@ > $@.txt
    486 
    487 build/dhrystone/dhry_1.o: dhrystone/dhry_1.c
     483build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) applications/dhrystone/dhrystone.ld hard_config.h
     484        $(LD) -o $@ -T applications/dhrystone/dhrystone.ld $(DHRYSTONE_OBJS)
     485        $(DU) -D $@ > $@.txt
     486
     487build/dhrystone/dhry_1.o: applications/dhrystone/dhry_1.c
    488488        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
    489489
    490 build/dhrystone/dhry_2.o: dhrystone/dhry_2.c
     490build/dhrystone/dhry_2.o: applications/dhrystone/dhry_2.c
    491491        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
    492492
    493493########################################
    494494### sort compilation
    495 build/sort/sort.elf: $(SORT_OBJS) sort/sort.ld hard_config.h
    496         $(LD) -o $@ -T sort/sort.ld $(SORT_OBJS)
    497         $(DU) -D $@ > $@.txt
    498 
    499 build/sort/main.o: sort/main.c
     495build/sort/sort.elf: $(SORT_OBJS) applications/sort/sort.ld hard_config.h
     496        $(LD) -o $@ -T applications/sort/sort.ld $(SORT_OBJS)
     497        $(DU) -D $@ > $@.txt
     498
     499build/sort/main.o: applications/sort/main.c
    500500        $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $<
    501501
    502502########################################
    503503### transpose compilation
    504 build/transpose/transpose.elf: $(TRANSPOSE_OBJS) transpose/transpose.ld hard_config.h
    505         $(LD) -o $@ -T transpose/transpose.ld $(TRANSPOSE_OBJS)
    506         $(DU) -D $@ > $@.txt
    507 
    508 build/transpose/main.o: transpose/main.c
     504build/transpose/transpose.elf: $(TRANSPOSE_OBJS) applications/transpose/transpose.ld hard_config.h
     505        $(LD) -o $@ -T applications/transpose/transpose.ld $(TRANSPOSE_OBJS)
     506        $(DU) -D $@ > $@.txt
     507
     508build/transpose/main.o: applications/transpose/main.c
    509509        $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $<
    510510
    511511########################################
    512512### convol compilation
    513 build/convol/convol.elf: $(CONVOL_OBJS) convol/convol.ld hard_config.h
    514         $(LD) -o $@ -T convol/convol.ld $(CONVOL_OBJS)
    515         $(DU) -D $@ > $@.txt
    516 
    517 build/convol/main.o: convol/main.c
     513build/convol/convol.elf: $(CONVOL_OBJS) applications/convol/convol.ld hard_config.h
     514        $(LD) -o $@ -T applications/convol/convol.ld $(CONVOL_OBJS)
     515        $(DU) -D $@ > $@.txt
     516
     517build/convol/main.o: applications/convol/main.c
    518518        $(CC) $(USER_INCLUDE) $(CFLAGS) -O0 -c -o $@ $<
    519519
Note: See TracChangeset for help on using the changeset viewer.