- rename "inversor" ??? in inv

- replace OCR by NERO in Amd2901
- remove yagle call

alliance/src/documentation/tutorials/place_and_route/src/amd2901/Makefile

@@ -1,8 +1,6 @@
 
 
-     ALLIANCE_TOP = /asim/alliance
-      TECHNO_REAL = prol10
-
+#    ALLIANCE_TOP = /alliance
 
 #
 # /------------------------------------------------------------------\
@@ -11,7 +9,7 @@
 #
 
 # Standart System binary access paths.
- STANDART_BIN  = /usr/local/bin:/labo/gnu/bin:/usr/bin:/bin
+ STANDART_BIN  = /usr/local/bin:/usr/bin:/bin
  STANDART_PATH = PATH=$(STANDART_BIN); export PATH
 
 # Standart Alliance binary access paths.
@@ -99,7 +97,7 @@
    GENLIB = $(MBK_GENERAT_ENV);$(ALLIANCE_BIN)/genlib
    GENPAT = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genpat
       OCP = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp 
-      OCR = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr 
+     NERO = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero 
      RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring
     GRAAL = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/graal
     XSCH  = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/xsch
@@ -161,14 +159,13 @@ amd2901_ctl.vst : amd2901_ctl_boog.vst
 
 amd2901_core_p.ap: amd2901_core.vst amd2901_core_place.ap amd2901_core.ioc
 	$(OCP) -v -gnuplot -partial amd2901_core_place -ioc amd2901_core amd2901_core amd2901_core_p
-#	$(OCP) -v -gnuplot -partial amd2901_core_place -ring amd2901_core amd2901_core_p
 
 druc_ocp: amd2901_core_p.ap
 	$(DRUC) amd2901_core_p
 	$(TOUCH) druc_ocp
 
 amd2901_core.ap: druc_ocp
-	$(OCR) -P amd2901_core_p -L amd2901_core -O amd2901_core -l 3 -v -i 30
+	$(NERO) -v -2 -p amd2901_core_p amd2901_core amd2901_core
 
 amd2901_core.al: amd2901_core.ap
 	$(MBK_EXTRACT_ENV); $(COUGAR) -v -f amd2901_core amd2901_core

alliance/src/documentation/tutorials/place_and_route/src/buffer/Makefile

@@ -1,18 +1,9 @@
 
-all: COUGAR YAGLE PROOF
+all: COUGAR
 
 COUGAR: 
 	MBK_IN_PH=ap ;MBK_OUT_LO=al ;cougar -t buf_x2 buf_x2
 
-YAGLE:
-	export AVT_LICENSE_SERVER=beny.lip6.fr ;\
-        export MBK_IN_LO=al ;\
-        export YAGLE_BEH_FORMAT=vbe ;\
-	/users/soft5/newlabo/AvtTools/tools/Linux_2.2/bin/yagle buf_x2 buf_x2
-	
-PROOF:
-	proof buf_x2 buffer
-
 clean:
 	rm -f *.al buf_x2.vbe *.rep
 

alliance/src/documentation/tutorials/place_and_route/src/inv/Makefile

@@ -0,0 +1,9 @@
+
+all: COUGAR
+
+COUGAR: 
+	MBK_IN_PH=ap ;MBK_OUT_LO=al ;cougar -t inv_x1 inv_x1
+
+clean:
+	rm -f *.al inv_x1.vbe *.rep
+

alliance/src/documentation/tutorials/place_and_route/src/inv/inv.vbe

@@ -1,18 +1,18 @@
 -- Entity Declaration
 
-ENTITY inversor IS
+ENTITY inv IS
   PORT (
   i : in BIT;	-- i
   nq : out BIT;	-- nq
   vdd : in BIT;	-- vdd
   vss : in BIT	-- vss
   );
-end inversor;
+end inv;
 
 
 -- Architecture Declaration
 
-ARCHITECTURE data_flow OF inversor IS
+ARCHITECTURE data_flow OF inv IS
 
 BEGIN
   

alliance/src/documentation/tutorials/place_and_route/src/inversor/Makefile

@@ -1,18 +0,0 @@
-
-all: COUGAR YAGLE PROOF
-
-COUGAR: 
-	MBK_IN_PH=ap ;MBK_OUT_LO=al ;cougar -t inv_x1 inv_x1
-
-YAGLE:
-	export AVT_LICENSE_SERVER=beny.lip6.fr ;\
-        export MBK_IN_LO=al ;\
-        export YAGLE_BEH_FORMAT=vbe ;\
-	/users/soft5/newlabo/AvtTools/tools/Linux_2.2/bin/yagle inv_x1 inv_x1
-	
-PROOF:
-	proof inv_x1 inversor
-
-clean:
-	rm -f *.al inv_x1.vbe *.rep
-