From d304f0ea2bfc48abc8c310828aa10c6d642065d0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 14 Jun 2020 00:04:31 -0700
Subject: [PATCH] altos: Leave floating printf enabled on m3 devices

These devices all use floating point computations, so leave the
floating point printf included in case they print one of those
values. If we run short on flash space, we can switch back.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/Makefile.defs             | 2 --
 src/lpc/Makefile-lpc.defs     | 4 ++++
 src/stmf0/Makefile-stmf0.defs | 4 ++++
 src/telefireone-v2.0/Makefile | 4 ----
 src/telestatic-v3.0/Makefile  | 4 ----
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.defs b/src/Makefile.defs
index a14b8042..897f7ac1 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -20,8 +20,6 @@ WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \
 
 OPT=-Os -Wl,-Map=$(PROGNAME)-$(VERSION).map
 
-PICOLIBC_PRINTF_CFLAGS = -DPICOLIBC_INTEGER_PRINTF_SCANF
-
 PICOLIBC_CFLAGS= \
 	-specs=picolibc.specs \
 	$(PICOLIBC_PRINTF_CFLAGS)
diff --git a/src/lpc/Makefile-lpc.defs b/src/lpc/Makefile-lpc.defs
index fb3747dd..48153da3 100644
--- a/src/lpc/Makefile-lpc.defs
+++ b/src/lpc/Makefile-lpc.defs
@@ -2,6 +2,10 @@ ifndef TOPDIR
 TOPDIR=..
 endif
 
+# Disable floating-point support in printf to save space
+
+PICOLIBC_PRINTF_CFLAGS = -DPICOLIBC_INTEGER_PRINTF_SCANF
+
 include $(TOPDIR)/Makefile.defs
 
 vpath % $(TOPDIR)/lpc:$(AO_VPATH)
diff --git a/src/stmf0/Makefile-stmf0.defs b/src/stmf0/Makefile-stmf0.defs
index f3add106..53660560 100644
--- a/src/stmf0/Makefile-stmf0.defs
+++ b/src/stmf0/Makefile-stmf0.defs
@@ -2,6 +2,10 @@ ifndef TOPDIR
 TOPDIR=..
 endif
 
+# Disable floating-point support in printf to save space
+
+PICOLIBC_PRINTF_CFLAGS = -DPICOLIBC_INTEGER_PRINTF_SCANF
+
 include $(TOPDIR)/Makefile.defs
 
 vpath % $(TOPDIR)/stmf0:$(AO_VPATH)
diff --git a/src/telefireone-v2.0/Makefile b/src/telefireone-v2.0/Makefile
index af273a5d..85f06de4 100644
--- a/src/telefireone-v2.0/Makefile
+++ b/src/telefireone-v2.0/Makefile
@@ -65,10 +65,6 @@ PRODUCT=TeleFireOne-v2.0
 PRODUCT_DEF=-DTELEFIREONE_V_2_0
 IDPRODUCT=0x000f
 
-# Include floating-point enabled printf
-
-NEWLIB_PRINTF_CFLAGS = 
-
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF)
 
 PROGNAME = telefireone-v2.0
diff --git a/src/telestatic-v3.0/Makefile b/src/telestatic-v3.0/Makefile
index 124b47fb..5bc8d56a 100644
--- a/src/telestatic-v3.0/Makefile
+++ b/src/telestatic-v3.0/Makefile
@@ -64,10 +64,6 @@ PRODUCT=TeleStatic-v3.0
 PRODUCT_DEF=-DTELESTATIC_V_3_0
 IDPRODUCT=0x000f
 
-# Include floating-point enabled printf
-
-NEWLIB_PRINTF_CFLAGS = 
-
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF)
 
 PROGNAME = telestatic-v3.0
-- 
2.30.2