cc3200: Get bootloader compiling with latest overhaul of printf code.

dpgeorge · dpgeorge · commit a86d40ccd437 · 2015-04-16T14:30:17.000Z
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk
@@ -60,8 +60,7 @@ BOOT_MAIN_SRC_S = \
 	bootmgr/runapp.s
 
 BOOT_PY_SRC_C = $(addprefix py/,\
-	pfenv.c \
-	pfenv_printf.c \
+	mpprint.c \
 	)
 
 BOOT_STM_SRC_C = $(addprefix stmhal/,\
diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c
@@ -347,3 +347,12 @@ int main (void) {
     }
 }
 
+//*****************************************************************************
+//! The following stub function is needed to link mp_vprintf
+//*****************************************************************************
+#include "py/qstr.h"
+
+const byte *qstr_data(qstr q, mp_uint_t *len) {
+    *len = 0;
+    return NULL;
+}

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ BOOT_MAIN_SRC_S = \`
`60`	`60`	`bootmgr/runapp.s`
`61`	`61`
`62`	`62`	`BOOT_PY_SRC_C = $(addprefix py/,\`
`63`		`- pfenv.c \`
`64`		`- pfenv_printf.c \`
	`63`	`+ mpprint.c \`
`65`	`64`	`)`
`66`	`65`
`67`	`66`	`BOOT_STM_SRC_C = $(addprefix stmhal/,\`
Original file line number	Diff line number	Diff line change
`@@ -347,3 +347,12 @@ int main (void) {`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
	`350`	`+//*****************************************************************************`
	`351`	`+//! The following stub function is needed to link mp_vprintf`
	`352`	`+//*****************************************************************************`
	`353`	`+#include "py/qstr.h"`
	`354`	`+`
	`355`	`+const byte qstr_data(qstr q, mp_uint_t len) {`
	`356`	`+ *len = 0;`
	`357`	`+ return NULL;`
	`358`	`+}`