From a4a83d072d1e46adfbdf7540d731c8af60c94005 Mon Sep 17 00:00:00 2001 From: Michael Scott Date: Wed, 23 Aug 2017 21:18:35 -0700 Subject: [PATCH 1/3] net: lwm2m: select NET_APP_CLIENT automatically No need for samples to make sure they have this configured in their .conf files. Signed-off-by: Michael Scott --- subsys/net/lib/lwm2m/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/subsys/net/lib/lwm2m/Kconfig b/subsys/net/lib/lwm2m/Kconfig index 55b293b4890b5f..0b736cf2e78a17 100644 --- a/subsys/net/lib/lwm2m/Kconfig +++ b/subsys/net/lib/lwm2m/Kconfig @@ -8,6 +8,7 @@ menuconfig LWM2M bool "OMA LWM2M protocol stack" default n select ZOAP + select NET_APP_CLIENT help This option adds logic for managing OMA LWM2M data From f16a1cd3554dbf00bfd709393bf56c1c22427d04 Mon Sep 17 00:00:00 2001 From: Michael Scott Date: Wed, 23 Aug 2017 21:19:22 -0700 Subject: [PATCH 2/3] samples: lwm2m: remove extra .conf settings NET_APP and NET_APP_CLIENT are now set automatically. Signed-off-by: Michael Scott --- samples/net/lwm2m_client/prj_frdm_k64f.conf | 2 -- samples/net/lwm2m_client/prj_qemu_x86.conf | 2 -- 2 files changed, 4 deletions(-) diff --git a/samples/net/lwm2m_client/prj_frdm_k64f.conf b/samples/net/lwm2m_client/prj_frdm_k64f.conf index 24b32eccc9d998..d159f59f06f645 100644 --- a/samples/net/lwm2m_client/prj_frdm_k64f.conf +++ b/samples/net/lwm2m_client/prj_frdm_k64f.conf @@ -26,10 +26,8 @@ CONFIG_NET_CONTEXT_NET_PKT_POOL=y CONFIG_NET_SHELL=y -CONFIG_NET_APP=y CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_CLIENT=y CONFIG_NET_APP_SETTINGS=y CONFIG_LWM2M=y diff --git a/samples/net/lwm2m_client/prj_qemu_x86.conf b/samples/net/lwm2m_client/prj_qemu_x86.conf index 489646bec3e760..84fa4dabb2de69 100644 --- a/samples/net/lwm2m_client/prj_qemu_x86.conf +++ b/samples/net/lwm2m_client/prj_qemu_x86.conf @@ -26,10 +26,8 @@ CONFIG_NET_CONTEXT_NET_PKT_POOL=y CONFIG_NET_SHELL=y -CONFIG_NET_APP=y CONFIG_NET_APP_NEED_IPV6=y CONFIG_NET_APP_NEED_IPV4=y -CONFIG_NET_APP_CLIENT=y CONFIG_NET_APP_SETTINGS=y CONFIG_LWM2M=y From 9355862ff2b9e8f4d72d5b3195a7d83183e99217 Mon Sep 17 00:00:00 2001 From: Michael Scott Date: Wed, 23 Aug 2017 21:21:47 -0700 Subject: [PATCH 3/3] samples: lwm2m: remove unused NET_L2_BT settings Currently, we don't have a .conf which enabled BT. This will be re-enabled at some future date after migrating to the full net_app APIs by setting CONFIG_NET_APP_BT_NODE=y. Signed-off-by: Michael Scott --- samples/net/lwm2m_client/src/lwm2m-client.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c index 5d5eb5d21896a9..650ac11b764202 100644 --- a/samples/net/lwm2m_client/src/lwm2m-client.c +++ b/samples/net/lwm2m_client/src/lwm2m-client.c @@ -16,11 +16,6 @@ #include #include -#if defined(CONFIG_NET_L2_BT) -#include -#include -#endif - #define APP_BANNER "Run LWM2M client" #if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR) @@ -282,15 +277,6 @@ void main(void) k_sem_init(&quit_lock, 0, UINT_MAX); -#if defined(CONFIG_NET_L2_BT) - if (bt_enable(NULL)) { - SYS_LOG_ERR("Bluetooth init failed"); - return; - } - ipss_init(); - ipss_advertise(); -#endif - ret = lwm2m_setup(); if (ret < 0) { SYS_LOG_ERR("Cannot setup LWM2M fields (%d)", ret);