Merge remote-tracking branch 'origin/pre-release' into misc-code-clea…

…n-up

Makefile

@@ -1,39 +1,30 @@
-# 
 # ----------------------------------------------------------------------------
-# Title      : drivers makefile
-# ----------------------------------------------------------------------------
-# File       : Makefile
-# Created    : 2016-08-08
+# Company    : SLAC National Accelerator Laboratory
 # ----------------------------------------------------------------------------
 # Description:
-# drivers makefile
+#    Example driver makefile
 # ----------------------------------------------------------------------------
-# This file is part of the rogue software package. It is subject to 
-# the license terms in the LICENSE.txt file found in the top-level directory 
-# of this distribution and at: 
-#    https://confluence.slac.stanford.edu/display/ppareg/LICENSE.html. 
-# No part of the rogue software package, including this file, may be 
-# copied, modified, propagated, or distributed except according to the terms 
+# This file is part of the aes_stream_drivers package. It is subject to
+# the license terms in the LICENSE.txt file found in the top-level directory
+# of this distribution and at:
+#    https://confluence.slac.stanford.edu/display/ppareg/LICENSE.html.
+# No part of the aes_stream_drivers package, including this file, may be
+# copied, modified, propagated, or distributed except according to the terms
 # contained in the LICENSE.txt file.
 # ----------------------------------------------------------------------------
-# 
+
 MAKE_HOME := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 ARCH ?= arm
 LOC_VERS := $(wildcard /lib/modules/*/build)
 LOC_VERS := $(patsubst %/,%,$(dir $(LOC_VERS)))
 LOC_VERS := $(notdir $(LOC_VERS))
-RCE_DIRS := /afs/slac/g/cci/volumes/vol1/xilinx/linux-xlnx-v2015.2.03
-RCE_DIRS += /afs/slac/g/cci/volumes/vol1/xilinx/linux-xlnx-v2016.4
-RCE_DIRS += /afs/slac/g/cci/volumes/vol1/xilinx/backup/linux-xlnx-v2016.1.01
+RCE_DIRS := /afs/slac.stanford.edu/g/cci/volumes/vol1/xilinx/linux-xlnx-v2016.4
+RCE_DIRS += /afs/slac.stanford.edu/g/cci/volumes/vol1/xilinx/backup/linux-xlnx-v2016.1.01
 
-all: 
+all:
 	@echo "Options: app driver rce"
 
 app:
-	@make -C $(MAKE_HOME)/exo_tem/app clean
-	@make -C $(MAKE_HOME)/exo_tem/app
-	@make -C $(MAKE_HOME)/pgpcard/app clean
-	@make -C $(MAKE_HOME)/pgpcard/app
 	@make -C $(MAKE_HOME)/rce_stream/app clean
 	@make -C $(MAKE_HOME)/rce_stream/app
 	@make -C $(MAKE_HOME)/data_dev/app clean
@@ -43,12 +34,6 @@ driver:
 	@mkdir -p $(MAKE_HOME)/install;
 	@ $(foreach ver,$(LOC_VERS), \
 		mkdir -p $(MAKE_HOME)/install/$(ver); \
-		make -C $(MAKE_HOME)/exo_tem/driver KVER=$(ver) clean; \
-		make -C $(MAKE_HOME)/exo_tem/driver KVER=$(ver); \
-		scp $(MAKE_HOME)/exo_tem/driver/*.ko $(MAKE_HOME)/install/$(ver); \
-		make -C $(MAKE_HOME)/pgpcard/driver KVER=$(ver) clean; \
-		make -C $(MAKE_HOME)/pgpcard/driver KVER=$(ver); \
-		scp $(MAKE_HOME)/pgpcard/driver/*.ko $(MAKE_HOME)/install/$(ver); \
 		make -C $(MAKE_HOME)/data_dev/driver KVER=$(ver) clean; \
 		make -C $(MAKE_HOME)/data_dev/driver KVER=$(ver); \
 		scp $(MAKE_HOME)/data_dev/driver/*.ko $(MAKE_HOME)/install/$(ver); \
@@ -65,4 +50,3 @@ rce:
 		make -C $(MAKE_HOME)/rce_memmap/driver KDIR=$(d); \
 		scp $(MAKE_HOME)/rce_memmap/driver/*.ko $(MAKE_HOME)/install/$(shell make -C $(d) -s kernelversion).$(ARCH)/; \
 	)
-

README.md

@@ -1,6 +1,6 @@
 # aes-stream-drivers
 
-Common repository for streaming kernel drivers (PGP, AxiStream, ExoTem)
+Common repository for streaming kernel drivers (datadev, gpuDirect, petalinux, etc)
 
 <!--- ########################################################################################### -->
 
@@ -24,18 +24,10 @@ Contains driver and application code for TID-AIR generic DAQ PCIe cards with Dir
 
 options datagpu cfgTxCount=1024 cfgRxCount=1024 cfgSize=131072 cfgMode=1 cfgCont=1
 
-#### exo_tem/
-
-Contains driver and application code for EXO TEM.
-
 #### include/
 
 Contains top level application include files for all drivers
 
-#### pgpcard/
-
-Contains driver and application code for the pgpcard
-
 #### rce_hp_buffers/
 
 Contains driver that allocates memory blocks for use in a pure firmware dma engine
@@ -48,7 +40,7 @@ Contains driver and application code for the RCE AXI stream DMA
 
 # How to build the non-RCE drivers
 
-```
+```bash
 # Go to the base directory
 $ cd aes-stream-drivers
 
@@ -63,7 +55,7 @@ $ make app
 
 # How to build the RCE drivers
 
-```
+```bash
 # Go to the base directory
 $ cd aes-stream-drivers