From 743e64992bbb0a799529daa7299cd183b807b845 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Mon, 24 Sep 2018 13:53:27 +0200 Subject: [PATCH] samples: net: sockets: Put echo samples configuration into single file Avoid having not-necessarily board specific configs in a separate file. Instead, have a single project file with appropriate overlay configs. Board specific configurations can be added in future if needed. Signed-off-by: Robert Lubos --- samples/net/sockets/echo_client/boards/qemu_x86.conf | 4 ---- samples/net/sockets/echo_client/prj.conf | 4 ++++ samples/net/sockets/echo_server/boards/qemu_x86.conf | 4 ---- samples/net/sockets/echo_server/prj.conf | 4 ++++ 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 samples/net/sockets/echo_client/boards/qemu_x86.conf delete mode 100644 samples/net/sockets/echo_server/boards/qemu_x86.conf diff --git a/samples/net/sockets/echo_client/boards/qemu_x86.conf b/samples/net/sockets/echo_client/boards/qemu_x86.conf deleted file mode 100644 index 74d3719e34b..00000000000 --- a/samples/net/sockets/echo_client/boards/qemu_x86.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_NET_UDP=y -CONFIG_NET_TCP=y -CONFIG_NET_IPV6=y -CONFIG_NET_IPV4=y diff --git a/samples/net/sockets/echo_client/prj.conf b/samples/net/sockets/echo_client/prj.conf index 2b6c9ec9827..ca40355046d 100644 --- a/samples/net/sockets/echo_client/prj.conf +++ b/samples/net/sockets/echo_client/prj.conf @@ -1,5 +1,9 @@ # Generic networking options CONFIG_NETWORKING=y +CONFIG_NET_UDP=y +CONFIG_NET_TCP=y +CONFIG_NET_IPV6=y +CONFIG_NET_IPV4=y CONFIG_NEWLIB_LIBC=y CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y diff --git a/samples/net/sockets/echo_server/boards/qemu_x86.conf b/samples/net/sockets/echo_server/boards/qemu_x86.conf deleted file mode 100644 index 74d3719e34b..00000000000 --- a/samples/net/sockets/echo_server/boards/qemu_x86.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_NET_UDP=y -CONFIG_NET_TCP=y -CONFIG_NET_IPV6=y -CONFIG_NET_IPV4=y diff --git a/samples/net/sockets/echo_server/prj.conf b/samples/net/sockets/echo_server/prj.conf index 71401f76cac..43497135d4c 100644 --- a/samples/net/sockets/echo_server/prj.conf +++ b/samples/net/sockets/echo_server/prj.conf @@ -1,5 +1,9 @@ # Generic networking options CONFIG_NETWORKING=y +CONFIG_NET_UDP=y +CONFIG_NET_TCP=y +CONFIG_NET_IPV6=y +CONFIG_NET_IPV4=y CONFIG_NEWLIB_LIBC=y CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y