From f9f8ba9a89702ed8b9a9f53e1b7b49bf19012eef Mon Sep 17 00:00:00 2001
From: byrtolet <byrtolet@gmail.com>
Date: Thu, 27 Dec 2018 12:32:33 +0200
Subject: [PATCH] Oric core: Some cleanup of the build scripts

---
 cores/Oric/build/Makefile   | 6 +-----
 cores/Oric/build/make.bat   | 3 ++-
 cores/Oric/build/make.sh    | 2 +-
 cores/Oric/build/makenew.sh | 9 ---------
 cores/generarlast.sh        | 7 +++++++
 5 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100755 cores/Oric/build/makenew.sh
 create mode 100755 cores/generarlast.sh

diff --git a/cores/Oric/build/Makefile b/cores/Oric/build/Makefile
index 4e78a20..6ced4bf 100644
--- a/cores/Oric/build/Makefile
+++ b/cores/Oric/build/Makefile
@@ -1,8 +1,6 @@
 
 all:
-	time -p ./makemy.sh |tee out
-my:
-	time -p ./makenew.sh |tee out
+	time -p ./make.sh |tee out
 clean:
 	rm -rf COREn.ZX1 _impact.cmd _impact.log makemy.sh~ _ngo oric.bgn oric.bit oric_bitgen.xwbt \
         oric.bld oric.drc ORIC.lso oric_map.map oric_map.mrp oric_map.ncd oric_map.ngm ORIC_map.xrpt \
@@ -10,5 +8,3 @@ clean:
         oric_pad.txt oric.par ORIC_par.xrpt oric.pcf oric.ptwx oric_summary.xml oric.syr oric.twr \
         oric.twx oric.unroutes oric_usage.xml oric.v4.bit oric.xpi ORIC_xst.xrpt out out.my par_usage_statistics.html \
         projnav.tmp usage_statistics_webtalk.html webtalk.log xlnx_auto_0_xdb _xmsgs xst
-last:
-	time -p ./makemylast.sh |tee out
diff --git a/cores/Oric/build/make.bat b/cores/Oric/build/make.bat
index e472a4f..6021445 100644
--- a/cores/Oric/build/make.bat
+++ b/cores/Oric/build/make.bat
@@ -4,5 +4,6 @@ SET ruta_ucf=..\source\oric
 SET ruta_bat=..\..\
 call %ruta_bat%genxst.bat
 rem call %ruta_bat%generar.bat v2_v3 ZZ3
-call %ruta_bat%generar.bat v4 ZX1
+rem call %ruta_bat%generar.bat v4 ZX1
+call %ruta_bat%generar.bat v4_my ZX1
 rem call %ruta_bat%generar.bat Ap ZZA
diff --git a/cores/Oric/build/make.sh b/cores/Oric/build/make.sh
index aa54974..05f6162 100755
--- a/cores/Oric/build/make.sh
+++ b/cores/Oric/build/make.sh
@@ -5,5 +5,5 @@ export ruta_ucf=../source/oric
 export ruta_bat=../../
 "$ruta_bat"genxst.sh
 #"$ruta_bat"generar.sh v2_v3 ZZ3
-"$ruta_bat"generar.sh v4 ZX1
+"$ruta_bat"generar.sh v4_my ZX1
 #"$ruta_bat"generar.sh Ap ZZA
diff --git a/cores/Oric/build/makenew.sh b/cores/Oric/build/makenew.sh
deleted file mode 100755
index 05f6162..0000000
--- a/cores/Oric/build/makenew.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-export machine=oric
-export speed=3
-export ruta_ucf=../source/oric
-export ruta_bat=../../
-"$ruta_bat"genxst.sh
-#"$ruta_bat"generar.sh v2_v3 ZZ3
-"$ruta_bat"generar.sh v4_my ZX1
-#"$ruta_bat"generar.sh Ap ZZA
diff --git a/cores/generarlast.sh b/cores/generarlast.sh
new file mode 100755
index 0000000..c386d80
--- /dev/null
+++ b/cores/generarlast.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+map      -intstyle ise -w -ol high -mt 2 -p xc6slx9-tqg144-"$speed" -logic_opt off -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -ir off -pr off -lc off -power off -o "$machine"_map.ncd "$machine".ngd "$machine".pcf
+par      -intstyle ise -w -ol high -mt 4 "$machine"_map.ncd "$machine".ncd "$machine".pcf
+trce     -intstyle ise -v 3 -s "$speed" -n 3 -fastpaths -xml "$machine".twx "$machine".ncd -o "$machine".twr "$machine".pcf
+bitgen   -intstyle ise -f "$machine".ut "$machine".ncd
+bit2bin "$machine".bit COREn."$2"
+cp  "$machine".bit "$machine"."$1".bit