From 4389885cf6662eb6d6f56bb89035fa930d0c8752 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Wed, 6 May 2020 20:47:39 +0800
Subject: [PATCH] Move usrsock_rpmsg from system to netutils folder

This is a more suitable location

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 {system => netutils}/usrsock_rpmsg/Kconfig             | 10 +++++-----
 {system => netutils}/usrsock_rpmsg/Make.defs           |  2 +-
 {system => netutils}/usrsock_rpmsg/Makefile            |  6 +++---
 {system => netutils}/usrsock_rpmsg/usrsock_rpmsg.h     |  8 ++++----
 .../usrsock_rpmsg/usrsock_rpmsg_client.c               |  2 +-
 .../usrsock_rpmsg/usrsock_rpmsg_server.c               |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename {system => netutils}/usrsock_rpmsg/Kconfig (73%)
 rename {system => netutils}/usrsock_rpmsg/Make.defs (97%)
 rename {system => netutils}/usrsock_rpmsg/Makefile (93%)
 rename {system => netutils}/usrsock_rpmsg/usrsock_rpmsg.h (94%)
 rename {system => netutils}/usrsock_rpmsg/usrsock_rpmsg_client.c (99%)
 rename {system => netutils}/usrsock_rpmsg/usrsock_rpmsg_server.c (99%)

diff --git a/system/usrsock_rpmsg/Kconfig b/netutils/usrsock_rpmsg/Kconfig
similarity index 73%
rename from system/usrsock_rpmsg/Kconfig
rename to netutils/usrsock_rpmsg/Kconfig
index 9f6a9de4d..66273bbfd 100644
--- a/system/usrsock_rpmsg/Kconfig
+++ b/netutils/usrsock_rpmsg/Kconfig
@@ -3,25 +3,25 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config SYSTEM_USRSOCK_RPMSG
+config NETUTILS_USRSOCK_RPMSG
 	tristate "RPMSG usrsock"
 	default n
 	depends on NET && OPENAMP
 	---help---
 		Enable usrsock through rpmsg channel.
 
-if SYSTEM_USRSOCK_RPMSG
+if NETUTILS_USRSOCK_RPMSG
 
-config SYSTEM_USRSOCK_RPMSG_PRIORITY
+config NETUTILS_USRSOCK_RPMSG_PRIORITY
 	int "usrsock task priority"
 	default 80
 	---help---
 		The priority for usrsock task.
 
-config SYSTEM_USRSOCK_RPMSG_STACKSIZE
+config NETUTILS_USRSOCK_RPMSG_STACKSIZE
 	int "usrsock task stack size"
 	default DEFAULT_TASK_STACKSIZE
 	---help---
 		The stack size allocated for the usrsock task.
 
-endif # SYSTEM_USRSOCK_RPMSG
+endif # NETUTILS_USRSOCK_RPMSG
diff --git a/system/usrsock_rpmsg/Make.defs b/netutils/usrsock_rpmsg/Make.defs
similarity index 97%
rename from system/usrsock_rpmsg/Make.defs
rename to netutils/usrsock_rpmsg/Make.defs
index 17e738e5c..e0df0c478 100644
--- a/system/usrsock_rpmsg/Make.defs
+++ b/netutils/usrsock_rpmsg/Make.defs
@@ -33,6 +33,6 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_SYSTEM_USRSOCK_RPMSG),y)
+ifeq ($(CONFIG_NETUTILS_USRSOCK_RPMSG),y)
 CONFIGURED_APPS += $(APPDIR)/system/usrsock_rpmsg
 endif
diff --git a/system/usrsock_rpmsg/Makefile b/netutils/usrsock_rpmsg/Makefile
similarity index 93%
rename from system/usrsock_rpmsg/Makefile
rename to netutils/usrsock_rpmsg/Makefile
index fb5f341a4..7f089ab74 100644
--- a/system/usrsock_rpmsg/Makefile
+++ b/netutils/usrsock_rpmsg/Makefile
@@ -36,14 +36,14 @@
 -include $(TOPDIR)/Make.defs
 
 PROGNAME = usrsock
-PRIORITY = CONFIG_SYSTEM_USRSOCK_RPMSG_PRIORITY
-STACKSIZE = CONFIG_SYSTEM_USRSOCK_RPMSG_STACKSIZE
+PRIORITY = CONFIG_NETUTILS_USRSOCK_RPMSG_PRIORITY
+STACKSIZE = CONFIG_NETUTILS_USRSOCK_RPMSG_STACKSIZE
 
 ifeq ($(CONFIG_NET_USRSOCK),y)
 MAINSRC := usrsock_rpmsg_client.c
 else
 MAINSRC := usrsock_rpmsg_server.c
 endif
-MODULE = $(CONFIG_SYSTEM_USRSOCK_RPMSG)
+MODULE = $(CONFIG_NETUTILS_USRSOCK_RPMSG)
 
 include $(APPDIR)/Application.mk
diff --git a/system/usrsock_rpmsg/usrsock_rpmsg.h b/netutils/usrsock_rpmsg/usrsock_rpmsg.h
similarity index 94%
rename from system/usrsock_rpmsg/usrsock_rpmsg.h
rename to netutils/usrsock_rpmsg/usrsock_rpmsg.h
index 3e0c86419..eb4f7458c 100644
--- a/system/usrsock_rpmsg/usrsock_rpmsg.h
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/system/usrsock_rpmsg/usrsock_rpmsg.h
+ * apps/netutils/usrsock_rpmsg/usrsock_rpmsg.h
  *
  *   Copyright (C) 2018 Pinecone Inc. All rights reserved.
  *   Author: Jianli Dong <dongjianli@pinecone.net>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SYSTEM_USRSOCK_RPMSG_H
-#define __SYSTEM_USRSOCK_RPMSG_H
+#ifndef __NETUTILS_USRSOCK_RPMSG_H
+#define __NETUTILS_USRSOCK_RPMSG_H
 
 /****************************************************************************
  * Included Files
@@ -63,4 +63,4 @@ begin_packed_struct struct usrsock_rpmsg_dns_event_s
   uint16_t addrlen;
 } end_packed_struct;
 
-#endif /* __SYSTEM_USRSOCK_RPMSG_H */
+#endif /* __NETUTILS_USRSOCK_RPMSG_H */
diff --git a/system/usrsock_rpmsg/usrsock_rpmsg_client.c b/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
similarity index 99%
rename from system/usrsock_rpmsg/usrsock_rpmsg_client.c
rename to netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
index 29c742d9c..407fa9783 100644
--- a/system/usrsock_rpmsg/usrsock_rpmsg_client.c
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/system/usrsock_rpmsg/usrsock_rpmsg_client.c
+ * apps/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
  * usrsock rpmsg client
  *
  *   Copyright (C) 2018 Pinecone Inc. All rights reserved.
diff --git a/system/usrsock_rpmsg/usrsock_rpmsg_server.c b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
similarity index 99%
rename from system/usrsock_rpmsg/usrsock_rpmsg_server.c
rename to netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
index a789e1e5e..a15f42553 100644
--- a/system/usrsock_rpmsg/usrsock_rpmsg_server.c
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/system/usrsock_rpmsg/usrsock_rpmsg_server.c
+ * apps/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
  * usrsock rpmsg server
  *
  *   Copyright (C) 2018 Pinecone Inc. All rights reserved.