diff --git a/software/sdb-flash/bin2ihex.c b/software/sdb-flash/bin2ihex.c
deleted file mode 100644
index 26ce80f27e2b993fbecacf52e886de5ea4ad3853..0000000000000000000000000000000000000000
--- a/software/sdb-flash/bin2ihex.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-* bin2ihex: convert binary files to Intel hex files
-* 93/03/08 john h. dubois iii (john@armory.com)
-* 94/07/05 Andy Rabagliati (andyr@wizzy.com)
-* Added Intel Extended address record
-* port to PC (unsigned longs everywhere)
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#ifndef __MSDOS__
-#include <unistd.h>
-#endif
-
-#ifndef _NO_PROTOTYPE
-unsigned long ProcFile(int InFile, int BytesPerRec, unsigned long Origin,
-int Dots, int Extended);
-char *bin2ihex(unsigned char *In, unsigned char *Out, int NBytes,
-unsigned long Address);
-#endif
-
-#define b2h(b,p) *((p)++) = HexTable[(b) >> 4], *((p)++) = HexTable[(b) & 0xF]
-#define MAXBYTES 255 /* Intel 00 record can only store 255 bytes */
-#define MAXLINE (MAXBYTES * 2 + 12)
-#ifdef __MSDOS__
-# define OPEN_FLAGS (O_RDONLY | O_BINARY)
-#else
-# define OPEN_FLAGS O_RDONLY
-#endif
-
-char *HexTable = "0123456789ABCDEF";
-char *FILENAME; /* File being read, for use by error messages */
-char *Name; /* Name of this process, for use by help & error messages */
-char *Comment = "@(#) bin2ihex 1.1 96/07/03";
-
-main(int argc, char *argv[])
-{
- extern char *optarg;
- extern int optind;
- int Quiet = 0; /* Do not print status messages */
- char c; /* Option being processed */
- int InFile; /* file descriptor being read from */
- char *OutFileName = "stdout"; /* Output file name */
- char *Usage =
- "Usage: %s [-ehq] [-o outfile] [-g origin] [-b bytes/record] [infile]\n";
- char *ptr; /* For checking result of strtol() */
- int BytesPerRec = 16; /* Number of bytes per record to write */
- unsigned long Written; /* Number of bytes processed */
- unsigned long Origin = 0; /* Origin of output */
- int Dots = 0; /* Whether to print a dot on stderr for every record */
- int Extended = 0; /* Write extended Intel hex records? */
-
- if (Name = strrchr(argv[0],'/'))
- Name++;
- else
- Name = argv[0];
- while ((c = getopt(argc, argv, "dehqb:g:o:")) != -1)
- switch (c) {
- case 'd':
- Dots = 1;
- break;
- case 'e':
- Extended = 1;
- break;
- case 'g':
- Origin = (unsigned long) strtol(optarg,&ptr,0);
- if (((long) Origin) < 0 || ptr == optarg) {
- fprintf(stderr,"%s: \"%s\": Invalid origin.\n",Name,optarg);
- exit(1);
- }
- break;
- case 'b':
- BytesPerRec = strtol(optarg,&ptr,0);
- if (BytesPerRec < 1 || BytesPerRec > MAXBYTES || ptr == optarg) {
- fprintf(stderr,"%s: \"%s\": Invalid number of bytes/record.\n"\
- "Must be between 1 and %d.\n",Name,optarg,MAXBYTES);
- exit(1);
- }
- break;
- case 'q':
- Quiet = 1;
- break;
- case 'o':
- OutFileName = optarg;
- if (!freopen(OutFileName,"w",stdout)) {
- fprintf(stderr,"%s: Could not open output file \"%s\": ",
- Name,OutFileName);
- perror("");
- exit(2);
- }
- break;
- case 'h':
- printf(
- "%s: convert binary file to Intel-hex format records.\n",Name);
- printf(Usage,Name);
- printf(
-"-g <origin>: Make addresses specified in output records start at <origin>.\n"\
-" <origin> may be given in decimal, octal, or hex by using C base syntax.\n"\
-" The default origin is 0.\n"\
-"-o <outfile>: Write output to <outfile>.\n"\
-" The default is to write to the standard output.\n"\
-"-b <bytes-per-record>: write <bytes-per-record> bytes (encoded in hex\n"\
-" format) on each line. The line length will be <bytes-per-record>*2 + 11\n"\
-" characters (plus a newline).\n"\
-" <bytes-per-record> must be between 1 and %d.\n"\
-"-d: Print a dot on stderr for every record processed.\n"\
-"-e: Write extended Intel hex reords. Addresses may be up to 0xFFFFF.\n"\
-"-q: Quiet operation: no status messages are printed. If -q is not given,\n"\
-" the total number of bytes processed is printed to stderr at completion.\n"\
-"-h: Print this help information.\n"\
-"\n"\
-"If no input file is given, input is read from the standard input.\n"\
-,MAXBYTES);
- exit(0);
- case '?':
- fprintf(stderr,"%s: Invalid flag: '%c'.\n",Name,c);
- fprintf(stderr,Usage,Name);
- exit(1);
- }
- switch (argc - optind) {
- case 0:
- InFile = 0;
- FILENAME = "stdin";
- break;
- case 1:
- if ((InFile = open(argv[optind],OPEN_FLAGS)) == -1) {
- fprintf(stderr,"%s: Could not open input file \"%s\": ",
- Name,argv[optind]);
- perror("");
- exit(2);
- }
- FILENAME = argv[optind];
- break;
- default:
- fprintf(stderr,"%s: Too many arguments.\n",Name);
- fprintf(stderr,Usage,Name);
- exit(2);
- }
- Written = ProcFile(InFile,BytesPerRec,Origin,Dots,Extended);
- /* andyr added this. 01 = end of file? For now, print only if Extended */
- if (Extended)
- puts(":00000001FF\n");
- if (!Quiet) {
- if (Dots)
- fputc('\n',stderr);
- fprintf(stderr,"%lu bytes written in %lu records.\n",Written,
- (Written + BytesPerRec - 1) / BytesPerRec);
- }
-}
-
-/* Eaddr from andyr */
-char *Eaddr( unsigned char *OutBuf, unsigned long Eaddress)
-{
- unsigned Checksum; /* Checksum of the record */
- unsigned char *Out = OutBuf; /* Position in OutBuf being written to */
-
- *(Out++) = ':';
- *(Out++) = '0';
- *(Out++) = '2';
-
- *(Out++) = '0';
- *(Out++) = '0';
- *(Out++) = '0';
- *(Out++) = '0';
-
- *(Out++) = '0';
- *(Out++) = '2';
- b2h(Eaddress >> 12,Out);
- b2h((Eaddress >> 4) & 0xFF, Out);
- Checksum = 2 + 2 + (Eaddress >> 12) + (Eaddress >> 4);
- Checksum = (-Checksum & 0xFF);
- b2h(Checksum,Out);
- *(Out++) = '\0';
- return (char *) OutBuf;
-}
-
-/*
- Convert a binary file to Intel hex format.
- Return value: the number of bytes converted & written.
-*/
-unsigned long ProcFile(int InFile, int BytesPerRec, unsigned long Origin,
-int Dots, int Extended)
-{
- unsigned char InBuf[MAXLINE/2]; /* Input data buffer */
- unsigned char OutBuf[MAXLINE]; /* Output buffer */
- int InBytes; /* Number of bytes actually read from fd */
- unsigned long Address = Origin; /* Record address */
- unsigned long Eaddress = 0UL;
- unsigned long Count = 0UL;
- unsigned long MaxOffset = Extended ? 0xFFFFFUL : 0xFFFFUL;
-
- if (Extended)
- puts(Eaddr(OutBuf, Eaddress));
- while ((InBytes = read(InFile,InBuf,BytesPerRec)) > 0) {
- Count += InBytes;
- if ((Address + InBytes) > MaxOffset) {
- if (Dots)
- fputc('\n',stderr);
- fprintf(stderr,"%s: Record address exceeded 0x%lX.\n",
- Name,MaxOffset);
- break;
- }
- if (Extended && (Address + InBytes) > 0xFFFFUL) {
- Eaddress = Address & 0xFFFF0;
- Address = Address - Eaddress;
- puts(Eaddr(OutBuf, Eaddress));
- }
- puts(bin2ihex(InBuf,OutBuf,InBytes,Address));
- Address += InBytes;
- if (Dots)
- write(2,".",1);
- }
- if (InBytes == -1) {
- if (Dots)
- fputc('\n',stderr);
- fprintf(stderr,"%s: Error reading file \"%s\": ",Name,FILENAME);
- perror("");
- }
- return Count;
-}
-
-/*
-* Format of an Intel hex record:
-* :nnaaaa00dd....ddss
-* nn: Number of data bytes
-* aaaa: Address
-* dd: data bytes
-* ss: 0-sum corrective checksum for all bytes on line.
-*/
-/*
-* bin2ihex: convert binary data to an Intel hex record.
-* Input variables:
-* In is the input data.
-* Address is the data address for the record.
-* Output variables:
-* Out is a buffer to store the record in.
-* NBytes is the number of bytes to translate.
-* Return value: None.
-*/
-char *bin2ihex(unsigned char *In, unsigned char OutBuf[], int NBytes,
-unsigned long Address)
-{
- int i;
- unsigned Checksum; /* Checksum of the record */
- unsigned char *Out = OutBuf; /* Position in OutBuf being written to */
-
- *(Out++) = ':';
- b2h(NBytes,Out);
- b2h(Address >> 8,Out);
- b2h(Address & 0xFF,Out);
- *(Out++) = '0';
- *(Out++) = '0';
- Checksum = NBytes + (Address >> 8) + Address;
- for (i = 0; i < NBytes; i++) {
- b2h(*In,Out);
- Checksum += *(In++);
- }
- Checksum = (-Checksum & 0xFF);
- b2h(Checksum,Out);
- *(Out++) = '\0';
- return (char *) OutBuf;
-}
diff --git a/software/sdb-flash/build.sh b/software/sdb-flash/build.sh
index f6874c39314bee1bafaa35c8b0e997c00e929f22..c6258707fba7681043d836b4c39c7c9dff7f0d42 100755
--- a/software/sdb-flash/build.sh
+++ b/software/sdb-flash/build.sh
@@ -2,10 +2,20 @@
# A trivial script to build the SDB flash image for the SVEC. Requires sdb-tools installed in the system
-#cp ../../hdl/syn/sfpga_bootloader/svec_sfpga_top.bin fs/bootldr.bin
-#cp ../../hdl/syn/golden/svec_top.bin fs/afpga.bin
-gcc bin2vmf.c -o bin2vmf
-gcc bin2ihex.c -o bin2ihex
+PROMGEN=`which promgen`
+GENSDBFS=`which gensdbfs`
+
+if [ ! -f "$PROMGEN" ]; then
+ echo "You seem to not have the promgen utility. Do you have Xilinx ISE installed?"
+ exit
+fi
+
+if [ ! -f "$GENSDBFS" ]; then
+ echo "You seem to not have the gensdbfs. Have you compiled and installed it (check the manual)?"
+ exit
+fi
+
+
gensdbfs fs image.bin
+promgen -p mcs -o image.mcs -spi -data_file up 0 image.bin -w
./bin2vmf image.bin > image.vmf
-./bin2ihex -e -o image.mcs image.bin
\ No newline at end of file
diff --git a/software/sdb-flash/fs/--SDB-CONFIG-- b/software/sdb-flash/fs/--SDB-CONFIG--
index 519426e4d320324918bcf362d9a9e461a486afa9..436612e0eeb0fe6c0e72324e5fcf31a1f14d5427 100644
--- a/software/sdb-flash/fs/--SDB-CONFIG--
+++ b/software/sdb-flash/fs/--SDB-CONFIG--
@@ -6,9 +6,9 @@
.
vendor = 0xce42
device = 0x5fec
- position = 0x500000
+ position = 0x600000
-bootldr.bin
+svec-bootloader.bin
position = 0
afpga.bin
diff --git a/software/sdb-flash/fs/afpga.bin b/software/sdb-flash/fs/afpga.bin
new file mode 120000
index 0000000000000000000000000000000000000000..a1e4a65b2542d2d149df9003bd86a92dac5c60cc
--- /dev/null
+++ b/software/sdb-flash/fs/afpga.bin
@@ -0,0 +1 @@
+../../../hdl/syn/golden/svec_top.bin
\ No newline at end of file
diff --git a/software/sdb-flash/fs/bootldr.bin b/software/sdb-flash/fs/bootldr.bin
deleted file mode 100644
index eff91d766b14d322130a49b8271c5cfdf5f95115..0000000000000000000000000000000000000000
Binary files a/software/sdb-flash/fs/bootldr.bin and /dev/null differ
diff --git a/software/sdb-flash/fs/svec-bootloader.bin b/software/sdb-flash/fs/svec-bootloader.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5c2bdaa696cfee3c001e73e69368e2a2669312f7
Binary files /dev/null and b/software/sdb-flash/fs/svec-bootloader.bin differ