Fixed synthesize process using customized makefile with hdl-make.

Finished building chains to implement bit file generation using data2mem. Refer to http://www.ohwr.org/issues/1006

Added tools/eb-*.c for Etherbone support of wrc console, info & flash programming.

Added impact script for JTAG bit file programming.

Updated README.md

Makefile

+include dir_list.mk
+
+SYN_TOP = $(TOP)/syn/cute_wr/wr_core_demo
+EB_TGT = $(EB_DIR)/api/libetherbone.a
+BIT_TGT = $(SYN_TOP)/cute_top_wrc.bit
+WRC_TGT = $(FW_DIR)/wrc.elf
+
+.PHONY: all install clean distclean etherbone etherbone-clean etherbone-install tools tools-clean tools-install toolchain firmware gateware firmware-clean gateware-clean program program-clean
+
+all:	    etherbone tools firmware gateware
+
+install:    etherbone-install tools-install
+
+clean:	    etherbone-clean tools-clean toolchain-clean firmware-clean gateware-clean program-clean
+
+distclean: clean
+	git clean -xfd .
+	for i in gateware firmware; do cd submodules/$$i; git clean -xfd .; cd $(TOP); done
+
+etherbone: $(EB_TGT)
+firmware: $(WRC_TGT)
+gateware: $(BIT_TGT)
+
+$(EB_TGT):
+	$(MAKE) -C $(EB_DIR)/api all
+
+etherbone-clean:
+	$(MAKE) -C $(EB_DIR)/api clean
+
+etherbone-install:
+	$(MAKE) -C $(EB_DIR)/api install
+
+tools: etherbone
+	$(MAKE) -C tools EB=$(EB_DIR)/api all
+
+tools-clean:
+	$(MAKE) -C tools EB=$(EB_DIR)/api clean
+
+tools-install:
+	$(MAKE) -C tools EB=$(EB_DIR)/api install
+
+$(FW_DIR)/.config:
+	$(MAKE) -C $(FW_DIR) etherbone_defconfig
+
+$(WRC_TGT): $(EB_TGT) $(FW_DIR)/.config
+	$(MAKE) -C $(FW_DIR) EB=$(EB_DIR)/api all
+
+firmware-clean:
+	$(MAKE) -C $(FW_DIR) EB=$(EB_DIR)/api clean
+
+$(BIT_TGT): firmware
+	$(MAKE) -C $(SYN_TOP) all
+
+gateware-clean:
+	$(MAKE) -C $(SYN_TOP) clean
+
+program: $(BIT_TGT)
+	./tools/impact_cutewr $<
+
+program-clean:
+	rm -f *.bit
+	rm -f _impactbatch.log
+
+# not for 64 bit arch
+gcc-4.5.3-lm32.tar.xz:
+	wget http://www.ohwr.org/attachments/1301/gcc-4.5.3-lm32.tar.xz
+
+toolchain:  gcc-4.5.3-lm32.tar.xz
+	tar xvJf gcc-4.5.3-lm32.tar.xz
+	mv lm32 toolchain
+	touch toolchain
+
+toolchain-clean:
+	rm -rf toolchain

README.md

+# CUTE-wr projects
+
+## Code structure
+* Gateware:
+    `submodules/wr-cores`
+    cute-wr branch that work on hardware version 2.1
+
+* Firmware:
+    `submodules/wrpc-sw`
+    Full support of substituting wrpc RAM in target bit file using data2mem. See http://www.ohwr.org/issues/1006
+
+* Software:
+    multiboot support
+    TBD
+
+## Building
+    git submodule update --recursive --init
+    make

dir_list.mk

+TOP	    := $(dir $(lastword $(MAKEFILE_LIST)))
+SUBMODULES  := $(TOP)submodules
+GW_DIR	    := $(SUBMODULES)/wr-cores
+FW_DIR	    := $(SUBMODULES)/wrpc-sw
+EB_DIR	    := $(GW_DIR)/ip_cores/etherbone-core

hdl-make @ b0ccccc6

-Subproject commit aabe6c840ed4d8414dd62bb67781e10672184103
+Subproject commit b0ccccc6a3c687408cf706ca1ec93556872598b6

syn/cute_wr/wr_core_demo/Makefile

+TARGET = cute_top
+PROJECT = cute_top_wrc
+
+include ../../../dir_list.mk
+
+.PHONY: all
+all: $(TARGET)_wrc.bit
+
+$(PROJECT).xise: Manifest.py
+	python2.7 $(TOP)submodules/hdl-make/hdlmake ise-project
+
+# Xilinx UG658
+$(TARGET)_wrc.bit: $(FW_DIR)/wrc.elf $(TARGET).bit $(TARGET)_bd.bmm
+	data2mem -bm $(word 3, $^) -bd $< -bt $(word 2, $^) -o b $@
+
+$(TARGET).bmm:  $(GW_DIR)/top/cute_wr/wr_core_demo/cute.bmm
+	cp $< $@
+
+$(TARGET)_bd.bmm $(TARGET).bit: $(PROJECT).xise $(TARGET).bmm
+	printf "project open $< \n\
+	    project set {Hierarchy Separator} / \n\
+	    xfile add $(word 2, $^) \n\
+	    process run {Generate Programming File} -force rerun" | xtclsh
+
+ISE_CRAP := *.b *.html $(TARGET).bgn $(TARGET).bld $(TARGET).cmd_log *.drc $(TARGET).lso *.ncd $(TARGET).ngc $(TARGET).ngd $(TARGET).ngr $(TARGET).pad $(TARGET).par $(TARGET).pcf $(TARGET).prj $(TARGET).ptwx $(TARGET).stx $(TARGET).syr $(TARGET).twr $(TARGET).twx $(TARGET).gise $(TARGET).unroutes $(TARGET).ut $(TARGET).xpi $(TARGET).xst $(TARGET)_bitgen.xwbt $(TARGET)_guide.ncd $(TARGET)_map.map $(TARGET)_map.mrp $(TARGET)_map.ncd $(TARGET)_map.ngm $(TARGET)_map.xrpt $(TARGET)_ngdbuild.xrpt $(TARGET)_pad.csv $(TARGET)_pad.txt $(TARGET)_par.xrpt $(TARGET)_summary.xml $(TARGET)_usage.xml $(TARGET)_xst.xrpt webtalk.log webtalk_pn.xml run.tcl $(PROJECT).gise
+
+clean:
+	rm -f $(PROJECT).xise $(ISE_CRAP) *.bmm
+	rm -rf xst xlnx_auto_*_xdb iseconfig _xmsgs _ngo

syn/cute_wr/wr_core_demo/Manifest.py

+target = "xilinx"
+action = "synthesis"
+
+syn_device = "xc6slx45t"
+syn_grade = "-3"
+syn_package = "fgg484"
+syn_top = "cute_top"
+top_module = "cute_top"
+syn_project = "cute_top_wrc.xise"
+
+modules = {
+    "local" : [
+        "../../../submodules/wr-cores/top/cute_wr/wr_core_demo"
+    ]
+}

tools/Makefile

+PREFIX  ?= /usr/local
+STAGING ?=
+EB      ?= ../submodules/wr-cores/ip_cores/etherbone-core/api
+TARGETS := eb-flash eb-info eb-console
+
+EXTRA_FLAGS ?=
+CFLAGS      ?= $(EXTRA_FLAGS) -Wall -O2 -I $(EB)
+LIBS        ?= -L $(EB) -Wl,-rpath,$(PREFIX)/lib -letherbone
+
+all:	$(TARGETS)
+clean:
+	rm -f $(TARGETS)
+install:
+	mkdir -p $(STAGING)$(PREFIX)/bin
+	cp $(TARGETS) $(STAGING)$(PREFIX)/bin
+
+%:	%.c
+	gcc $(CFLAGS) -o $@ $< $(LIBS)
+
+%:	%.cpp
+	g++ $(CFLAGS) -o $@ $< $(LIBS) -leca -ltlu

tools/eb-console.c

+/** @file eb-info.c
+ *  @brief Report the contents of an FPGA using Etherbone.
+ *
+ *  Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH 
+ *
+ *  A complete skeleton of an application using the Etherbone library.
+ *
+ *  @author Wesley W. Terpstra <w.terpstra@gsi.de>
+ *
+ *******************************************************************************
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************
+ */
+
+#define _XOPEN_SOURCE 500 /* strtoull, usleep, tcgetattr */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <etherbone.h>
+#include <unistd.h> /* getopt */
+#include <termios.h>
+#include <fcntl.h>
+
+#define CERN_ID	0xce42
+#define UART_ID	0xe2d13d04
+#define VUART_TX 0x10
+#define VUART_RX 0x14
+#define STDIN_FD 0
+#define BATCH_SIZE 200
+
+const char *program;
+
+static void help(void) {
+  fprintf(stderr, "Usage: %s [OPTION] <proto/host/port>\n", program);
+  fprintf(stderr, "\n");
+  fprintf(stderr, "  -i <index>     select between multiple uarts\n");
+  fprintf(stderr, "  -h             display this help and exit\n");
+  fprintf(stderr, "\n");
+  fprintf(stderr, "Report bugs to <w.terpstra@gsi.de>\n");
+}
+
+static void die(const char* msg, eb_status_t status) {
+  fprintf(stderr, "%s: %s: %s\n", program, msg, eb_status(status));
+  exit(1);
+}
+
+int main(int argc, char** argv) {
+  int opt, error, c, i, flags, busy;
+  char *tail;
+  struct sdb_device sdb[10];
+  struct termios tc, old;
+  eb_status_t status;
+  eb_socket_t socket;
+  eb_device_t device;
+  eb_address_t tx, rx;
+  eb_data_t rx_data[BATCH_SIZE], tx_data, done;
+  eb_cycle_t cycle;
+  char byte;
+  
+  /* Default arguments */
+  program = argv[0];
+  error = 0;
+  i = -1;
+  
+  /* Process the command-line arguments */
+  error = 0;
+  while ((opt = getopt(argc, argv, "i:h")) != -1) {
+    switch (opt) {
+    case 'h':
+      help();
+      return 0;
+    case 'i':
+      i = strtol(optarg, &tail, 0);
+      if (*tail != 0) {
+        fprintf(stderr, "%s: specify a proper number, not '%s'!\n", program, optarg);
+        error = 1;
+      }
+      break;
+    case ':':
+    case '?':
+      error = 1;
+      break;
+    default:
+      fprintf(stderr, "%s: bad getopt result\n", program);
+      error = 1;
+    }
+  }
+  
+  if (error) return 1;
+  
+  if (optind + 1 != argc) {
+    fprintf(stderr, "%s: expecting three non-optional arguments: <proto/host/port>\n", program);
+    return 1;
+  }
+  
+  if ((status = eb_socket_open(EB_ABI_CODE, 0, EB_DATAX|EB_ADDRX, &socket)) != EB_OK)
+    die("eb_socket_open", status);
+  
+  if ((status = eb_device_open(socket, argv[optind], EB_DATAX|EB_ADDRX, 3, &device)) != EB_OK)
+    die(argv[optind], status);
+  
+  c = sizeof(sdb)/sizeof(struct sdb_device);
+  if ((status = eb_sdb_find_by_identity(device, CERN_ID, UART_ID, &sdb[0], &c)) != EB_OK)
+    die("eb_sdb_find_by_identity", status);
+  
+  if (i == -1) {
+    if (c != 1) {
+      fprintf(stderr, "%s: found %d UARTs on that device; pick one with -i #\n", program, c);
+      exit(1);
+    } else {
+      i = 0;
+    }
+  }
+  if (i >= c) {
+    fprintf(stderr, "%s: could not find UART #%d on that device (%d total)\n", program, i, c);
+    exit(1);
+  }
+  
+  printf("Connected to uart at address %"PRIx64"\n", sdb[i].sdb_component.addr_first);
+  tx = sdb[i].sdb_component.addr_first + VUART_TX;
+  rx = sdb[i].sdb_component.addr_first + VUART_RX;
+  
+  /* disable input buffering and echo */
+  tcgetattr(STDIN_FD, &old);
+  tcgetattr(STDIN_FD, &tc);
+  tc.c_cflag = B9600 | CS8 | CLOCAL | CREAD;
+  tc.c_iflag = IGNPAR;
+  tc.c_oflag = 0;
+  tc.c_lflag = 0;
+  tc.c_cc[VMIN]=1;
+  tc.c_cc[VTIME]=0;
+  tcflush(STDIN_FD, TCIFLUSH);
+  tcsetattr(STDIN_FD, TCSANOW, &tc);
+  
+  flags = fcntl(STDIN_FD, F_GETFL, 0);
+  flags |= O_NONBLOCK;
+  fcntl(STDIN_FD, F_SETFL, flags);
+  
+  /* be lazy and just poll for now */
+  busy = 0;
+  while (1) {
+    if (!busy) usleep(10000); /* 10ms */
+    
+    /* Poll for status */
+    eb_cycle_open(device, 0, eb_block, &cycle);
+    eb_cycle_read(cycle, rx, EB_BIG_ENDIAN|EB_DATA32, &rx_data[0]);
+    eb_cycle_read(cycle, tx, EB_BIG_ENDIAN|EB_DATA32, &done);
+    eb_cycle_close(cycle);
+    
+    /* Bulk read anything extra */
+    if ((rx_data[0] & 0x100) != 0) {
+      eb_cycle_open(device, 0, eb_block, &cycle);
+      for (i = 1; i < BATCH_SIZE; ++i)
+        eb_cycle_read(cycle, rx, EB_BIG_ENDIAN|EB_DATA32, &rx_data[i]);
+      eb_cycle_close(cycle);
+    
+      for (i = 0; i < BATCH_SIZE; ++i) {
+        if ((rx_data[i] & 0x100) == 0) continue;
+        byte = rx_data[i] & 0xFF;
+        fputc(byte, stdout);
+      }
+      fflush(stdout);
+    }
+    
+    busy = busy && (done & 0x100) == 0;
+    
+    if (!busy && read(STDIN_FD, &byte, 1) == 1) {
+      if (byte == 3) { /* control-C */
+        tcsetattr(STDIN_FD, TCSANOW, &old);
+        exit(0);
+      }
+      tx_data = byte;
+      eb_device_write(device, tx, EB_BIG_ENDIAN|EB_DATA32, tx_data, eb_block, 0);
+      busy = 1;
+    }
+  }
+  
+  return 0;
+}

tools/eb-info.c

+/** @file eb-info.c
+ *  @brief Report the contents of an FPGA using Etherbone.
+ *
+ *  Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH 
+ *
+ *  A complete skeleton of an application using the Etherbone library.
+ *
+ *  @author Wesley W. Terpstra <w.terpstra@gsi.de>
+ *
+ *******************************************************************************
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************
+ */
+
+#define _POSIX_C_SOURCE 200112L /* strtoull */
+
+#include <unistd.h> /* getopt */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <etherbone.h>
+
+#define GSI_ID	0x651
+#define ROM_ID	0x2d39fa8b
+
+const char *program;
+
+static void help(void) {
+  fprintf(stderr, "Usage: %s [OPTION] <proto/host/port>\n", program);
+  fprintf(stderr, "\n");
+  fprintf(stderr, "  -h             display this help and exit\n");
+  fprintf(stderr, "\n");
+  fprintf(stderr, "Report bugs to <w.terpstra@gsi.de>\n");
+}
+
+static void die(const char* msg, eb_status_t status) {
+  fprintf(stderr, "%s: %s: %s\n", program, msg, eb_status(status));
+  exit(1);
+}
+
+int main(int argc, char** argv) {
+  int opt, error, c, i, len;
+  struct sdb_device sdb;
+  eb_status_t status;
+  eb_socket_t socket;
+  eb_device_t device;
+  eb_cycle_t cycle;
+  eb_data_t *data;
+  
+  /* Default arguments */
+  program = argv[0];
+  error = 0;
+  
+  /* Process the command-line arguments */
+  error = 0;
+  while ((opt = getopt(argc, argv, "h")) != -1) {
+    switch (opt) {
+    case 'h':
+      help();
+      return 0;
+    case ':':
+    case '?':
+      error = 1;
+      break;
+    default:
+      fprintf(stderr, "%s: bad getopt result\n", program);
+      error = 1;
+    }
+  }
+  
+  if (error) return 1;
+  
+  if (optind + 1 != argc) {
+    fprintf(stderr, "%s: expecting three non-optional arguments: <proto/host/port>\n", program);
+    return 1;
+  }
+  
+  if ((status = eb_socket_open(EB_ABI_CODE, 0, EB_DATAX|EB_ADDRX, &socket)) != EB_OK)
+    die("eb_socket_open", status);
+  
+  if ((status = eb_device_open(socket, argv[optind], EB_DATAX|EB_ADDRX, 3, &device)) != EB_OK)
+    die(argv[optind], status);
+  
+  c = 1;
+  if ((status = eb_sdb_find_by_identity(device, GSI_ID, ROM_ID, &sdb, &c)) != EB_OK)
+    die("eb_sdb_find_by_identity", status);
+  if (c != 1) {
+    fprintf(stderr, "Found %d ROM identifiers on that device\n", c);
+    exit(1);
+  }
+  
+  if ((status = eb_cycle_open(device, 0, 0, &cycle)) != EB_OK)
+    die("eb_cycle_open", status);
+  
+  len = ((sdb.sdb_component.addr_last - sdb.sdb_component.addr_first) + 1) / 4;
+  if ((data = malloc(len * sizeof(eb_data_t))) == 0)
+    die("malloc", EB_OOM);
+  
+  for (i = 0; i < len; ++i)
+    eb_cycle_read(cycle, sdb.sdb_component.addr_first + i*4, EB_DATA32|EB_BIG_ENDIAN, &data[i]);
+  
+  if ((status = eb_cycle_close(cycle)) != EB_OK)
+    die("eb_cycle_close", status);
+  
+  for (i = 0; i < len; ++i) {
+    printf("%c%c%c%c", 
+      (char)(data[i] >> 24) & 0xff, 
+      (char)(data[i] >> 16) & 0xff, 
+      (char)(data[i] >>  8) & 0xff,
+      (char)(data[i]      ) & 0xff);
+  }
+  
+  return 0;
+}

tools/impact_cutewr

+#!/bin/sh
+
+# Downloads bitfile to an cutewr board in batch, using Impact from Xilinx ISE
+
+if [ ! -r "${1}" ]; then
+  echo "Usage: $0 filename.bit" >&2
+  exit 1
+fi
+
+set -e
+test -r $XILINX_SETTINGS && . $XILINX_SETTINGS
+test -d $XILINX
+
+# don't use -v switch to verify chip, since I don't create a .msk file.
+# See Xilinx Answer Record 22228.
+echo "
+setMode -bs
+setCable -port auto
+Identify
+assignFile -p 1 -file \"${1}\"
+Program -p 1 -e -parallel -master -internalClk -clkFreq 40 -defaultVersion 0
+quit" | impact -batch