From b372bfca21ccab593359ef25a0a0c6bf697c8586 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky
Date: Fri, 3 Jan 2014 17:15:53 +0200
Subject: Rename default config file to mpconfig.h, and port's to
 mpconfigport.h.

mpconfig.h will automatically pull mpconfigport.h.
---
 py/defaultconfig.h |  7 -------
 py/malloc.c        |  1 -
 py/mpconfig.h      | 13 +++++++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 py/defaultconfig.h
 create mode 100644 py/mpconfig.h

(limited to 'py')

diff --git a/py/defaultconfig.h b/py/defaultconfig.h
deleted file mode 100644
index 9829bf707..000000000
--- a/py/defaultconfig.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file contains default configuration settings for MicroPython.
-// You can override any of these options in mpconfig.h for your port.
-
-// Whether to collect memory allocation stats
-#ifndef MICROPY_MEM_STATS
-#define MICROPY_MEM_STATS (1)
-#endif
diff --git a/py/malloc.c b/py/malloc.c
index 1765eb674..4f01dc63f 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -3,7 +3,6 @@
 
 #include "misc.h"
 #include "mpconfig.h"
-#include "defaultconfig.h"
 
 #if MICROPY_MEM_STATS
 static int total_bytes_allocated = 0;
diff --git a/py/mpconfig.h b/py/mpconfig.h
new file mode 100644
index 000000000..17c5a770c
--- /dev/null
+++ b/py/mpconfig.h
@@ -0,0 +1,13 @@
+// This file contains default configuration settings for MicroPython.
+// You can override any of these options using mpconfigport.h file located
+// in a directory of your port.
+
+#include <mpconfigport.h>
+
+// Any options not explicitly set in mpconfigport.h will get default
+// values below.
+
+// Whether to collect memory allocation stats
+#ifndef MICROPY_MEM_STATS
+#define MICROPY_MEM_STATS (1)
+#endif
-- 
cgit v1.2.3