lib/utils/printf: Move from stmhal/ .

pfalcon · pfalcon · commit 73ff0687f2f5 · 2015-11-10T18:58:58.000+02:00
This file contains various MicroPython-specific helper functions, so isn't
good fit for lib/libc/.
diff --git 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
@@ -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
@@ -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/lib/utils/printf.c b/lib/utils/printf.c
diff --git 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
@@ -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
@@ -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/,\

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ APP_LIB_SRC_C = $(addprefix lib/,\`
`152`	`152`	`netutils/netutils.c \`
`153`	`153`	`timeutils/timeutils.c \`
`154`	`154`	`utils/pyexec.c \`
	`155`	`+ utils/printf.c \`
`155`	`156`	`)`
`156`	`157`
`157`	`158`	`APP_STM_SRC_C = $(addprefix stmhal/,\`
`@@ -162,7 +163,6 @@ APP_STM_SRC_C = $(addprefix stmhal/,\`
`162`	`163`	`irq.c \`
`163`	`164`	`lexerfatfs.c \`
`164`	`165`	`moduselect.c \`
`165`		`- printf.c \`
`166`	`166`	`pybstdio.c \`
`167`	`167`	`)`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ SRC_C = \`
`67`	`67`	`$(BUILD)/frozen.c \`
`68`	`68`
`69`	`69`	`STM_SRC_C = $(addprefix stmhal/,\`
`70`		`- printf.c \`
`71`	`70`	`pybstdio.c \`
`72`	`71`	`)`
`73`	`72`
`@@ -77,6 +76,7 @@ LIB_SRC_C = $(addprefix lib/,\`
`77`	`76`	`netutils/netutils.c \`
`78`	`77`	`timeutils/timeutils.c \`
`79`	`78`	`utils/pyexec.c \`
	`79`	`+ utils/printf.c \`
`80`	`80`	`)`
`81`	`81`
`82`	`82`	`SRC_S = \`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ STM_SRC_C = $(addprefix stmhal/,\`
`98`	`98`	`irq.c \`
`99`	`99`	`pin.c \`
`100`	`100`	`pin_named_pins.c \`
`101`		`- printf.c \`
`102`	`101`	`pybstdio.c \`
`103`	`102`	`)`
`104`	`103`
`@@ -110,6 +109,7 @@ LIB_SRC_C = $(addprefix lib/,\`
`110`	`109`	`libc/string0.c \`
`111`	`110`	`mp-readline/readline.c \`
`112`	`111`	`utils/pyexec.c \`
	`112`	`+ utils/printf.c \`
`113`	`113`	`)`
`114`	`114`
`115`	`115`	`SRC_TEENSY = $(addprefix core/,\`