From 73ff0687f2f5331e962a4af0126097e9921db631 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 10 Nov 2015 18:57:45 +0200
Subject: [PATCH] lib/utils/printf: Move from stmhal/ .

This file contains various MicroPython-specific helper functions, so isn't
good fit for lib/libc/.
---
 cc3200/application.mk          | 2 +-
 cc3200/bootmgr/bootloader.mk   | 7 ++-----
 esp8266/Makefile               | 2 +-
 {stmhal => lib/utils}/printf.c | 0
 minimal/Makefile               | 2 +-
 stmhal/Makefile                | 2 +-
 teensy/Makefile                | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)
 rename {stmhal => lib/utils}/printf.c (100%)

diff --git a/cc3200/application.mk b/cc3200/application.mk
index 36d8e40909..5b81f7228c 100644
--- a/cc3200/application.mk
+++ b/cc3200/application.mk
@@ -152,6 +152,7 @@ APP_LIB_SRC_C = $(addprefix lib/,\
 	netutils/netutils.c \
 	timeutils/timeutils.c \
 	utils/pyexec.c \
+	utils/printf.c \
 	)
 	
 APP_STM_SRC_C = $(addprefix stmhal/,\
@@ -162,7 +163,6 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
 	irq.c \
 	lexerfatfs.c \
 	moduselect.c \
-	printf.c \
 	pybstdio.c \
 	)
 
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk
index a97f888ed9..ee52369135 100644
--- a/cc3200/bootmgr/bootloader.mk
+++ b/cc3200/bootmgr/bootloader.mk
@@ -65,16 +65,13 @@ BOOT_PY_SRC_C = $(addprefix py/,\
 	mpprint.c \
 	)
 
-BOOT_STM_SRC_C = $(addprefix stmhal/,\
-	printf.c \
-	)
-
 BOOT_LIB_SRC_C = $(addprefix lib/,\
 	libc/string0.c \
+	utils/printf.c \
 	)
 
 OBJ  = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MISC_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o) $(BOOT_STM_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
 
 # Add the linker script
diff --git a/esp8266/Makefile b/esp8266/Makefile
index d930a25559..0162123158 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -67,7 +67,6 @@ SRC_C = \
 	$(BUILD)/frozen.c \
 
 STM_SRC_C = $(addprefix stmhal/,\
-	printf.c \
 	pybstdio.c \
 	)
 
@@ -77,6 +76,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	netutils/netutils.c \
 	timeutils/timeutils.c \
 	utils/pyexec.c \
+	utils/printf.c \
 	)
 
 SRC_S = \
diff --git a/stmhal/printf.c b/lib/utils/printf.c
similarity index 100%
rename from stmhal/printf.c
rename to lib/utils/printf.c
diff --git a/minimal/Makefile b/minimal/Makefile
index 57dc84ec83..f6e0ef14c0 100644
--- a/minimal/Makefile
+++ b/minimal/Makefile
@@ -44,7 +44,7 @@ SRC_C = \
 	main.c \
 	uart_core.c \
 	uart_extra.c \
-	stmhal/printf.c \
+	lib/utils/printf.c \
 	lib/utils/pyexec.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
diff --git a/stmhal/Makefile b/stmhal/Makefile
index ab1c345afa..de41d9261f 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -104,6 +104,7 @@ SRC_LIB = $(addprefix lib/,\
 	netutils/netutils.c \
 	timeutils/timeutils.c \
 	utils/pyexec.c \
+	utils/printf.c \
 	)
 
 SRC_C = \
@@ -130,7 +131,6 @@ SRC_C = \
 	uart.c \
 	can.c \
 	usb.c \
-	printf.c \
 	gccollect.c \
 	pybstdio.c \
 	help.c \
diff --git a/teensy/Makefile b/teensy/Makefile
index b458485ce5..c182631802 100644
--- a/teensy/Makefile
+++ b/teensy/Makefile
@@ -98,7 +98,6 @@ STM_SRC_C = $(addprefix stmhal/,\
 	irq.c \
 	pin.c \
 	pin_named_pins.c \
-	printf.c \
 	pybstdio.c \
 	)
 
@@ -110,6 +109,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	libc/string0.c \
 	mp-readline/readline.c \
 	utils/pyexec.c \
+	utils/printf.c \
 	)
 
 SRC_TEENSY = $(addprefix core/,\