From a8aba2f8d083f62ae997b7bb02a0876b6483277f Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
Date: Tue, 31 Jul 2018 19:40:29 +0200
Subject: [PATCH] Kconfig: Include Kconfig.zephyr last in sample Kconfig files

This will make adding properties to symbols in the base Zephyr Kconfig
files work the same as before.

I didn't actually spot any such cases, so this is just to play it safe.
It also makes the sample Kconfig symbols appear at the top in the
menuconfig interface, which might be nice.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
---
 samples/drivers/CAN/Kconfig       | 5 +++--
 samples/net/gptp/Kconfig          | 5 +++--
 samples/net/stats/Kconfig         | 5 +++--
 samples/net/traffic_class/Kconfig | 5 +++--
 samples/net/vlan/Kconfig          | 5 +++--
 samples/net/wifi/Kconfig          | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/samples/drivers/CAN/Kconfig b/samples/drivers/CAN/Kconfig
index c9d57579701..e2a6876676b 100644
--- a/samples/drivers/CAN/Kconfig
+++ b/samples/drivers/CAN/Kconfig
@@ -8,8 +8,6 @@
 
 mainmenu "Controller Area Network sample application"
 
-source "$ZEPHYR_BASE/Kconfig.zephyr"
-
 config CAN_DEV
 	string "Name of the CAN device"
 	default "CAN_1"
@@ -46,3 +44,6 @@ config LOOPBACK_MODE
 	help
 	  Set the controller to loopback mode.
 	  This allows testing without a second board.
+
+
+source "$ZEPHYR_BASE/Kconfig.zephyr"
diff --git a/samples/net/gptp/Kconfig b/samples/net/gptp/Kconfig
index 8c8fbe20a53..884528d8d02 100644
--- a/samples/net/gptp/Kconfig
+++ b/samples/net/gptp/Kconfig
@@ -15,8 +15,6 @@
 
 mainmenu "gPTP sample application"
 
-source "$ZEPHYR_BASE/Kconfig.zephyr"
-
 if NET_GPTP
 
 config NET_SAMPLE_IFACE2_MY_IPV6_ADDR
@@ -58,3 +56,6 @@ config NET_SAMPLE_IFACE3_VLAN_TAG
 	  application.
 
 endif
+
+
+source "$ZEPHYR_BASE/Kconfig.zephyr"
diff --git a/samples/net/stats/Kconfig b/samples/net/stats/Kconfig
index 2af4b019b4d..d240bc2ef85 100644
--- a/samples/net/stats/Kconfig
+++ b/samples/net/stats/Kconfig
@@ -8,8 +8,6 @@
 
 mainmenu "Network statistics sample application"
 
-source "$ZEPHYR_BASE/Kconfig.zephyr"
-
 config SAMPLE_PERIOD
 	int "How often to print statistics (in seconds)"
 	default 30
@@ -17,3 +15,6 @@ config SAMPLE_PERIOD
 	depends on NET_STATISTICS
 	help
 	  Print statistics after every n. seconds
+
+
+source "$ZEPHYR_BASE/Kconfig.zephyr"
diff --git a/samples/net/traffic_class/Kconfig b/samples/net/traffic_class/Kconfig
index b41208a7db9..f756b24548c 100644
--- a/samples/net/traffic_class/Kconfig
+++ b/samples/net/traffic_class/Kconfig
@@ -8,8 +8,6 @@
 
 mainmenu "Networking traffic class sample application"
 
-source "$ZEPHYR_BASE/Kconfig.zephyr"
-
 config SAMPLE_VLAN_TAG
 	int "Virtual lan tag used in sample app"
 	default 100
@@ -45,3 +43,6 @@ config SAMPLE_PEER_IPV4_ADDR_2
 	string "Peer IPv4 address for second interface"
 	help
 	  The value depends on your network setup.
+
+
+source "$ZEPHYR_BASE/Kconfig.zephyr"
diff --git a/samples/net/vlan/Kconfig b/samples/net/vlan/Kconfig
index 78dd833014b..3f5b230d908 100644
--- a/samples/net/vlan/Kconfig
+++ b/samples/net/vlan/Kconfig
@@ -8,8 +8,6 @@
 
 mainmenu "Networking VLAN sample application"
 
-source "$ZEPHYR_BASE/Kconfig.zephyr"
-
 config SAMPLE_VLAN_TAG
 	int "Virtual lan tag used in VLAN sample app"
 	default 100
@@ -35,3 +33,6 @@ config SAMPLE_IPV4_ADDR_2
 	string "My IPv4 address for second interface"
 	help
 	  The value depends on your network setup.
+
+
+source "$ZEPHYR_BASE/Kconfig.zephyr"
diff --git a/samples/net/wifi/Kconfig b/samples/net/wifi/Kconfig
index c2e2fd9d9be..757283fb26f 100644
--- a/samples/net/wifi/Kconfig
+++ b/samples/net/wifi/Kconfig
@@ -1,7 +1,5 @@
 mainmenu "Wi-Fi sample"
 
-source "$ZEPHYR_BASE/Kconfig.zephyr"
-
 if WIFI_WINC1500
 
 config WINC1500_GPIO_DRV_NAME
@@ -17,3 +15,6 @@ config WINC1500_GPIO_RESET_N
 	int "Pin number for Winc1500 RESET_N signal"
 
 endif # WIFI_WINC1500
+
+
+source "$ZEPHYR_BASE/Kconfig.zephyr"