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.
---
 stm/Makefile       |  2 +-
 stm/mpconfig.h     | 19 -------------------
 stm/mpconfigport.h | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 stm/mpconfig.h
 create mode 100644 stm/mpconfigport.h

(limited to 'stm')

diff --git a/stm/Makefile b/stm/Makefile
index 018d31f49..d6c77e2bd 100644
--- a/stm/Makefile
+++ b/stm/Makefile
@@ -187,7 +187,7 @@ $(BUILD)/%.o: $(PYSRC)/%.s
 $(BUILD)/%.o: $(PYSRC)/%.S
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(BUILD)/%.o: $(PYSRC)/%.c mpconfig.h
+$(BUILD)/%.o: $(PYSRC)/%.c mpconfigport.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(BUILD)/emitnthumb.o: $(PYSRC)/emitnative.c $(PYSRC)/emit.h
diff --git a/stm/mpconfig.h b/stm/mpconfig.h
deleted file mode 100644
index 1f9529e11..000000000
--- a/stm/mpconfig.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// options to control how Micro Python is built
-
-#define MICROPY_ENABLE_FLOAT        (1)
-#define MICROPY_EMIT_CPYTHON        (0)
-#define MICROPY_EMIT_X64            (0)
-#define MICROPY_EMIT_THUMB          (1)
-#define MICROPY_EMIT_INLINE_THUMB   (1)
-
-// type definitions for the specific machine
-
-#define BYTES_PER_WORD (4)
-
-typedef int32_t machine_int_t; // must be pointer size
-typedef uint32_t machine_uint_t; // must be pointer size
-typedef void *machine_ptr_t; // must be of pointer size
-typedef const void *machine_const_ptr_t; // must be of pointer size
-typedef float machine_float_t;
-
-machine_float_t machine_sqrt(machine_float_t x);
diff --git a/stm/mpconfigport.h b/stm/mpconfigport.h
new file mode 100644
index 000000000..4cea332f3
--- /dev/null
+++ b/stm/mpconfigport.h
@@ -0,0 +1,21 @@
+#include <stdint.h>
+
+// options to control how Micro Python is built
+
+#define MICROPY_ENABLE_FLOAT        (1)
+#define MICROPY_EMIT_CPYTHON        (0)
+#define MICROPY_EMIT_X64            (0)
+#define MICROPY_EMIT_THUMB          (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+
+// type definitions for the specific machine
+
+#define BYTES_PER_WORD (4)
+
+typedef int32_t machine_int_t; // must be pointer size
+typedef uint32_t machine_uint_t; // must be pointer size
+typedef void *machine_ptr_t; // must be of pointer size
+typedef const void *machine_const_ptr_t; // must be of pointer size
+typedef float machine_float_t;
+
+machine_float_t machine_sqrt(machine_float_t x);
-- 
cgit v1.2.3