diff --git a/samples/net/dns_resolve/Makefile b/samples/net/dns_resolve/Makefile index 17aa334fba7..db2fa196476 100644 --- a/samples/net/dns_resolve/Makefile +++ b/samples/net/dns_resolve/Makefile @@ -5,7 +5,7 @@ # BOARD ?= qemu_x86 -CONF_FILE ?= prj_$(BOARD).conf +CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc ifeq ($(BOARD), qemu_x86) diff --git a/samples/net/dns_resolve/prj_qemu_x86.conf b/samples/net/dns_resolve/prj.conf similarity index 100% rename from samples/net/dns_resolve/prj_qemu_x86.conf rename to samples/net/dns_resolve/prj.conf diff --git a/samples/net/dns_resolve/prj_arduino_101.conf b/samples/net/dns_resolve/prj_arduino_101.conf deleted file mode 100644 index 428e03a1182..00000000000 --- a/samples/net/dns_resolve/prj_arduino_101.conf +++ /dev/null @@ -1,58 +0,0 @@ -CONFIG_NETWORKING=y -CONFIG_NET_UDP=y -CONFIG_RANDOM_GENERATOR=y -CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_ARP=y -CONFIG_NET_L2_ETHERNET=y -CONFIG_NET_LOG=y -CONFIG_INIT_STACKS=y -CONFIG_NET_PKT_RX_COUNT=16 -CONFIG_NET_PKT_TX_COUNT=16 -CONFIG_NET_BUF_RX_COUNT=10 -CONFIG_NET_BUF_TX_COUNT=10 - -CONFIG_NET_IPV6_RA_RDNSS=y -CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3 - -# ENC28J60 Ethernet Device -CONFIG_ETH_ENC28J60=y -CONFIG_ETH_ENC28J60_0=y -CONFIG_ETH_ENC28J60_0_SPI_PORT_NAME="SPI_1" -CONFIG_ETH_ENC28J60_0_MAC3=0x2D -CONFIG_ETH_ENC28J60_0_MAC4=0x30 -CONFIG_ETH_ENC28J60_0_MAC5=0x32 - -# Arduino 101 -CONFIG_SPI=y - -CONFIG_PRINTK=y -#CONFIG_NET_DEBUG_NET_BUF=y - -CONFIG_NET_IPV4=y -CONFIG_NET_IPV6=y - -# Enable the DNS resolver -CONFIG_DNS_RESOLVER=y -# Enable additional buffers -CONFIG_DNS_RESOLVER_ADDITIONAL_BUF_CTR=2 -# Enable additional queries -CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=2 - -CONFIG_DNS_RESOLVER_MAX_SERVERS=2 -CONFIG_DNS_SERVER_IP_ADDRESSES=y -CONFIG_DNS_NUM_CONCUR_QUERIES=2 - -# Google DNS IPv4 and IPv6 servers -CONFIG_DNS_SERVER1="8.8.8.8" -CONFIG_DNS_SERVER2="2001:4860:4860::8888" - -CONFIG_NET_DHCPV4=y -CONFIG_NET_MGMT=y -CONFIG_NET_MGMT_EVENT=y -CONFIG_NET_SHELL=y - -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/dns_resolve/prj_frdm_k64f.conf b/samples/net/dns_resolve/prj_frdm_k64f.conf deleted file mode 100644 index 3ed1c3482d7..00000000000 --- a/samples/net/dns_resolve/prj_frdm_k64f.conf +++ /dev/null @@ -1,46 +0,0 @@ -CONFIG_NETWORKING=y -CONFIG_NET_UDP=y -CONFIG_RANDOM_GENERATOR=y -CONFIG_NET_ARP=y -CONFIG_NET_L2_ETHERNET=y -CONFIG_NET_LOG=y -CONFIG_INIT_STACKS=y -CONFIG_NET_PKT_RX_COUNT=16 -CONFIG_NET_PKT_TX_COUNT=16 -CONFIG_NET_BUF_RX_COUNT=16 -CONFIG_NET_BUF_TX_COUNT=16 - -CONFIG_NET_IPV6_RA_RDNSS=y -CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3 - -CONFIG_PRINTK=y -#CONFIG_NET_DEBUG_NET_BUF=y - -CONFIG_NET_IPV4=y -CONFIG_NET_IPV6=y - -# Enable the DNS resolver -CONFIG_DNS_RESOLVER=y -# Enable additional buffers -CONFIG_DNS_RESOLVER_ADDITIONAL_BUF_CTR=2 -# Enable additional queries -CONFIG_DNS_RESOLVER_ADDITIONAL_QUERIES=2 - -CONFIG_DNS_RESOLVER_MAX_SERVERS=2 -CONFIG_DNS_SERVER_IP_ADDRESSES=y -CONFIG_DNS_NUM_CONCUR_QUERIES=2 - -# Google DNS IPv4 and IPv6 servers -CONFIG_DNS_SERVER1="8.8.8.8" -CONFIG_DNS_SERVER2="2001:4860:4860::8888" - -CONFIG_NET_DHCPV4=y -CONFIG_NET_MGMT=y -CONFIG_NET_MGMT_EVENT=y -CONFIG_NET_SHELL=y - -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_PEER_IPV6_ADDR="2001:db8::2" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" -CONFIG_NET_APP_PEER_IPV4_ADDR="192.0.2.2" diff --git a/samples/net/dns_resolve/sample.yaml b/samples/net/dns_resolve/sample.yaml index 2dccb22cd4a..2901f7dc672 100644 --- a/samples/net/dns_resolve/sample.yaml +++ b/samples/net/dns_resolve/sample.yaml @@ -1,8 +1,8 @@ sample: description: TBD - name: TBD + name: DNS Resolver tests: - test: build_only: true - platform_whitelist: qemu_x86 tags: net dns + depends_on: netif