Changeset 589 for soft/giet_vm/applications/router

Timestamp:

Jul 8, 2015, 3:57:15 PM (9 years ago)

Author:

alain

Message:

Modify all applications to support two new rules:
1) introduce a local Makefile for each application.
2) change "application.elf" name to "application/appli.elf" name in the application.py" file.
Introduce the shell application.

Location:

soft/giet_vm/applications/router

Files:

• Makefile (modified) (1 diff)
• router.py (modified) (4 diffs)

soft/giet_vm/applications/router/Makefile

@@ -1 @@
-APP_NAME=router
 
-USE+= stdio.o
-USE+= mwmr_channel.o
-
-USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
+APP_NAME = router
 
 OBJS= main.o 
 
-all: $(APP_NAME).elf
+LIBS= -L../../build/libs -luser
 
-BIN_NAME_PATH=$(BUILD_PATH)$(APP_NAME).elf
+INCLUDES = -I.  -I../..  -I../../giet_libs  -I../../giet_xml  
 
-$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld
-        $(LD) -o $(BIN_NAME_PATH) -T $(APP_NAME).ld $(OBJS) $(USES)
-        $(DU) -D $(BIN_NAME_PATH) > $@.txt
+LIB_DEPS = ../../build/libs/libuser.a
+
+appli.elf: $(OBJS) $(APP_NAME).ld $(LIBS_DEPS) 
+        $(LD) -o $@ -T $(APP_NAME).ld $(OBJS) $(LIBS)
+        $(DU) -D $@ > $@.txt
 
 %.o: %.c 
-        $(CC)  $(INCLUDE) $(CFLAGS) $($*.o_CFLAGS) -c -o  $@ $<
-        $(DU) -D  $@ >  $@.txt
+        $(CC)  $(INCLUDES) $(CFLAGS) -c -o  $@ $<
 
 clean:
-        rm -f *.o *.elf *.txt core *~ 2>$(TRASH)
-        rm $(BIN_NAME_PATH) 2>$(TRASH)
+        rm -f *.o *.elf *.txt core *~

soft/giet_vm/applications/router/router.py

@@ -26 +26 @@
 ####################################################################################
 
-#########################
-def router( mapping ):
+######################
+def extend( mapping ):
 
     x_size    = mapping.x_size
@@ -54 +54 @@
     mapping.addVseg( vspace, 'router_data_0', data_0_base , data_0_size, 
                      'C_WU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
-                     binpath = 'build/router/router.elf',
+                     binpath = 'build/router/appli.elf',
                      local = False )
 
@@ -60 +60 @@
     mapping.addVseg( vspace, 'router_data_1', data_1_base , data_1_size, 
                      'C_WU', vtype = 'ELF', x = x_size - 1, y = y_size - 1, pseg = 'RAM', 
-                     binpath = 'build/router/router.elf',
+                     binpath = 'build/router/appli.elf',
                      local = False )
 
@@ -108 +108 @@
 if __name__ == '__main__':
 
-    vspace = router( Mapping( 'test', 2, 2, 4 ) )
+    vspace = extend( Mapping( 'test', 2, 2, 4 ) )
     print vspace.xml()