Merge pull request #7780 from artokin/nsrc510_p1

Rename nanostack configuration (.cfg) files

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ethernet.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Config Flags for Ethernet Bootstrap */
+
+#define HAVE_ETHERNET
+
+#define HAVE_IPV6_ND

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_local_socket.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define HAVE_LOCAL_SOCKET

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_border_router.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Config Flags for 6LoWPAN Border router */
+#include "cfg_lowpan_router.h"
+
+#define HAVE_RPL_ROOT
+#define HAVE_RPL_DAO_HANDLING
+#define HAVE_6LOWPAN_BORDER_ROUTER
+#define WHITEBOARD
+#define HAVE_ND_PROXY
+#define MULTICAST_FORWARDING

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_host.h

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Config Flags for 6LoWPAN Host */
+#define HAVE_IPV6_ND
+#define HAVE_6LOWPAN_ND
+#define HAVE_MPL

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_router.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Config Flags for 6LoWPAN Router */
+#include "cfg_lowpan_host.h"
+
+#define HAVE_6LOWPAN_ROUTER
+#define HAVE_RPL

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_rf_tunnel.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define HAVE_RF_TUNNEL

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_border_router.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cfg_thread_router.h"
+
+#define HAVE_THREAD_BORDER_ROUTER
+#define HAVE_ND_PROXY
+#define MULTICAST_FORWARDING

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_end_device.h

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Thread feature is active with minimal functionality */
+#define HAVE_THREAD
+
+#define HAVE_MPL

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_full_end_device.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+* Thread Full End Device configuration file.
+*/
+#include "cfg_thread_end_device.h"
+
+/* Flag to enable Thread Neighbor discovery */
+#define HAVE_THREAD_NEIGHBOR_DISCOVERY

features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_router.h

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cfg_thread_full_end_device.h"
+
+/* Enable DHCP server functionality */
+#define HAVE_DHCPV6_SERVER
+
+/* Flag for Thread router specific functionality */
+#define HAVE_THREAD_ROUTER
+
+/* Flag to enable Thread leader capability */
+#define HAVE_THREAD_LEADER_SERVICE

features/nanostack/sal-stack-nanostack/source/configs/base/ethernet.cfg

@@ -1,5 +0,0 @@
-/* Config Flags for Ethernet Bootstrap */
-
-#define HAVE_ETHERNET
-
-#define HAVE_IPV6_ND

features/nanostack/sal-stack-nanostack/source/configs/base/local_socket.cfg

@@ -1 +0,0 @@
-#define HAVE_LOCAL_SOCKET

features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_border_router.cfg

@@ -1,9 +0,0 @@
-/* Config Flags for 6LoWPAN Border router */
-#include "lowpan_router.cfg"
-
-#define HAVE_RPL_ROOT
-#define HAVE_RPL_DAO_HANDLING
-#define HAVE_6LOWPAN_BORDER_ROUTER
-#define WHITEBOARD
-#define HAVE_ND_PROXY
-#define MULTICAST_FORWARDING

features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_host.cfg

@@ -1,4 +0,0 @@
-/* Config Flags for 6LoWPAN Host */
-#define HAVE_IPV6_ND
-#define HAVE_6LOWPAN_ND
-#define HAVE_MPL

features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_router.cfg

@@ -1,5 +0,0 @@
-/* Config Flags for 6LoWPAN Router */
-#include "lowpan_host.cfg"
-
-#define HAVE_6LOWPAN_ROUTER
-#define HAVE_RPL

features/nanostack/sal-stack-nanostack/source/configs/base/rf_tunnel.cfg

@@ -1 +0,0 @@
-#define HAVE_RF_TUNNEL

features/nanostack/sal-stack-nanostack/source/configs/base/thread_border_router.cfg

@@ -1,5 +0,0 @@
-#include "thread_router.cfg"
-
-#define HAVE_THREAD_BORDER_ROUTER
-#define HAVE_ND_PROXY
-#define MULTICAST_FORWARDING

features/nanostack/sal-stack-nanostack/source/configs/base/thread_end_device.cfg

@@ -1,5 +0,0 @@
-
-/* Thread feature is active with minimal functionality */
-#define HAVE_THREAD
-
-#define HAVE_MPL

features/nanostack/sal-stack-nanostack/source/configs/base/thread_full_end_device.cfg

@@ -1,7 +0,0 @@
-/**
-* Thread Full End Device configuration file.
-*/
-#include "thread_end_device.cfg"
-
-/* Flag to enable Thread Neighbor discovery */
-#define HAVE_THREAD_NEIGHBOR_DISCOVERY

features/nanostack/sal-stack-nanostack/source/configs/base/thread_router.cfg

@@ -1,11 +0,0 @@
-
-#include "thread_full_end_device.cfg"
-
-/* Enable DHCP server functionality */
-#define HAVE_DHCPV6_SERVER
-
-/* Flag for Thread router specific functionality */
-#define HAVE_THREAD_ROUTER
-
-/* Flag to enable Thread leader capability */
-#define HAVE_THREAD_LEADER_SERVICE

features/nanostack/sal-stack-nanostack/source/configs/cfg_ethernet_host.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,6 @@
  */
 
 
-#include "base/ethernet.cfg"
+#include "base/cfg_ethernet.h"
 
 #define NO_RADV_TX

features/nanostack/sal-stack-nanostack/source/configs/cfg_generic.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014, 2016-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-#include "base/thread_border_router.cfg"
-#include "base/ethernet.cfg"
-#include "base/lowpan_border_router.cfg"
-#include "base/local_socket.cfg"
-#include "base/rf_tunnel.cfg"
+#include "base/cfg_thread_border_router.h"
+#include "base/cfg_ethernet.h"
+#include "base/cfg_lowpan_border_router.h"
+#include "base/cfg_local_socket.h"
+#include "base/cfg_rf_tunnel.h"
 
 #define FEA_TRACE_SUPPORT
 #define EXTRA_CONSISTENCY_CHECKS

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-#include "base/lowpan_border_router.cfg"
-#include "base/ethernet.cfg"
-#include "base/local_socket.cfg"
+#include "base/cfg_lowpan_border_router.h"
+#include "base/cfg_ethernet.h"
+#include "base/cfg_local_socket.h"
 
 #define HAVE_AES
 #define FEA_TRACE_SUPPORT

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 /*  This is for linux router which use RF tunnel interface */
-#include "base/lowpan_border_router.cfg"
-#include "base/ethernet.cfg"
-#include "base/local_socket.cfg"
-#include "base/rf_tunnel.cfg"
+#include "base/cfg_lowpan_border_router.h"
+#include "base/cfg_ethernet.h"
+#include "base/cfg_local_socket.h"
+#include "base/cfg_rf_tunnel.h"
 
 #define HAVE_AES
 #define FEA_TRACE_SUPPORT

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 /*  This is for linux router which use RF tunnel interface */
-#include "base/lowpan_border_router.cfg"
-#include "base/ethernet.cfg"
-#include "base/local_socket.cfg"
-#include "base/rf_tunnel.cfg"
+#include "base/cfg_lowpan_border_router.h"
+#include "base/cfg_ethernet.h"
+#include "base/cfg_local_socket.h"
+#include "base/cfg_rf_tunnel.h"
 
 #define ECC
 #define HAVE_AES

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 /*  This is for linux router which use RF tunnel interface */
-#include "base/lowpan_border_router.cfg"
-#include "base/ethernet.cfg"
-#include "base/local_socket.cfg"
-#include "base/rf_tunnel.cfg"
+#include "base/cfg_lowpan_border_router.h"
+#include "base/cfg_ethernet.h"
+#include "base/cfg_local_socket.h"
+#include "base/cfg_rf_tunnel.h"
 
 #define ECC
 #define HAVE_AES

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_host.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_host.cfg"
+#include "base/cfg_lowpan_host.h"
 
 #define HAVE_AES
 #define NO_RADV_TX

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_router.cfg"
+#include "base/cfg_lowpan_router.h"
 
 #define HAVE_AES
 #define FEA_TRACE_SUPPORT

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_router.cfg"
+#include "base/cfg_lowpan_router.h"
 
 #define ECC
 #define PANA

features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc_release.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_router.cfg"
+#include "base/cfg_lowpan_router.h"
 
 #define ECC
 #define PANA

features/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016, Arm Limited and affiliates.
+ * Copyright (c) 2014-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,5 +20,5 @@
  * all features on mbedOS we can.
  */
 
-#include "generic.cfg"
+#include "cfg_generic.h"
 #undef ECC

features/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full_debug.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nanostack_full.cfg"
+#include "cfg_nanostack_full.h"
 
 #define FEA_TRACE_SUPPORT
 #define EXTRA_CONSISTENCY_CHECKS

features/nanostack/sal-stack-nanostack/source/configs/cfg_rf_interface.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "base/cfg_lowpan_host.h"
+#include "base/cfg_local_socket.h"
+#include "base/cfg_rf_tunnel.h"
+
+#define NO_RADV_TX
+#define NO_TCP

features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_border_router.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "base/thread_border_router.cfg"
-#include "base/ethernet.cfg"
+#include "base/cfg_thread_border_router.h"
+#include "base/cfg_ethernet.h"
 
 #define EXTRA_CONSISTENCY_CHECKS

features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_end_device.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "base/thread_end_device.cfg"
+#include "base/cfg_thread_end_device.h"
 
 /* Code optimization for Router advertisement */
 #define NO_RADV_TX

features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_full_end_device.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "base/thread_full_end_device.cfg"
+#include "base/cfg_thread_full_end_device.h"
 
 /* Code optimization for Router advertisement */
 #define NO_RADV_TX

features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_router.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "base/thread_router.cfg"
+#include "base/cfg_thread_router.h"
 
 /* Code optimization for Router advertisement */
 #define NO_RADV_TX

features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_thci.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 
 /* Thread test harness configuration, derived from thread_border_router to get all thread features */
 
-#include "thread_border_router.cfg"
+#include "cfg_thread_border_router.h"
 
 #define FEA_TRACE_SUPPORT
 #define THREAD_THCI_SUPPORT

features/nanostack/sal-stack-nanostack/source/configs/rf_interface.cfg

@@ -1,6 +0,0 @@
-#include "base/lowpan_host.cfg"
-#include "base/local_socket.cfg"
-#include "base/rf_tunnel.cfg"
-
-#define NO_RADV_TX
-#define NO_TCP

features/nanostack/sal-stack-nanostack/source/nsconfig.h

@@ -29,7 +29,7 @@
 #endif
 
 #define __ns_cfg_header(x) #x
-#define _ns_cfg_header(x) __ns_cfg_header(configs/x.cfg)
+#define _ns_cfg_header(x) __ns_cfg_header(configs/cfg_##x.h)
 #define ns_cfg_header(x) _ns_cfg_header(x)