diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-04-16 14:27:56 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-04-16 14:30:17 +0000 |
| commit | a86d40ccd437fe0235c09426ef6d552b968d86e8 (patch) | |
| tree | e2bd10c37e1985f473bcb38e26ade8477d9434ae | |
| parent | 044c473de203b4dbe93874813b430fb6336db2b2 (diff) | |
| download | micropython-a86d40ccd437fe0235c09426ef6d552b968d86e8.tar.gz micropython-a86d40ccd437fe0235c09426ef6d552b968d86e8.zip | |
cc3200: Get bootloader compiling with latest overhaul of printf code.
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 3 | ||||
| -rw-r--r-- | cc3200/bootmgr/main.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index 637a087a71..da02a02d07 100644 --- 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 index c1a64b84ad..8dc37b4a42 100644 --- 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; +} |