Merge branch 'release_internal' into release_external

deepakvenugopal · deepakvenugopal · commit b8f840c071bb · 2018-08-10T11:13:26.000+03:00
* release_internal: Rename cfg-files to h-files (ARMmbed#1780)
diff --git a/source/configs/base/cfg_ethernet.h b/source/configs/base/cfg_ethernet.h
diff --git a/source/configs/base/cfg_local_socket.h b/source/configs/base/cfg_local_socket.h
diff --git a/source/configs/base/cfg_lowpan_border_router.h b/source/configs/base/cfg_lowpan_border_router.h
@@ -1,5 +1,5 @@
 /* Config Flags for 6LoWPAN Border router */
-#include "lowpan_router.cfg"
+#include "cfg_lowpan_router.h"
 
 #define HAVE_RPL_ROOT
 #define HAVE_RPL_DAO_HANDLING
diff --git a/source/configs/base/cfg_lowpan_host.h b/source/configs/base/cfg_lowpan_host.h
diff --git a/source/configs/base/cfg_lowpan_router.h b/source/configs/base/cfg_lowpan_router.h
@@ -1,5 +1,5 @@
 /* Config Flags for 6LoWPAN Router */
-#include "lowpan_host.cfg"
+#include "cfg_lowpan_host.h"
 
 #define HAVE_6LOWPAN_ROUTER
 #define HAVE_RPL
diff --git a/source/configs/base/cfg_rf_tunnel.h b/source/configs/base/cfg_rf_tunnel.h
diff --git a/source/configs/base/cfg_thread_border_router.h b/source/configs/base/cfg_thread_border_router.h
@@ -1,4 +1,4 @@
-#include "thread_router.cfg"
+#include "cfg_thread_router.h"
 
 #define HAVE_THREAD_BORDER_ROUTER
 #define HAVE_ND_PROXY
diff --git a/source/configs/base/cfg_thread_end_device.h b/source/configs/base/cfg_thread_end_device.h
diff --git a/source/configs/base/cfg_thread_full_end_device.h b/source/configs/base/cfg_thread_full_end_device.h
@@ -1,7 +1,7 @@
 /**
 * Thread Full End Device configuration file.
 */
-#include "thread_end_device.cfg"
+#include "cfg_thread_end_device.h"
 
 /* Flag to enable Thread Neighbor discovery */
 #define HAVE_THREAD_NEIGHBOR_DISCOVERY
diff --git a/source/configs/base/cfg_thread_router.h b/source/configs/base/cfg_thread_router.h
@@ -1,5 +1,5 @@
 
-#include "thread_full_end_device.cfg"
+#include "cfg_thread_full_end_device.h"
 
 /* Enable DHCP server functionality */
 #define HAVE_DHCPV6_SERVER
diff --git a/source/configs/cfg_ethernet_host.h b/source/configs/cfg_ethernet_host.h
@@ -16,6 +16,6 @@
  */
 
 
-#include "base/ethernet.cfg"
+#include "base/cfg_ethernet.h"
 
 #define NO_RADV_TX
diff --git a/source/configs/cfg_generic.h b/source/configs/cfg_generic.h
@@ -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
diff --git a/source/configs/cfg_lowpan_border_router.h b/source/configs/cfg_lowpan_border_router.h
@@ -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
diff --git a/source/configs/cfg_lowpan_border_router_rf_tunnel.h b/source/configs/cfg_lowpan_border_router_rf_tunnel.h
@@ -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
diff --git a/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h b/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
@@ -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
diff --git a/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h b/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
@@ -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
diff --git a/source/configs/cfg_lowpan_host.h b/source/configs/cfg_lowpan_host.h
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_host.cfg"
+#include "base/cfg_lowpan_host.h"
 
 #define HAVE_AES
 #define NO_RADV_TX
diff --git a/source/configs/cfg_lowpan_router.h b/source/configs/cfg_lowpan_router.h
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_router.cfg"
+#include "base/cfg_lowpan_router.h"
 
 #define HAVE_AES
 #define FEA_TRACE_SUPPORT
diff --git a/source/configs/cfg_lowpan_router_ecc.h b/source/configs/cfg_lowpan_router_ecc.h
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_router.cfg"
+#include "base/cfg_lowpan_router.h"
 
 #define ECC
 #define PANA
diff --git a/source/configs/cfg_lowpan_router_ecc_release.h b/source/configs/cfg_lowpan_router_ecc_release.h
@@ -16,7 +16,7 @@
  */
 
 
-#include "base/lowpan_router.cfg"
+#include "base/cfg_lowpan_router.h"
 
 #define ECC
 #define PANA
diff --git a/source/configs/cfg_nanostack_full.h b/source/configs/cfg_nanostack_full.h
@@ -20,5 +20,5 @@
  * all features on mbedOS we can.
  */
 
-#include "generic.cfg"
+#include "cfg_generic.h"
 #undef ECC
diff --git a/source/configs/cfg_nanostack_full_debug.h b/source/configs/cfg_nanostack_full_debug.h
@@ -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
diff --git a/source/configs/cfg_rf_interface.h b/source/configs/cfg_rf_interface.h
@@ -0,0 +1,6 @@
+#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
diff --git a/source/configs/cfg_thread_border_router.h b/source/configs/cfg_thread_border_router.h
@@ -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
diff --git a/source/configs/cfg_thread_end_device.h b/source/configs/cfg_thread_end_device.h
@@ -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
diff --git a/source/configs/cfg_thread_full_end_device.h b/source/configs/cfg_thread_full_end_device.h
@@ -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
diff --git a/source/configs/cfg_thread_router.h b/source/configs/cfg_thread_router.h
@@ -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
diff --git a/source/configs/cfg_thread_thci.h b/source/configs/cfg_thread_thci.h
@@ -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
diff --git a/source/configs/rf_interface.cfg b/source/configs/rf_interface.cfg
diff --git a/source/nsconfig.h b/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)
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "thread_router.cfg"`
	`1`	`+#include "cfg_thread_router.h"`
`2`	`2`
`3`	`3`	`#define HAVE_THREAD_BORDER_ROUTER`
`4`	`4`	`#define HAVE_ND_PROXY`