Merge pull request #46 in PROCESSOR-SDK/pruss-lld from PLSDK-2012 to master

* commit '9c965e561873db12ea3ebc11b7d3a4d9f8cd2520':
  sorte: firmware: master: add timeout in receiving param frames
  sorte: firmware: master: fix the way of testing an active link using mdio
  linux unit test: use UIO_INTERRUPT_ONE_SHOT_MODE define in makefile
  sorte: porting to linux user space

9 files changed, 436 insertions, 23 deletions

diff --git a/example/apps/sorte/firmware/src/master/firm_main.asm b/example/apps/sorte/firmware/src/master/firm_main.asm
index 7793ef0..353f38f 100644
--- a/example/apps/sorte/firmware/src/master/firm_main.asm
+++ b/example/apps/sorte/firmware/src/master/firm_main.asm
@@ -135,12 +135,10 @@ firm_main:
 

 ; starting with idle state

 ; test if there is an active link on the port using mdio interface

-

-; test if there is an active link on the port using mdio interface

-    lbco    &TEMP_REG_2.b0, ICSS_SHARED_RAM_CONST, MDIO_PHY_CONFIG_OFFSET, 1

 IDLE_WAIT_FOR_LINK_ACTIVE:

+    lbco    &TEMP_REG_2.b0, ICSS_SHARED_RAM_CONST, MDIO_PHY_CONFIG_OFFSET, 1

     lbco    &TEMP_REG_1, ICSS_MDIO_CONST, ICSS_MDIO_LINK, 4

-    qbbc    IDLE_WAIT_FOR_LINK_ACTIVE, TEMP_REG_1.b0, TEMP_REG_2.b0

+    qbbc    IDLE_WAIT_FOR_LINK_ACTIVE, TEMP_REG_1, TEMP_REG_2.b0

 

 ; check if enabled, enabling done at startup of pru firmware.

        lbco    &TEMP_REG_1.b0, PRU0_DMEM_CONST, CTRL_REG_OFFSET , 1

@@ -461,11 +459,17 @@ STATE_PARAM_SEND:
 ; end packet with crc generated by PRU

     M_CMD16 D_PUSH_CRC_MSWORD_CMD | D_PUSH_CRC_LSWORD_CMD | D_TX_EOF

 

+    ldi        R2.w0, 0

+    ldi        R2.w2, 1000

 ; receive packet and check if all accepted

 STATE_PARAM_WAIT_BANK0:

+    add        R2.w0, R2.w0, 1

     xin        RXL2_BANK0, &R18, 1

+    qbeq    STATE_PARAM_WAIT, R2.w0, R2.w2

     qbgt    STATE_PARAM_WAIT_BANK0, r18.b0, 32

 

+   

+

     xin        RXL2_BANK0, &r2, 32+16

 

 ; received packet has PA?

@@ -488,6 +492,7 @@ STATE_PARAM_PA_CONT:
 ;    qba        STATE_DISCOVERY

 STATE_PARAM_RCV_OK:

 

+    sub        TEMP_REG_4.b0,TEMP_REG_4.b0,1

 ;  todo: read and verify rest of packet

 ;  wait for end of 1 ms period

 STATE_PARAM_WAIT:

@@ -495,7 +500,6 @@ STATE_PARAM_WAIT:
     lbbo     &PRU_CC_REG, r27, 0x0c , 4

     qblt    STATE_PARAM_WAIT, TEMP_REG_1, PRU_CC_REG

 

-    sub        TEMP_REG_4.b0,TEMP_REG_4.b0,1

     qbne    STATE_PARAM_ITERATION,TEMP_REG_4.b0, 0

 

 

diff --git a/example/apps/sorte/master/makefile_armv7 b/example/apps/sorte/master/makefile_armv7
new file mode 100644
index 0000000..0e3ee75
--- /dev/null
+++ b/example/apps/sorte/master/makefile_armv7
@@ -0,0 +1,151 @@
+#
+# Macro definitions referenced below
+#
+
+empty =
+space =$(empty) $(empty)
+
+ARMV7OBJDIR ?= ./obj/$(DEVICE)
+ARMV7BINDIR ?= ./bin/$(DEVICE)
+ARMV7LIBDIR ?= ./lib
+
+ARMV7OBJDIR := $(ARMV7OBJDIR)/pruss/example/apps/sorte/master
+ARMV7BINDIR := $(ARMV7BINDIR)/pruss/example/apps/sorte/master
+
+#Cross tools
+ifdef CROSS_TOOL_INSTALL_PATH
+# Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+# INCLUDE Directories
+PRUSS_INC_DIR = $(PDK_INSTALL_PATH)/ti/drv/pruss
+
+PRUSS_SRC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/pruss
+PRUSS_TEST_DIR = $(PRUSS_SRC_DIR)/test
+PRUSS_EXAMPLE_SORTE_DIR = $(PRUSS_SRC_DIR)/example/apps/sorte
+PRUSS_ARM_LIN_TEST_DIR = $(PRUSS_TEST_DIR)/src/armv7/linux
+PRUSS_DEVICE_DIR = $(PRUSS_SRC_DIR)/soc/$(DEVICE)
+
+INCDIR := $(PDK_INSTALL_PATH);$(PRUSS_INC_DIR);$(PRUSS_EXAMPLE_SORTE_DIR)/src;$(PRUSS_ARM_LIN_TEST_DIR);$(PRUSS_DEVICE_DIR);$(PRUSS_SRC_DIR)/../../..
+
+# Libraries
+PRUSS_LIB = -lpruss
+OSAL_LIB = -L $(PDK_INSTALL_PATH)/ti/osal/lib/linux -losal
+
+
+FW_LNK_CMD_REV1 = $(PDK_PKG_PATH)/ti/build/pruss/lnk_a8_a9_a15_REV1_linux.cmd
+FW_LNK_CMD_REV2 = $(PDK_PKG_PATH)/ti/build/pruss/lnk_a8_a9_a15_REV2_linux.cmd
+FW_BIN_PATH_A15 = $(PDK_PKG_PATH)/ti/drv/pruss/example/apps/sorte/firmware/bin/$(DEVICE)/a15_0/REV2
+FW_BIN_PATH_A9 = $(PDK_PKG_PATH)/ti/drv/pruss/example/apps/sorte/firmware/bin/$(DEVICE)/a9host/REV1
+FW_BIN_PATH_A8 = $(PDK_PKG_PATH)/ti/drv/pruss/example/apps/sorte/firmware/bin/$(DEVICE)/a8host/REV1
+
+ifeq ($(DEVICE), am571x)
+  TARGET = SOC_AM571x
+  BOARD = idkAM571x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_master_PRU0.bin
+endif
+
+ifeq ($(DEVICE), am572x)
+  TARGET = SOC_AM572x
+  BOARD = idkAM572x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_master_PRU0.bin
+endif
+
+ifeq ($(DEVICE), am574x)
+  TARGET = SOC_AM574x
+  BOARD = idkAM574x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_master_PRU0.bin
+endif
+
+ifeq ($(DEVICE), am335x)
+  TARGET = SOC_AM335x
+  BOARD = icev2AM335x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV1)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A8)/sorte_master_PRU0.bin
+endif
+
+ifeq ($(DEVICE), am437x)
+  TARGET = SOC_AM437x
+  BOARD = idkAM437x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV1)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A9)/sorte_master_PRU0.bin
+endif
+
+ifeq ($(DEVICE), k2g)
+  TARGET = SOC_K2G
+  BOARD = iceK2G
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_master_PRU0.bin
+endif
+
+ifeq ($(USEDYNAMIC_LIB), yes)
+#presuming ARM executable would depend on dynamic library dependency
+EXE_EXTN = _so
+LIBS     = $(PRUSS_LIB) $(OSAL_LIB)
+else
+#forcing ARM executable to depend on static LLD libraries
+EXE_EXTN =
+LIBS     = -Wl,-Bstatic $(PRUSS_LIB) $(OSAL_LIB) -Wl,-Bdynamic
+endif
+
+
+# Compiler options
+INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${BOARD} -D${TARGET} -DUIO_INTERRUPT_ONE_SHOT_MODE -DSORTE_MASTER
+
+# Linker options
+INTERNALLINKDEFS = -Wl,--start-group -L $(ARMV7LIBDIR) $(LIBS) -lrt -Wl,--end-group -pthread $(LDFLAGS)
+
+MAIN_TEST_EXE=pruss_app_sorte_master$(EXE_EXTN).out
+
+OBJEXT = o
+
+SRCDIR = $(PRUSS_EXAMPLE_SORTE_DIR)/src:$(PRUSS_ARM_LIN_TEST_DIR):$(PRUSS_DEVICE_DIR):
+
+INCS = -I. -I$(strip $(subst ;, -I,$(INCDIR)))
+
+VPATH=$(SRCDIR)
+
+#List the Source Files
+OSAL_TEST_SRC = \
+        mmap_helper.c \
+        pruicss_soc.c
+
+MAIN_TEST_SRC = \
+        main.c
+
+# FLAGS for the SourceFiles
+SRC_CFLAGS = -I. $(CFLAGS)
+
+# Make Rule for the SRC Files
+OSAL_TEST_SRC_OBJS = $(patsubst %.c, $(ARMV7OBJDIR)/%.$(OBJEXT), $(OSAL_TEST_SRC))
+MAIN_TEST_SRC_OBJS = $(patsubst %.c, $(ARMV7OBJDIR)/%.$(OBJEXT), $(MAIN_TEST_SRC))
+
+all:$(ARMV7BINDIR)/$(MAIN_TEST_EXE)
+
+$(ARMV7BINDIR)/$(MAIN_TEST_EXE): $(MAIN_TEST_SRC_OBJS) $(OSAL_TEST_SRC_OBJS) $(ARMV7BINDIR)/.created
+        @echo linking $(MAIN_TEST_SRC_OBJS) $(OSAL_TEST_SRC_OBJS) ${FW_LIB_PRU0} ${FW_LNK_CMD} into $@ ...
+        @$(CC) $(MAIN_TEST_SRC_OBJS) $(OSAL_TEST_SRC_OBJS) ${FW_LIB_PRU0} ${FW_LNK_CMD} $(INTERNALLINKDEFS) -o $@
+
+$(ARMV7OBJDIR)/%.$(OBJEXT): %.c $(ARMV7OBJDIR)/.created
+        @echo compiling $< ...
+        @$(CC) -c $(SRC_CFLAGS) $(INTERNALDEFS) $(INCS)  $< -o $@
+
+$(ARMV7OBJDIR)/.created:
+        @mkdir -p $(ARMV7OBJDIR)
+        @touch $(ARMV7OBJDIR)/.created
+
+$(ARMV7BINDIR)/.created:
+        @mkdir -p $(ARMV7BINDIR)
+        @touch $(ARMV7BINDIR)/.created
+
+clean:
+        @rm -fr $(ARMV7OBJDIR)
+        @rm -fr $(ARMV7BINDIR)
+
diff --git a/example/apps/sorte/slave/makefile_armv7 b/example/apps/sorte/slave/makefile_armv7
new file mode 100644
index 0000000..7172a10
--- /dev/null
+++ b/example/apps/sorte/slave/makefile_armv7
@@ -0,0 +1,157 @@
+#
+# Macro definitions referenced below
+#
+
+empty =
+space =$(empty) $(empty)
+
+ARMV7OBJDIR ?= ./obj/$(DEVICE)
+ARMV7BINDIR ?= ./bin/$(DEVICE)
+ARMV7LIBDIR ?= ./lib
+
+ARMV7OBJDIR := $(ARMV7OBJDIR)/pruss/example/apps/sorte/slave
+ARMV7BINDIR := $(ARMV7BINDIR)/pruss/example/apps/sorte/slave
+
+#Cross tools
+ifdef CROSS_TOOL_INSTALL_PATH
+# Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+# INCLUDE Directories
+PRUSS_INC_DIR = $(PDK_INSTALL_PATH)/ti/drv/pruss
+
+PRUSS_SRC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/pruss
+PRUSS_TEST_DIR = $(PRUSS_SRC_DIR)/test
+PRUSS_EXAMPLE_SORTE_DIR = $(PRUSS_SRC_DIR)/example/apps/sorte
+PRUSS_ARM_LIN_TEST_DIR = $(PRUSS_TEST_DIR)/src/armv7/linux
+PRUSS_DEVICE_DIR = $(PRUSS_SRC_DIR)/soc/$(DEVICE)
+
+INCDIR := $(PDK_INSTALL_PATH);$(PRUSS_INC_DIR);$(PRUSS_EXAMPLE_SORTE_DIR)/src;$(PRUSS_ARM_LIN_TEST_DIR);$(PRUSS_DEVICE_DIR);$(PRUSS_SRC_DIR)/../../..
+
+# Libraries
+PRUSS_LIB = -lpruss
+OSAL_LIB = -L $(PDK_INSTALL_PATH)/ti/osal/lib/linux -losal
+
+
+FW_LNK_CMD_REV1 = $(PDK_PKG_PATH)/ti/build/pruss/lnk_a8_a9_a15_REV1_linux.cmd
+FW_LNK_CMD_REV2 = $(PDK_PKG_PATH)/ti/build/pruss/lnk_a8_a9_a15_REV2_linux.cmd
+FW_BIN_PATH_A15 = $(PDK_PKG_PATH)/ti/drv/pruss/example/apps/sorte/firmware/bin/$(DEVICE)/a15_0/REV2
+FW_BIN_PATH_A9 = $(PDK_PKG_PATH)/ti/drv/pruss/example/apps/sorte/firmware/bin/$(DEVICE)/a9host/REV1
+FW_BIN_PATH_A8 = $(PDK_PKG_PATH)/ti/drv/pruss/example/apps/sorte/firmware/bin/$(DEVICE)/a8host/REV1
+
+ifeq ($(DEVICE), am571x)
+  TARGET = SOC_AM571x
+  BOARD = idkAM571x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_slave_PRU0.bin
+  FW_LIB_PRU1 = $(FW_BIN_PATH_A15)/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(DEVICE), am572x)
+  TARGET = SOC_AM572x
+  BOARD = idkAM572x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_slave_PRU0.bin
+  FW_LIB_PRU1 = $(FW_BIN_PATH_A15)/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(DEVICE), am574x)
+  TARGET = SOC_AM574x
+  BOARD = idkAM574x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_slave_PRU0.bin
+  FW_LIB_PRU1 = $(FW_BIN_PATH_A15)/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(DEVICE), am335x)
+  TARGET = SOC_AM335x
+  BOARD = icev2AM335x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV1)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A8)/sorte_slave_PRU0.bin
+  FW_LIB_PRU1 = $(FW_BIN_PATH_A8)/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(DEVICE), am437x)
+  TARGET = SOC_AM437x
+  BOARD = idkAM437x
+  FW_LNK_CMD = $(FW_LNK_CMD_REV1)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A9)/sorte_slave_PRU0.bin
+  FW_LIB_PRU1 = $(FW_BIN_PATH_A9)/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(DEVICE), k2g)
+  TARGET = SOC_K2G
+  BOARD = iceK2G
+  FW_LNK_CMD = $(FW_LNK_CMD_REV2)
+  FW_LIB_PRU0 = $(FW_BIN_PATH_A15)/sorte_slave_PRU0.bin
+  FW_LIB_PRU1 = $(FW_BIN_PATH_A15)/sorte_slave_PRU1.bin
+endif
+
+ifeq ($(USEDYNAMIC_LIB), yes)
+#presuming ARM executable would depend on dynamic library dependency
+EXE_EXTN = _so
+LIBS     = $(PRUSS_LIB) $(OSAL_LIB)
+else
+#forcing ARM executable to depend on static LLD libraries
+EXE_EXTN =
+LIBS     = -Wl,-Bstatic $(PRUSS_LIB) $(OSAL_LIB) -Wl,-Bdynamic
+endif
+
+
+# Compiler options
+INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${BOARD} -D${TARGET} -DUIO_INTERRUPT_ONE_SHOT_MODE -DSORTE_SLAVE
+
+# Linker options
+INTERNALLINKDEFS = -Wl,--start-group -L $(ARMV7LIBDIR) $(LIBS) -lrt -Wl,--end-group -pthread $(LDFLAGS)
+
+MAIN_TEST_EXE=pruss_app_sorte_slave$(EXE_EXTN).out
+
+OBJEXT = o
+
+SRCDIR = $(PRUSS_EXAMPLE_SORTE_DIR)/src:$(PRUSS_ARM_LIN_TEST_DIR):$(PRUSS_DEVICE_DIR):
+
+INCS = -I. -I$(strip $(subst ;, -I,$(INCDIR)))
+
+VPATH=$(SRCDIR)
+
+#List the Source Files
+OSAL_TEST_SRC = \
+        mmap_helper.c \
+        pruicss_soc.c
+
+MAIN_TEST_SRC = \
+        main.c
+
+# FLAGS for the SourceFiles
+SRC_CFLAGS = -I. $(CFLAGS)
+
+# Make Rule for the SRC Files
+OSAL_TEST_SRC_OBJS = $(patsubst %.c, $(ARMV7OBJDIR)/%.$(OBJEXT), $(OSAL_TEST_SRC))
+MAIN_TEST_SRC_OBJS = $(patsubst %.c, $(ARMV7OBJDIR)/%.$(OBJEXT), $(MAIN_TEST_SRC))
+
+all:$(ARMV7BINDIR)/$(MAIN_TEST_EXE)
+
+$(ARMV7BINDIR)/$(MAIN_TEST_EXE): $(MAIN_TEST_SRC_OBJS) $(OSAL_TEST_SRC_OBJS) $(ARMV7BINDIR)/.created
+        @echo linking $(MAIN_TEST_SRC_OBJS) $(OSAL_TEST_SRC_OBJS) ${FW_LIB_PRU0} ${FW_LIB_PRU1} ${FW_LNK_CMD} into $@ ...
+        @$(CC) $(MAIN_TEST_SRC_OBJS) $(OSAL_TEST_SRC_OBJS) ${FW_LIB_PRU0} ${FW_LIB_PRU1} ${FW_LNK_CMD} $(INTERNALLINKDEFS) -o $@
+
+$(ARMV7OBJDIR)/%.$(OBJEXT): %.c $(ARMV7OBJDIR)/.created
+        @echo compiling $< ...
+        @$(CC) -c $(SRC_CFLAGS) $(INTERNALDEFS) $(INCS)  $< -o $@
+
+$(ARMV7OBJDIR)/.created:
+        @mkdir -p $(ARMV7OBJDIR)
+        @touch $(ARMV7OBJDIR)/.created
+
+$(ARMV7BINDIR)/.created:
+        @mkdir -p $(ARMV7BINDIR)
+        @touch $(ARMV7BINDIR)/.created
+
+clean:
+        @rm -fr $(ARMV7OBJDIR)
+        @rm -fr $(ARMV7BINDIR)
+
diff --git a/example/apps/sorte/src/main.c b/example/apps/sorte/src/main.c
index 9e7f81b..768fcce 100644
--- a/example/apps/sorte/src/main.c
+++ b/example/apps/sorte/src/main.c
@@ -42,6 +42,12 @@
 
 #include <string.h>
 
+#ifdef __LINUX_USER_SPACE
+#include <sys/mman.h>
+#include <stdint.h>
+#include <unistd.h>
+#include "mmap_helper.h"
+#else
 #include <xdc/std.h>
 #include <xdc/runtime/System.h>
 #include <xdc/runtime/Error.h>
@@ -53,6 +59,7 @@
 #include <ti/sysbios/BIOS.h>
 #include <ti/sysbios/knl/Task.h>
 
+#endif
 
 #include <ti/csl/hw_types.h>
 
@@ -64,11 +71,25 @@
 
 #include <ti/csl/src/ip/mdio/V2/cslr_mdio.h>
 
+#ifdef __LINUX_USER_SPACE
+/* ICSS EMAC  PHY address definitions */
+#define BOARD_ICSS_EMAC_PORT0_PHY_ADDR       (0U)
+#if defined(icev2AM335x)
+#define BOARD_ICSS_EMAC_PORT1_PHY_ADDR       (3U)
+#elif defined(idkAM437x) || defined(idkAM571x) || defined(idkAM572x) || defined(iceK2G) || defined(idkAM574x)
+#define BOARD_ICSS_EMAC_PORT1_PHY_ADDR       (1U)
+#endif
+#if defined(iceK2G)
+#define BOARD_ICSS_EMAC_PORT2_PHY_ADDR       (2U)
+#define BOARD_ICSS_EMAC_PORT3_PHY_ADDR       (3U)
+#endif
+#else
 #include <ti/board/board.h>
 
 #include <ti/drv/uart/UART.h>
 #include <ti/drv/uart/UART_stdio.h>
 
+#endif
 
 #include <ti/drv/pruss/soc/pruicss_v1.h>
 #include <ti/drv/pruss/example/apps/sorte/src/ti_pruss_intc_mapping.h>
@@ -104,6 +125,36 @@ uint32_t sorteDeviceType = SORTE_MASTER_DEVICE;
 uint32_t sorteDeviceType = SORTE_SLAVE_DEVICE;
 #endif
 
+#ifdef __LINUX_USER_SPACE
+tprussdrv *pruss_drv_handle;
+PRUICSS_HwAttrs linux_prussHwAttrs[PRUICCSS_INSTANCE_MAX-1];
+PRUICSS_V1_Object linux_prussObjects[PRUICCSS_INSTANCE_MAX-1];
+PRUICSS_Config linux_pruss_config[PRUICCSS_INSTANCE_MAX] = {
+                {
+                        &(linux_prussObjects[0]),
+                        &(linux_prussHwAttrs[0])
+                },
+                {
+                        &(linux_prussObjects[1]),
+                        &(linux_prussHwAttrs[1])
+                },
+                {NULL, NULL}
+        };
+
+static inline void linux_sleep_ms(unsigned long ms) {
+    struct timespec ts;
+    ts.tv_sec = (ms)/1000;
+    ms = ms - ts.tv_sec*1000;
+    ts.tv_nsec = (ms*1000000);
+    nanosleep(&ts, NULL);
+}
+#define SLEEP(t) linux_sleep_ms(t)
+#define PRINT printf
+#else
+#define SLEEP Task_sleep
+#define PRINT UART_printf
+#endif
+
 void prussAppSorteInitCrc8Table(void);
 void prussAppSorteRestartMaster(void);
 void prussAppSorteDrvInit(void);
@@ -272,7 +323,7 @@ HWREG(hwAttrs->prussSharedDramBase+ CSL_MDIO_CONTROL_REG) = (uint32_t) \
         (0<<16) | \
         (0<<24));
 /*Enable MDIO link interrupts for pru-icss PHY's, clear any pending interrupt */
-UART_printf("PHY2: %d, PHY3: %d\n", BOARD_ICSS_EMAC_PORT2_PHY_ADDR, BOARD_ICSS_EMAC_PORT3_PHY_ADDR);
+PRINT("PHY2: %d, PHY3: %d\n", BOARD_ICSS_EMAC_PORT2_PHY_ADDR, BOARD_ICSS_EMAC_PORT3_PHY_ADDR);
 HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERPHYSEL0) = 0x40 | BOARD_ICSS_EMAC_PORT2_PHY_ADDR; 
 HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERPHYSEL1) = 0x40 | BOARD_ICSS_EMAC_PORT3_PHY_ADDR; 
 HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERINTMASKED) = (1<<BOARD_ICSS_EMAC_PORT2_PHY_ADDR) | (1<<BOARD_ICSS_EMAC_PORT3_PHY_ADDR); 
@@ -284,7 +335,7 @@ HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERINTMASKED) = (1<<BOARD_
             (0<<16) | \
             (0<<24));
     /*Enable MDIO link interrupts for pru-icss PHY's, clear any pending interrupt */
-    UART_printf("PHY0: %d, PHY1: %d\n", BOARD_ICSS_EMAC_PORT0_PHY_ADDR, BOARD_ICSS_EMAC_PORT1_PHY_ADDR);
+    PRINT("PHY0: %d, PHY1: %d\n", BOARD_ICSS_EMAC_PORT0_PHY_ADDR, BOARD_ICSS_EMAC_PORT1_PHY_ADDR);
     HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERPHYSEL0) = 0x40 | BOARD_ICSS_EMAC_PORT0_PHY_ADDR; 
     HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERPHYSEL1) = 0x40 | BOARD_ICSS_EMAC_PORT1_PHY_ADDR; 
     HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERINTMASKED) = (1<<BOARD_ICSS_EMAC_PORT0_PHY_ADDR) | (1<<BOARD_ICSS_EMAC_PORT1_PHY_ADDR); 
@@ -306,8 +357,11 @@ HWREG(hwAttrs->prussMiiMdioRegBase + CSL_ICSSMIIMDIO_USERINTMASKED) = (1<<BOARD_
  *  @retval
  *      none
  */
-
+#ifdef __LINUX_USER_SPACE
+void *sorteTaskPRU(void *a0)
+#else
 void sorteTaskPRU(UArg a0, UArg a1)
+#endif
 {
     PRUICSS_HwAttrs      const    *hwAttrs = pruIcss1Handle->hwAttrs;
 
@@ -316,7 +370,7 @@ void sorteTaskPRU(UArg a0, UArg a1)
     PRUICSS_pruDisable(pruIcss1Handle, PRUICCSS_PRU0);
     PRUICSS_pruDisable(pruIcss1Handle, PRUICCSS_PRU1);
 
-    UART_printf("\n\rTI SORTE Demo Application\n");
+    PRINT("\n\rTI SORTE Demo Application\n");
 
     PRUICSS_IntcInitData pruss_intc_initdata = PRUSS_INTC_INITDATA;
     PRUICSS_pruIntcInit(pruIcss1Handle, &pruss_intc_initdata);
@@ -340,16 +394,16 @@ void sorteTaskPRU(UArg a0, UArg a1)
                                    &pru_imem0_rev1_end - &pru_imem0_rev1_start);
 #endif
         PRUICSS_pruEnable(pruIcss1Handle, PRUICCSS_PRU0);
-        Task_sleep(1000);
+        SLEEP(1000);
         /* check to see if there are atleast 2 slaves  before downloading firmware */
         while((HW_RD_REG16(hwAttrs->prussPru0DramBase + SORTE_DISCOV_NUM_SLAVE_OFFSET)) <SORTE_MIN_NUM_SLAVE_DEVICES)
         {
-            UART_printf("sorte master: waiting for atleast 2 SLAVE devices connected\n");
+            PRINT("sorte master: waiting for atleast 2 SLAVE devices connected\n");
             prussAppSorteRestartMaster();
-            Task_sleep(1000);
+            SLEEP(1000);
             
         }
-        UART_printf("sorte master: 2 SLAVE devices connected\n");
+        PRINT("sorte master: 2 SLAVE devices connected\n");
     }
     else   /* slave device */
     {
@@ -379,16 +433,16 @@ void sorteTaskPRU(UArg a0, UArg a1)
             uint16_t rxPkts = HW_RD_REG16(hwAttrs->prussSharedDramBase + SORTE_RX_NO_CRC_ERR_PKT_OFFSET);
             if(rxPkts >= SORT_SLAVE_PASS_CRITERIA)
             {
-                UART_printf("sorte slave: receive packet count: %d\n", rxPkts);
-                UART_printf("All tests have passed\n");
+                PRINT("sorte slave: receive packet count: %d\n", rxPkts);
+                PRINT("All tests have passed\n");
                 break;
             }
             else
             {
-                UART_printf("sorte slave: test in progress: current receive packet count: %d\n", rxPkts);
+                PRINT("sorte slave: test in progress: current receive packet count: %d\n", rxPkts);
             }
         }
-        Task_sleep(1000);
+        SLEEP(1000);
     }
     while(1);
 }
@@ -396,6 +450,36 @@ void sorteTaskPRU(UArg a0, UArg a1)
 /*
  *  ======== main ========
  */
+#ifdef __LINUX_USER_SPACE
+int main(int argc, char **argv)
+{
+
+    PRUICSS_Config  *pruIcssCfg;
+    int status;
+    int priority = 20;
+    pthread_attr_t pthread_attr;
+    struct sched_param sched_param;
+    pthread_t sorte_task_th;
+
+    linux_init((void**)&pruss_drv_handle, linux_prussHwAttrs, pruIcssInstance);
+    pruIcssCfg = linux_pruss_config;
+
+    pruIcss1Handle = PRUICSS_create((PRUICSS_Config*) pruIcssCfg, pruIcssInstance);
+
+    pthread_attr_init(&pthread_attr);
+    sched_param.sched_priority = priority;
+    pthread_attr_setschedparam(&pthread_attr, &sched_param);
+
+    if ((status = pthread_create(&sorte_task_th, &pthread_attr, sorteTaskPRU, NULL))) {
+        printf("ERROR: \"sorteTaskPRU\" task-create failed (%d)\n", status);
+        return (-1);
+    }
+
+    pthread_join(sorte_task_th, NULL);
+
+    return(0);
+}
+#else // RTOS
 int main()
 { 
     Board_initCfg cfg;
@@ -416,7 +500,7 @@ int main()
     }
     else
     {
-        UART_printf("main: BOARD_init success\n");
+        PRINT("main: BOARD_init success\n");
     }
     ret  = PRUICSS_socGetInitCfg(&pruIcssCfg);
     if (ret  != PRUICSS_RETURN_SUCCESS)
@@ -435,5 +519,6 @@ int main()
     return(0);
 }
 
+#endif
 
 
diff --git a/makefile_armv7 b/makefile_armv7
index 64a80f8..eb8784d 100755
--- a/makefile_armv7
+++ b/makefile_armv7
@@ -49,7 +49,7 @@ export MAKE = make
 endif
 
 # PHONY Targets
-.PHONY: all clean lib tests install installbin .libraries .executables
+.PHONY: all clean lib tests apps install installbin installapp.libraries .executables
 
 # all rule
 all: .executables
@@ -62,6 +62,11 @@ lib: .libraries
 tests:
         @$(MAKE) -f ./test/$(DEVICE)/armv7/linux/makefile all
 
+#apps:
+apps:
+        @$(MAKE) -f ./example/apps/sorte/master/makefile_armv7 all
+        @$(MAKE) -f ./example/apps/sorte/slave/makefile_armv7 all
+
 # Make rule to create $(ARMV7LIBDIR)/libpruss.a library
 .libraries: $(ARMV7LIBDIR)/libpruss.a libpruss.so
 
@@ -85,6 +90,11 @@ installbin:
         install -d $(INSTALL_BIN_BASE_DIR)
         install -c -m 755 $(ARMV7BINDIR)/pruss/test/prussMainTest.out  $(INSTALL_BIN_BASE_DIR)/prussMainTest_$(DEVICE).out
 
+installapp:
+        install -d $(INSTALL_BIN_BASE_DIR)
+        install -c -m 755 $(ARMV7BINDIR)/pruss/example/apps/sorte/master/pruss_app_sorte_master.out  $(INSTALL_BIN_BASE_DIR)/pruss_app_sorte_master_$(DEVICE).out
+        install -c -m 755 $(ARMV7BINDIR)/pruss/example/apps/sorte/slave/pruss_app_sorte_slave.out  $(INSTALL_BIN_BASE_DIR)/pruss_app_sorte_slave_$(DEVICE).out
+
 install:
         install -d $(INSTALL_INC_BASE_DIR)/ti/drv/pruss/include
         install -d $(INSTALL_INC_BASE_DIR)/ti/drv/pruss/soc
diff --git a/test/am571x/armv7/linux/makefile b/test/am571x/armv7/linux/makefile
index edc5a52..3f5b0c2 100644
--- a/test/am571x/armv7/linux/makefile
+++ b/test/am571x/armv7/linux/makefile
@@ -47,7 +47,7 @@ endif
 
 
 # Compiler options
-INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${TARGET}
+INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${TARGET} -DUIO_INTERRUPT_ONE_SHOT_MODE
 
 # Linker options
 INTERNALLINKDEFS = -Wl,--start-group -L $(ARMV7LIBDIR) $(LIBS) -lrt -Wl,--end-group -pthread $(LDFLAGS)
diff --git a/test/am572x/armv7/linux/makefile b/test/am572x/armv7/linux/makefile
index edc5a52..3f5b0c2 100644
--- a/test/am572x/armv7/linux/makefile
+++ b/test/am572x/armv7/linux/makefile
@@ -47,7 +47,7 @@ endif
 
 
 # Compiler options
-INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${TARGET}
+INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${TARGET} -DUIO_INTERRUPT_ONE_SHOT_MODE
 
 # Linker options
 INTERNALLINKDEFS = -Wl,--start-group -L $(ARMV7LIBDIR) $(LIBS) -lrt -Wl,--end-group -pthread $(LDFLAGS)
diff --git a/test/am574x/armv7/linux/makefile b/test/am574x/armv7/linux/makefile
index edc5a52..3f5b0c2 100644
--- a/test/am574x/armv7/linux/makefile
+++ b/test/am574x/armv7/linux/makefile
@@ -47,7 +47,7 @@ endif
 
 
 # Compiler options
-INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${TARGET}
+INTERNALDEFS = $(DEBUG_FLAG) -D__ARMv7 -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -D_GNU_SOURCE -D${TARGET} -DUIO_INTERRUPT_ONE_SHOT_MODE
 
 # Linker options
 INTERNALLINKDEFS = -Wl,--start-group -L $(ARMV7LIBDIR) $(LIBS) -lrt -Wl,--end-group -pthread $(LDFLAGS)
diff --git a/test/src/armv7/linux/mmap_helper.c b/test/src/armv7/linux/mmap_helper.c
index 2a2f498..be16771 100644
--- a/test/src/armv7/linux/mmap_helper.c
+++ b/test/src/armv7/linux/mmap_helper.c
@@ -440,6 +440,7 @@ int prussdrv_open(void *prussdrv_handle, unsigned int pru_evtout_num)
             return PRUSSDRV_ERROR_OPEN_DISABLE_INTRPT;
     }
 
+#ifndef UIO_INTERRUPT_ONE_SHOT_MODE
         /* Enable interrupt */
         value = 1;
         ret = write(prussdrv_p->fd[pru_evtout_num], &value, sizeof(uint32_t));
@@ -449,6 +450,7 @@ int prussdrv_open(void *prussdrv_handle, unsigned int pru_evtout_num)
 #endif
         return PRUSSDRV_ERROR_OPEN_ENABLE_INTRPT;
     }
+#endif
 
         return 0;
     } else {
@@ -507,7 +509,7 @@ int prussdrv_pru_wait_event(void *prussdrv_handle, unsigned int pru_evtout_num)
     unsigned int *pruintc_io = (unsigned int *) prussdrv_p->intc_base;
     int ret;
 
-#if 1
+#ifdef UIO_INTERRUPT_ONE_SHOT_MODE
     /* This is needed only if the interrupt-mode is configured for one-shot mode */
     uint32_t value;
  
@@ -536,7 +538,11 @@ void linux_init(void **pruss_drv_handle_dptr, void *linux_prussInitCfg, int pru_
     int hwAttrs_index = pru_num - 1;
 
     //Initialize PRUSS UIO userspace
+#ifdef icev2AM335x
+    char *pru_dev_name = "pruss";
+#else
     char *pru_dev_name = (pru_num == 1 ? "pruss1" : "pruss2");
+#endif
     prussdrv_init(pruss_drv_handle_dptr, pru_dev_name);
     pruss_handle = *((tprussdrv **)pruss_drv_handle_dptr);