From ce6bc346b9256de1fccef2fe737db5bc806de366 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 31 Jul 2017 09:22:31 -0400 Subject: [PATCH] samples: http_server: unify prj.conf Signed-off-by: Anas Nashif --- samples/net/http_server/Makefile | 2 +- .../{prj_qemu_x86.conf => prj.conf} | 0 samples/net/http_server/prj_frdm_k64f.conf | 45 ----------------- .../http_server/prj_olimex_stm32_e407.conf | 49 ------------------- samples/net/http_server/sample.yaml | 5 +- 5 files changed, 3 insertions(+), 98 deletions(-) rename samples/net/http_server/{prj_qemu_x86.conf => prj.conf} (100%) delete mode 100644 samples/net/http_server/prj_frdm_k64f.conf delete mode 100644 samples/net/http_server/prj_olimex_stm32_e407.conf diff --git a/samples/net/http_server/Makefile b/samples/net/http_server/Makefile index 8fb0889ef84..ad7b27fe374 100644 --- a/samples/net/http_server/Makefile +++ b/samples/net/http_server/Makefile @@ -5,7 +5,7 @@ # BOARD ?= qemu_x86 -CONF_FILE ?= prj_$(BOARD).conf +CONF_FILE ?= prj.conf include $(ZEPHYR_BASE)/Makefile.inc diff --git a/samples/net/http_server/prj_qemu_x86.conf b/samples/net/http_server/prj.conf similarity index 100% rename from samples/net/http_server/prj_qemu_x86.conf rename to samples/net/http_server/prj.conf diff --git a/samples/net/http_server/prj_frdm_k64f.conf b/samples/net/http_server/prj_frdm_k64f.conf deleted file mode 100644 index 33814436588..00000000000 --- a/samples/net/http_server/prj_frdm_k64f.conf +++ /dev/null @@ -1,45 +0,0 @@ -CONFIG_NETWORKING=y -CONFIG_NET_TCP=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_IF_UNICAST_IPV6_ADDR_COUNT=2 -CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 - -CONFIG_NET_MAX_CONTEXTS=16 - -CONFIG_STDOUT_CONSOLE=y - -CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_SYS_LOG_NET_LEVEL=4 -CONFIG_NET_DEBUG_HTTP=y - -CONFIG_HTTP_SERVER=y - -CONFIG_NET_IPV6=y -CONFIG_NET_IPV4=y -CONFIG_NET_DHCPV4=y - -CONFIG_HTTPS=y -CONFIG_MBEDTLS=y -CONFIG_MBEDTLS_BUILTIN=y -CONFIG_MBEDTLS_CFG_FILE="config-mini-tls1_2.h" -CONFIG_MBEDTLS_ENABLE_HEAP=y -CONFIG_MBEDTLS_HEAP_SIZE=12000 - -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" - -CONFIG_NET_SHELL=y - -CONFIG_NET_MGMT=y -CONFIG_NET_MGMT_EVENT=y diff --git a/samples/net/http_server/prj_olimex_stm32_e407.conf b/samples/net/http_server/prj_olimex_stm32_e407.conf deleted file mode 100644 index a6e9ed13e92..00000000000 --- a/samples/net/http_server/prj_olimex_stm32_e407.conf +++ /dev/null @@ -1,49 +0,0 @@ -CONFIG_NETWORKING=y -CONFIG_NET_TCP=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_IF_UNICAST_IPV6_ADDR_COUNT=2 -CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4 - -CONFIG_NET_MAX_CONTEXTS=16 - -CONFIG_STDOUT_CONSOLE=y - -CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_SYS_LOG_NET_LEVEL=4 -CONFIG_NET_DEBUG_HTTP=y - -CONFIG_HTTP_SERVER=y - -CONFIG_NET_IPV6=y -CONFIG_NET_IPV4=y -CONFIG_NET_DHCPV4=y - -CONFIG_HTTPS=y -CONFIG_MBEDTLS=y -CONFIG_MBEDTLS_BUILTIN=y -CONFIG_MBEDTLS_CFG_FILE="config-mini-tls1_2.h" -CONFIG_MBEDTLS_ENABLE_HEAP=y -CONFIG_MBEDTLS_HEAP_SIZE=12000 - -CONFIG_NET_APP_SETTINGS=y -CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1" -CONFIG_NET_APP_MY_IPV4_ADDR="192.0.2.1" - -CONFIG_NET_SHELL=y - -CONFIG_NET_MGMT=y -CONFIG_NET_MGMT_EVENT=y - -CONFIG_ETH_STM32_HAL=y -CONFIG_RANDOM_STM32_RNG=y - diff --git a/samples/net/http_server/sample.yaml b/samples/net/http_server/sample.yaml index 03af1b8ec9d..e4f6960c817 100644 --- a/samples/net/http_server/sample.yaml +++ b/samples/net/http_server/sample.yaml @@ -1,11 +1,10 @@ sample: - description: TBD - name: TBD + name: HTTP Server tests: - test: build_only: true - platform_whitelist: frdm_k64f qemu_x86 tags: net http + depends_on: netif - test_bt: build_only: true platform_whitelist: qemu_x86