diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-01-03 17:15:53 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-01-03 19:03:11 +0200 |
| commit | b372bfca21ccab593359ef25a0a0c6bf697c8586 (patch) | |
| tree | a6802e0442c4ac83aa91beb04bac9f222641202b /py | |
| parent | ef18102b9ec9634653fd4a8286990e9e21ce2ae0 (diff) | |
| download | micropython-b372bfca21ccab593359ef25a0a0c6bf697c8586.tar.gz micropython-b372bfca21ccab593359ef25a0a0c6bf697c8586.zip | |
Rename default config file to mpconfig.h, and port's to mpconfigport.h.
mpconfig.h will automatically pull mpconfigport.h.
Diffstat (limited to 'py')
| -rw-r--r-- | py/defaultconfig.h | 7 | ||||
| -rw-r--r-- | py/malloc.c | 1 | ||||
| -rw-r--r-- | py/mpconfig.h | 13 |
3 files changed, 13 insertions, 8 deletions
diff --git a/py/defaultconfig.h b/py/defaultconfig.h deleted file mode 100644 index 9829bf707d..0000000000 --- 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 1765eb6743..4f01dc63f5 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 0000000000..17c5a770c4 --- /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 |