From 78dd040d9fd8d7ac6a8b32c4b6e023efe57d7301 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Mon, 19 Mar 2012 20:17:17 +0100
Subject: [PATCH] userspace: moved rtu_stat and test_rtu from
../on-switch-tests
---
on-switch-tests/rtu_stat/Makefile | 30 --------------
on-switch-tests/test_rtu/Makefile | 18 ---------
userspace/.gitignore | 2 +
userspace/Makefile | 2 +-
userspace/rtu_stat/Makefile | 40 +++++++++++++++++++
.../rtu_stat/rtu_stat.c | 0
userspace/test_rtu/Makefile | 21 ++++++++++
.../test_rtu/build.sh | 0
.../test_rtu/rtu_common.c | 0
.../test_rtu/rtu_hw.c | 0
.../test_rtu/rtu_hw.h | 0
.../test_rtu/rtu_sim.c | 0
.../test_rtu/rtu_sim.h | 0
.../test_rtu/rtu_test.c | 0
.../test_rtu/rtu_test_data.c | 0
.../test_rtu/rtu_test_main.c | 0
.../test_rtu/rtu_test_main.h | 0
.../test_rtu/wrsw_rtu.h | 0
18 files changed, 64 insertions(+), 49 deletions(-)
delete mode 100644 on-switch-tests/rtu_stat/Makefile
delete mode 100644 on-switch-tests/test_rtu/Makefile
create mode 100644 userspace/rtu_stat/Makefile
rename {on-switch-tests => userspace}/rtu_stat/rtu_stat.c (100%)
create mode 100644 userspace/test_rtu/Makefile
rename {on-switch-tests => userspace}/test_rtu/build.sh (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_common.c (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_hw.c (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_hw.h (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_sim.c (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_sim.h (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_test.c (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_test_data.c (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_test_main.c (100%)
rename {on-switch-tests => userspace}/test_rtu/rtu_test_main.h (100%)
rename {on-switch-tests => userspace}/test_rtu/wrsw_rtu.h (100%)
diff --git a/on-switch-tests/rtu_stat/Makefile b/on-switch-tests/rtu_stat/Makefile
deleted file mode 100644
index cd6bbb1b5..000000000
--- a/on-switch-tests/rtu_stat/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-include ../../../Makedefs
-
-CC=$(CROSS_COMPILE_ARM)gcc
-OBJS = rtu_stat.o
-LDFLAGS = -lswitchhw -L../../libswitchhw -L../../libwripc -L../../libptpnetif -lwripc -lptpnetif
-CFLAGS = -I. -O2 -I../../include -DDEBUG -I../../../kernel/include -I../../libptpnetif -I../../wrsw_hal -I../../libwripc -I../../wrsw_rtud -g
-OUTPUT = rtu_stat
-
-
-all: $(OBJS)
- make -C ../../libswitchhw
- ${CC} -o $(OUTPUT) $(OBJS) $(LDFLAGS)
-
-%.o: %.c
- ${CC} -c $^ $(CFLAGS)
-
-run: all
- - scp $(OUTPUT) root@192.168.1.16:/tmp
- - scp $(OUTPUT) root@192.168.1.13:/tmp
-
-
-install: all
- mkdir -p ../../rootfs_override/root/tests
- cp $(OUTPUT) ../../rootfs_override/root/tests
-
-clean:
- rm -f $(OUTPUT) $(OBJS)
-
-deploy: all
- scp $(OUTPUT) $(WR_INSTALL_ROOT)/bin
\ No newline at end of file
diff --git a/on-switch-tests/test_rtu/Makefile b/on-switch-tests/test_rtu/Makefile
deleted file mode 100644
index d1ede1d52..000000000
--- a/on-switch-tests/test_rtu/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CC=$(CROSS_COMPILE)gcc
-OBJS = rtu_sim.o rtu_hw.o rtu_test.o rtu_common.o rtu_test_data.o rtu_test_main.o
-LDFLAGS = -lswitchhw -L../../libswitchhw
-CFLAGS = -I. -O2 -I../../include -DDEBUG
-OUTPUT = rtu_sim
-
-all: $(OBJS)
- ${CC} -o $(OUTPUT) $(OBJS) $(LDFLAGS)
-
-%.o: %.c
- ${CC} -c $^ $(CFLAGS)
-
-run:: all
- scp $(OUTPUT) root@$(T):/tmp
- - ssh -t root@$(T) "/tmp/$(OUTPUT)"
-
-clean:
- rm -f $(OUTPUT) $(OBJS)
\ No newline at end of file
diff --git a/userspace/.gitignore b/userspace/.gitignore
index 82c682587..a133e0897 100644
--- a/userspace/.gitignore
+++ b/userspace/.gitignore
@@ -1,3 +1,5 @@
wrsw_hal/wrsw_hal
wrsw_rtud/wrsw_rtud
spll_dbg_proxy/spll_dbg_proxy
+wr_mon/wr_mon
+rtu_stat/rtu_stat
diff --git a/userspace/Makefile b/userspace/Makefile
index 4a23a2841..42f5468a3 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -15,7 +15,7 @@ WRDEV_DIR ?= $(WRS_BASE_DIR)/..
# subdirectories we want to compile
SUBDIRS = libswitchhw libwripc libptpnetif
SUBDIRS += wrsw_hal wrsw_rtud spll_dbg_proxy
-SUBDIRS += wr_mon #rtu_stat
+SUBDIRS += wr_mon rtu_stat #test_rtu
# all variables are exported
export
diff --git a/userspace/rtu_stat/Makefile b/userspace/rtu_stat/Makefile
new file mode 100644
index 000000000..c4dcab76e
--- /dev/null
+++ b/userspace/rtu_stat/Makefile
@@ -0,0 +1,40 @@
+# # Standard stanza for cross-compilation (courtesy of the linux makefile)
+AS = $(CROSS_COMPILE)as
+LD = $(CROSS_COMPILE)ld
+CC = $(CROSS_COMPILE)gcc
+CPP = $(CC) -E
+AR = $(CROSS_COMPILE)ar
+NM = $(CROSS_COMPILE)nm
+STRIP = $(CROSS_COMPILE)strip
+OBJCOPY = $(CROSS_COMPILE)objcopy
+OBJDUMP = $(CROSS_COMPILE)objdump
+
+OBJS = rtu_stat.o
+
+CFLAGS = -O2 -I../include -DDEBUG -I$(LINUX)/include -I../libptpnetif \
+ -I../wrsw_hal -I../libwripc -I../wrsw_rtud -g
+
+LDFLAGS = -L$(WR_INSTALL_ROOT)/lib -lptpnetif -lwripc -lswitchhw
+
+BINARY = rtu_stat
+
+
+all: $(BINARY)
+
+$(BINARY): $(OBJS)
+ ${CC} $^ $(LDFLAGS) -o $@
+
+clean:
+ rm -f $(BINARY) *.o *~
+
+install:
+ install -d $(WR_INSTALL_ROOT)/bin
+ install $(BINARY) $(WR_INSTALL_ROOT)/bin
+
+# local deprecated rules follow, don't use
+run: all
+ - scp $(BINARY) root@192.168.1.16:/tmp
+ - scp $(BINARY) root@192.168.1.13:/tmp
+
+deploy: all
+ scp $(BINARY) $(WR_INSTALL_ROOT)/bin
\ No newline at end of file
diff --git a/on-switch-tests/rtu_stat/rtu_stat.c b/userspace/rtu_stat/rtu_stat.c
similarity index 100%
rename from on-switch-tests/rtu_stat/rtu_stat.c
rename to userspace/rtu_stat/rtu_stat.c
diff --git a/userspace/test_rtu/Makefile b/userspace/test_rtu/Makefile
new file mode 100644
index 000000000..ccb46c0f4
--- /dev/null
+++ b/userspace/test_rtu/Makefile
@@ -0,0 +1,21 @@
+CC=$(CROSS_COMPILE)gcc
+
+WR_INSTALL_ROOT ?= $(WRS_OUTPUT_DIR)/images/wr
+
+OBJS = rtu_sim.o rtu_hw.o rtu_test.o rtu_common.o \
+ rtu_test_data.o rtu_test_main.o
+
+LDFLAGS = -L$(WR_INSTALL_ROOT)/lib -lswitchhw
+
+CFLAGS = -I. -O2 -I../include -DDEBUG
+BINARY = rtu_sim
+
+all: $(OBJS)
+ ${CC} -o $(BINARY) $(OBJS) $(LDFLAGS)
+
+clean:
+ rm -f $(BINARY) *.o *~
+
+install:
+ install -d $(WR_INSTALL_ROOT)/bin
+ install $(BINARY) $(WR_INSTALL_ROOT)/bin
diff --git a/on-switch-tests/test_rtu/build.sh b/userspace/test_rtu/build.sh
similarity index 100%
rename from on-switch-tests/test_rtu/build.sh
rename to userspace/test_rtu/build.sh
diff --git a/on-switch-tests/test_rtu/rtu_common.c b/userspace/test_rtu/rtu_common.c
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_common.c
rename to userspace/test_rtu/rtu_common.c
diff --git a/on-switch-tests/test_rtu/rtu_hw.c b/userspace/test_rtu/rtu_hw.c
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_hw.c
rename to userspace/test_rtu/rtu_hw.c
diff --git a/on-switch-tests/test_rtu/rtu_hw.h b/userspace/test_rtu/rtu_hw.h
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_hw.h
rename to userspace/test_rtu/rtu_hw.h
diff --git a/on-switch-tests/test_rtu/rtu_sim.c b/userspace/test_rtu/rtu_sim.c
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_sim.c
rename to userspace/test_rtu/rtu_sim.c
diff --git a/on-switch-tests/test_rtu/rtu_sim.h b/userspace/test_rtu/rtu_sim.h
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_sim.h
rename to userspace/test_rtu/rtu_sim.h
diff --git a/on-switch-tests/test_rtu/rtu_test.c b/userspace/test_rtu/rtu_test.c
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_test.c
rename to userspace/test_rtu/rtu_test.c
diff --git a/on-switch-tests/test_rtu/rtu_test_data.c b/userspace/test_rtu/rtu_test_data.c
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_test_data.c
rename to userspace/test_rtu/rtu_test_data.c
diff --git a/on-switch-tests/test_rtu/rtu_test_main.c b/userspace/test_rtu/rtu_test_main.c
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_test_main.c
rename to userspace/test_rtu/rtu_test_main.c
diff --git a/on-switch-tests/test_rtu/rtu_test_main.h b/userspace/test_rtu/rtu_test_main.h
similarity index 100%
rename from on-switch-tests/test_rtu/rtu_test_main.h
rename to userspace/test_rtu/rtu_test_main.h
diff --git a/on-switch-tests/test_rtu/wrsw_rtu.h b/userspace/test_rtu/wrsw_rtu.h
similarity index 100%
rename from on-switch-tests/test_rtu/wrsw_rtu.h
rename to userspace/test_rtu/wrsw_rtu.h
--
GitLab