Changeset 339

Timestamp:

Jun 19, 2014, 1:38:45 PM (10 years ago)

Author:

alain

Message:

Cosmetic

File:

• soft/giet_vm/Makefile (modified) (16 diffs)

soft/giet_vm/Makefile

@@ -8 +8 @@
 
 ARCH ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X    ?= 2
-Y    ?= 2
-P    ?= 2
-APP  ?= transpose
+X    ?= 4
+Y    ?= 4
+P    ?= 4
+APP  ?= convol
 
 .PHONY: map.bin
@@ -111 +111 @@
 TRANSPOSE_OBJS = build/transpose/main.o  \
                  build/libs/stdio.o      \
-                 build/libs/malloc.o     \
-                 build/libs/spin_lock.o  \
                  build/libs/barrier.o
+
+### Objects to be linked for convol.elf
+CONVOL_OBJS  = build/convol/main.o   \
+               build/libs/stdio.o    \
+               build/libs/barrier.o
 
 CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32
@@ -147 +150 @@
      build/sort/sort.elf             \
      build/transpose/transpose.elf   \
+     build/convol/convol.elf         \
      $(DISK_IMAGE)                   
          
@@ -153 +157 @@
         mcopy -o -i $(DISK_IMAGE) build/sort/sort.elf ::/build/sort
         mcopy -o -i $(DISK_IMAGE) build/transpose/transpose.elf ::/build/transpose
+        mcopy -o -i $(DISK_IMAGE) build/convol/convol.elf ::/build/convol
         mcopy -o -i $(DISK_IMAGE) build/hello/hello.elf ::/build/hello
         mcopy -o -i $(DISK_IMAGE) build/pgcd/pgcd.elf ::/build/pgcd
@@ -159 +164 @@
         mcopy -o -i $(DISK_IMAGE) build/dhrystone/dhrystone.elf ::/build/dhrystone
         mcopy -o -i $(DISK_IMAGE) transpose/images.raw ::/misc
+        mcopy -o -i $(DISK_IMAGE) convol/philips_image.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) map.bin ::/
         dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
@@ -172 +178 @@
         mmd -o -i $(DISK_IMAGE) ::/build/sort  
         mmd -o -i $(DISK_IMAGE) ::/build/transpose
+        mmd -o -i $(DISK_IMAGE) ::/build/convol
         mmd -o -i $(DISK_IMAGE) ::/build/hello 
         mmd -o -i $(DISK_IMAGE) ::/build/pgcd  
@@ -182 +189 @@
 
 ### mapping generation: map.bin / map.xml / hard_config.h / giet_vsegs.ld
-map.bin hard_config.h giet_vsegs.ld: $(ARCH)/genmap.py  $(APP)/$(APP).py
+map.bin hard_config.h giet_vsegs.ld: $(ARCH)/arch.py  $(APP)/$(APP).py
         giet_python/genmap --arch=$(ARCH) --x=$(X) --y=$(Y) --p=$(P) --giet=. --$(APP) --xml=.
 
@@ -395 +402 @@
 
 
-
-
 ### display compilation
-build/display/display.elf: $(DISPLAY_OBJS) display/display.ld
+build/display/display.elf: $(DISPLAY_OBJS) display/display.ld hard_config.h
         $(LD) -o $@ -T display/display.ld $(DISPLAY_OBJS)
         $(DU) -D $@ > $@.txt
@@ -406 +411 @@
 
 ### router compilation
-build/router/router.elf: $(ROUTER_OBJS) router/router.ld
+build/router/router.elf: $(ROUTER_OBJS) router/router.ld hard_config.h
         $(LD) -o $@ -T router/router.ld $(ROUTER_OBJS)
         $(DU) -D $@ > $@.txt
@@ -414 +419 @@
 
 ### hello compilation
-build/hello/hello.elf: $(HELLO_OBJS) hello/hello.ld
+build/hello/hello.elf: $(HELLO_OBJS) hello/hello.ld hard_config.h
         $(LD) -o $@ -T hello/hello.ld $(HELLO_OBJS)
         $(DU) -D $@ > $@.txt
@@ -422 +427 @@
 
 ### pgcd compilation
-build/pgcd/pgcd.elf: $(PGCD_OBJS) pgcd/pgcd.ld
+build/pgcd/pgcd.elf: $(PGCD_OBJS) pgcd/pgcd.ld hard_config.h
         $(LD) -o $@ -T pgcd/pgcd.ld $(PGCD_OBJS)
         $(DU) -D $@ > $@.txt
@@ -438 +443 @@
 
 ### dhrystone compilation
-build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) dhrystone/dhrystone.ld
+build/dhrystone/dhrystone.elf: $(DHRYSTONE_OBJS) dhrystone/dhrystone.ld hard_config.h
         $(LD) -o $@ -T dhrystone/dhrystone.ld $(DHRYSTONE_OBJS)
         $(DU) -D $@ > $@.txt
@@ -449 +454 @@
 
 ### sort compilation
-build/sort/sort.elf: $(SORT_OBJS) sort/sort.ld 
+build/sort/sort.elf: $(SORT_OBJS) sort/sort.ld hard_config.h 
         $(LD) -o $@ -T sort/sort.ld $(SORT_OBJS)
         $(DU) -D $@ > $@.txt
@@ -457 +462 @@
 
 ### transpose compilation
-build/transpose/transpose.elf: $(TRANSPOSE_OBJS) transpose/transpose.ld 
+build/transpose/transpose.elf: $(TRANSPOSE_OBJS) transpose/transpose.ld hard_config.h
         $(LD) -o $@ -T transpose/transpose.ld $(TRANSPOSE_OBJS)
         $(DU) -D $@ > $@.txt
@@ -463 +468 @@
 build/transpose/main.o: transpose/main.c
         $(CC) $(USER_INCLUDE) $(CFLAGS) -c -o $@ $<
+
+### convol compilation
+build/convol/convol.elf: $(CONVOL_OBJS) convol/convol.ld hard_config.h
+        $(LD) -o $@ -T convol/convol.ld $(CONVOL_OBJS)
+        $(DU) -D $@ > $@.txt
+
+build/convol/main.o: convol/main.c
+        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
 ### clean 
@@ -483 +496 @@
         rm -rf build/sort/*
         rm -rf build/transpose/*
+        rm -rf build/convol/*
         rm -rf hdd/virt_hdd.dmg