removed xc3sprog

Author: kooscode

install

@@ -9,30 +9,20 @@ echo -e '-------------------------------------------'
 sudo apt -y update
 sudo apt -y install build-essential libusb-dev libftdi-dev libgpiod-dev wiringpi git cmake
 
-#install XC3SPROG
-echo -e '-----------------------'
-echo -e '\n INSTALLING XC3SPROG\n'
-echo -e '-----------------------'
-git clone https://github.com/matrix-io/xc3sprog 
-mkdir xc3sprog/build
-cd xc3sprog/build
-cmake .. 
-make
-sudo make install
-cd ../..
-
 # make and install xenium-flash to bin
-echo -e '-----------------------------------------------'
-echo -e '\n BUILDING AND INSTALLING XENIUM-FLASH TOOL\n'
-echo -e '-----------------------------------------------'
+echo -e '----------------------------------------------------------'
+echo -e '\n BUILDING AND INSTALLING XENIUM JTAG AND FLASH TOOLS\n'
+echo -e '----------------------------------------------------------'
 cd xenium-flash
 make
-cp bin/xenium-flash /usr/local/bin
+sudo cp bin/xenium-jtag /usr/local/bin
+sudo cp bin/xenium-flash /usr/local/bin
 cd ..
 
 chmod +x xenium-programmer
 
 echo -e '\n** INSTALL COMPLETE **\n'
 
+echo -e '\nTo program your Xenium, just run:\n\t ./xenium-programmer xenium-bin/xenium_blue.bin \n'
 
 

xenium-flash/Makefile

@@ -1,27 +1,36 @@
-APP=xenium-flash
+APP_FLASH=xenium-flash
+APP_JTAG=xenium-jtag
 SRC_MAIN=src
 OUT_DIR=bin
 
+#extras
+FLASH=$(SRC_MAIN)/flash
+JTAG=$(SRC_MAIN)/jtag
+
 #G++ options (-g = debug)
 CXX=g++
 CFLAGS=-g -Wall -ansi
 CPP_STD=c++17
 
 #extra include paths
-I1=
-I2=
-I3=
+I1=$(SRC_MAIN)
+I2=$(FLASH)
+I3=$(JTAG)
 I4=
 #include folders
 INC=$(I1) $(I2) $(I3) $(I4)
 INCLUDES=$(foreach d, $(INC), -I$d)
 
 #additional sources files (add extras if needed)
-S1= $(SRC_MAIN)/BitBus.cpp
-S2= $(SRC_MAIN)/Flash.cpp
+S1= $(FLASH)/BitBus.cpp
+S2= $(FLASH)/Flash.cpp
 S3=
-S4=
-SOURCES=$(S1) $(S2) $(S3) $(S4)
+S4=$(JTAG)/IOBase.cpp
+S5=$(JTAG)/IOWiringPi.cpp
+S6=$(JTAG)/Jtag.cpp
+S7=$(JTAG)/JedecFile.cpp
+S8=$(JTAG)/ProgAlgXC95X.cpp
+SOURCES=$(S1) $(S2) $(S3) $(S4) $(S5) $(S6) $(S7) $(S8)
 
 #lib paths (add extras if needed)
 LP1=
@@ -51,10 +60,23 @@ PKG_LIBS=$(shell pkg-config --libs $(PKGS))
 endif
 
 #compile (-g = debug mode)
-$(APP): $(SRC_MAIN)/$(APP).cpp 
+
+MAKE_FLASH = $(CXX) $(CFLAGS) -std=$(CPP_STD) $(SRC_MAIN)/$(APP_FLASH).cpp $(SOURCES) -o $(OUT_DIR)/$(APP_FLASH) $(INCLUDES) $(PKG_INCS) $(LIB_PATHS) $(LIBS) $(PKG_LIBS)
+MAKE_JTAG = $(CXX) $(CFLAGS) -std=$(CPP_STD) $(SRC_MAIN)/$(APP_JTAG).cpp $(SOURCES) -o $(OUT_DIR)/$(APP_JTAG) $(INCLUDES) $(PKG_INCS) $(LIB_PATHS) $(LIBS) $(PKG_LIBS)
+
+all:
 	test -d bin || mkdir -p bin
-	$(CXX) $(CFLAGS) -std=$(CPP_STD) $(SRC_MAIN)/$(APP).cpp $(SOURCES) -o $(OUT_DIR)/$(APP) $(INCLUDES) $(PKG_INCS) $(LIB_PATHS) $(LIBS) $(PKG_LIBS)
+	$(MAKE_JTAG)
+	$(MAKE_FLASH)
 
+$(APP_FLASH): $(SRC_MAIN)/$(APP_FLASH).cpp 
+	test -d bin || mkdir -p bin
+	$(MAKE_FLASH)
+	
+$(APP_JTAG): $(SRC_MAIN)/$(APP_JTAG).cpp 
+	test -d bin || mkdir -p bin
+	$(MAKE_JTAG)
+	
 clean:
 	rm bin -fr
 

xenium-flash/bin/xenium-flash

@@ -0,0 +1,39 @@
+/* #defines for Xenium JTAG and FLASH GPIO pinouts
+
+Copyright (C) 2019-2020 Koos du Preez ([email protected])
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+// JTAG Pins
+#define XENIUM_TMS 4
+#define XENIUM_TCK 17
+#define XENIUM_TDI 22
+#define XENIUM_TDO 27
+
+// BitBus pins connected to LPC Header
+// BITBUS D0 => LPC LAD0
+#define BITBUS_D0 16
+// BITBUS D1 => LPC LAD1
+#define BITBUS_D1 21
+// BITBUS D2 => LPC LAD2
+#define BITBUS_D2 18
+// BITBUS D3 => LPC LAD3
+#define BITBUS_D3 20
+// BITBUS CLK => LPC LCLK
+#define BITBUS_CLK 24
+// BITBUS DIR => LPC RST
+#define BITBUS_DIR 23
+

xenium-flash/bin/xenium-jtag

@@ -5,21 +5,7 @@
 
 #include "wiringPi.h"
 
-#include "PiPinMap.h"
-
-//BitBus pins connected to LPC Header
-// BITBUS D0 => LPC LAD0
-#define BITBUS_D0 GPIO_16
-// BITBUS D1 => LPC LAD1
-#define BITBUS_D1 GPIO_21
-// BITBUS D2 => LPC LAD2
-#define BITBUS_D2 GPIO_18
-// BITBUS D3 => LPC LAD3
-#define BITBUS_D3 GPIO_20
-// BITBUS CLK => LPC LCLK
-#define BITBUS_CLK GPIO_24
-// BITBUS DIR => LPC RST
-#define BITBUS_DIR GPIO_23
+#include "XeniumDefines.h"
 
 namespace XK
 {

xenium-flash/src/PiPinMap.h

@@ -0,0 +1,101 @@
+/* JTAG low level functions and base class for cables
+
+Copyright (C) 2004 Andrew Rogers
+Copyright (C) 2005-2013 Uwe Bonnes [email protected]
+Copyright (C) 2019-2020 Koos du Preez ([email protected])
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Changes:
+Koos du Preez [[email protected]] Jan 1 2019 
+    Removed everything not needed for Raspberry PI and Xilinx xc9572xl
+*/
+
+#include "IOBase.h"
+
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+ 
+using namespace std;
+IOBase::IOBase()
+{
+    verbose = false;
+    memset( ones,0xff,CHUNK_SIZE);
+    memset(zeros,   0,CHUNK_SIZE);
+    memset(tms_buf,   0,CHUNK_SIZE);
+    tms_len = 0;
+}    
+
+void IOBase::flush_tms(int force)
+{
+  if (tms_len)
+    tx_tms(tms_buf, tms_len, force);
+  memset(tms_buf,   0,CHUNK_SIZE);
+  tms_len = 0;
+}
+
+void IOBase::set_tms(bool val)
+{
+  if( tms_len + 1 > CHUNK_SIZE*8)
+    flush_tms(false);
+  if(val)
+    tms_buf[tms_len/8] |= (1 <<(tms_len &0x7));
+  tms_len++;
+}
+    
+void IOBase::shiftTDITDO(const unsigned char *tdi, unsigned char *tdo,
+			 int length, bool last)
+{
+  if(length==0) return;
+  flush_tms(false);
+  txrx_block(tdi, tdo, length,last);
+  return;
+}
+
+void IOBase::shiftTDI(const unsigned char *tdi, int length, bool last)
+{
+  shiftTDITDO(tdi, NULL, length,last);
+}
+
+// TDI gets a load of zeros, we just record TDO.
+void IOBase::shiftTDO(unsigned char *tdo, int length, bool last)
+{
+    shiftTDITDO(NULL, tdo, length,last);
+}
+
+// TDI gets a load of zeros or ones, and we ignore TDO
+void IOBase::shift(bool tdi, int length, bool last)
+{
+    int len = length;
+    unsigned char *block = (tdi)?ones:zeros;
+    flush_tms(false);
+    while (len > CHUNK_SIZE*8)
+    {
+	txrx_block(block, NULL, CHUNK_SIZE*8, false);
+	len -= (CHUNK_SIZE*8);
+    }
+    shiftTDITDO(block, NULL, len, last);
+}
+
+
+void IOBase::Usleep(unsigned int usec)
+{
+  flush_tms(false);
+  flush();
+
+  usleep(usec);
+}
+

xenium-flash/src/XeniumDefines.h

@@ -0,0 +1,71 @@
+/* JTAG low level functions and base class for cables
+
+Copyright (C) 2004 Andrew Rogers
+Copyright (C) 2005-2013 Uwe Bonnes [email protected]
+Copyright (C) 2019-2020 Koos du Preez ([email protected])
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Changes:
+Koos du Preez [[email protected]] Jan 1 2019 
+    Removed everything not needed for Raspberry PI and Xilinx xc9572xl
+    Renamed files to match class names - a pet peeve of mine :)
+*/
+
+#ifndef IOBASE_H
+#define IOBASE_H
+
+#define BLOCK_SIZE 65536
+#define CHUNK_SIZE 128
+#define TICK_COUNT 2048
+
+#include <sys/time.h>
+
+class IOBase
+{
+
+ protected:
+  bool	      verbose;
+  unsigned char ones[CHUNK_SIZE], zeros[CHUNK_SIZE];
+  unsigned char tms_buf[CHUNK_SIZE];
+  unsigned int tms_len; /* in Bits*/
+
+ protected:
+  IOBase();
+ public:
+  virtual ~IOBase() {}
+
+ public:
+  virtual void flush() {}
+  virtual void Usleep(unsigned int usec);
+
+ public:
+  void setVerbose(bool v) { verbose = v; }
+  void shiftTDITDO(const unsigned char *tdi, unsigned char *tdo, int length, bool last=true);
+  void shiftTDI(const unsigned char *tdi, int length, bool last=true);
+  void shiftTDO(unsigned char *tdo, int length, bool last=true);
+  void shift(bool tdi, int length, bool last=true);
+  void set_tms(bool value);
+  void flush_tms(int force);
+
+ protected:
+  virtual void txrx_block(const unsigned char *tdi, unsigned char *tdo, int length, bool last)=0;
+  virtual void tx_tms(unsigned char *pat, int length, int force)=0;
+  virtual void settype(int subtype) {}
+
+private:
+  void nextTapState(bool tms);
+};
+#endif // IOBASE_H