mgmt: hawkbit: samples: use net config settings

use net config setting and `CONFIG_NET_CONFIG_NEED_IPV4` to get dhcpv4 address. Signed-off-by: Fin Maaß <[email protected]>
zephyrproject-rtos · May 1, 2024 · 5176324 · 5176324
1 parent cbd9b37
commit 5176324
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 73 deletions.
diff --git a/samples/subsys/mgmt/hawkbit/CMakeLists.txt b/samples/subsys/mgmt/hawkbit/CMakeLists.txt
@@ -10,9 +10,7 @@ set(KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/Kconfig)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hawkbit)
 
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
-target_sources_ifdef(CONFIG_NET_DHCPV4 app PRIVATE src/dhcp.c)
+target_sources(app PRIVATE src/main.c)
 
 include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
 

diff --git a/samples/subsys/mgmt/hawkbit/prj.conf b/samples/subsys/mgmt/hawkbit/prj.conf
@@ -23,6 +23,9 @@ CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
 
+CONFIG_NET_CONFIG_SETTINGS=y
+CONFIG_NET_CONFIG_NEED_IPV4=y
+
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=n
 

diff --git a/samples/subsys/mgmt/hawkbit/src/dhcp.c b/samples/subsys/mgmt/hawkbit/src/dhcp.c
diff --git a/samples/subsys/mgmt/hawkbit/src/dhcp.h b/samples/subsys/mgmt/hawkbit/src/dhcp.h
diff --git a/samples/subsys/mgmt/hawkbit/src/main.c b/samples/subsys/mgmt/hawkbit/src/main.c
@@ -12,8 +12,6 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/data/json.h>
 
-#include "dhcp.h"
-
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 #include <zephyr/net/tls_credentials.h>
 #include "ca_certificate.h"
@@ -62,8 +60,6 @@ int main(void)
 	LOG_INF("hawkBit sample app started");
 	LOG_INF("Image build time: " __DATE__ " " __TIME__);
 
-	app_dhcpv4_startup();
-
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 	tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
 			   ca_certificate, sizeof(ca_certificate));