Skip to content

Commit 5176324

Browse files
maass-hamburgaescolar
authored andcommitted
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]>
1 parent cbd9b37 commit 5176324

File tree

5 files changed

+4
-73
lines changed

5 files changed

+4
-73
lines changed

samples/subsys/mgmt/hawkbit/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ set(KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/Kconfig)
1010
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
1111
project(hawkbit)
1212

13-
FILE(GLOB app_sources src/*.c)
14-
target_sources(app PRIVATE ${app_sources})
15-
target_sources_ifdef(CONFIG_NET_DHCPV4 app PRIVATE src/dhcp.c)
13+
target_sources(app PRIVATE src/main.c)
1614

1715
include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
1816

samples/subsys/mgmt/hawkbit/prj.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ CONFIG_MAIN_STACK_SIZE=4096
2323
CONFIG_HEAP_MEM_POOL_SIZE=4096
2424
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
2525

26+
CONFIG_NET_CONFIG_SETTINGS=y
27+
CONFIG_NET_CONFIG_NEED_IPV4=y
28+
2629
CONFIG_NET_IPV4=y
2730
CONFIG_NET_IPV6=n
2831

samples/subsys/mgmt/hawkbit/src/dhcp.c

Lines changed: 0 additions & 54 deletions
This file was deleted.

samples/subsys/mgmt/hawkbit/src/dhcp.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

samples/subsys/mgmt/hawkbit/src/main.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include <zephyr/logging/log.h>
1313
#include <zephyr/data/json.h>
1414

15-
#include "dhcp.h"
16-
1715
#if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
1816
#include <zephyr/net/tls_credentials.h>
1917
#include "ca_certificate.h"
@@ -62,8 +60,6 @@ int main(void)
6260
LOG_INF("hawkBit sample app started");
6361
LOG_INF("Image build time: " __DATE__ " " __TIME__);
6462

65-
app_dhcpv4_startup();
66-
6763
#if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
6864
tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
6965
ca_certificate, sizeof(ca_certificate));

0 commit comments

Comments
 (0)