From: Bdale Garbee Date: Fri, 21 Feb 2025 10:01:29 +0000 (-0700) Subject: fix for #1095326 X-Git-Tag: debian/1.9.19-3~2 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=234d18af106789a0f868b82377704b11885e8627;p=fw%2Faltos fix for #1095326 --- diff --git a/debian/changelog b/debian/changelog index e3222a5b..f4f0df46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +altos (1.9.19-3) unstable; urgency=medium + + * cherry-pick patch from master branch that moves to smaller crt0 to + resolve newer compiler overflowing bootloader flash, closes: #1095326 + + -- Bdale Garbee Fri, 21 Feb 2025 03:01:09 -0700 + altos (1.9.19-2) unstable; urgency=medium * cherry-pick patch from master branch that fixes FTBFS due to needing diff --git a/debian/patches/series b/debian/patches/series index 6f2a8a22..79812e2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ more-includes.patch +use-smaller-crt0.patch diff --git a/debian/patches/use-smaller-crt0.patch b/debian/patches/use-smaller-crt0.patch new file mode 100644 index 00000000..ed8e595f --- /dev/null +++ b/debian/patches/use-smaller-crt0.patch @@ -0,0 +1,29 @@ +From 13ca1bb20a199447f6e478871f459498d2928bc2 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sun, 16 Feb 2025 14:03:30 -0800 +Subject: [PATCH] altos: Use smaller crt0 for stm boot loader + +This eliminates some of unnecessary startup code and saves a bit of +flash. + +Signed-off-by: Keith Packard +--- + src/stm/Makefile-flash.defs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs +index 776811586..3b0f0bad0 100644 +--- a/src/stm/Makefile-flash.defs ++++ b/src/stm/Makefile-flash.defs +@@ -35,7 +35,7 @@ IDPRODUCT=0x000a + + CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) + +-LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Taltos-loader.ld -n ++LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Taltos-loader.ld -n --crt0=minimal + + PROGNAME=$(HARDWARE)-altos-flash + PROG=$(PROGNAME)-$(VERSION).elf +-- +2.47.2 +