From fac28192fa3cd35f8a0fa85053334e2610467d94 Mon Sep 17 00:00:00 2001
From: mcudev <29890609+mcudev@users.noreply.github.com>
Date: Fri, 13 Oct 2017 19:22:07 -0400
Subject: [PATCH] boardloader, bootloader: SConscript freestanding and link
 against nano c library

---
 SConscript.boardloader | 5 ++---
 SConscript.bootloader  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/SConscript.boardloader b/SConscript.boardloader
index c09567d49..73fb215e6 100644
--- a/SConscript.boardloader
+++ b/SConscript.boardloader
@@ -33,7 +33,6 @@ SOURCE_MOD += [
 ]
 
 SOURCE_MICROPYTHON = [
-    'vendor/micropython/lib/libc/string0.c',
 ]
 
 SOURCE_STMHAL = [
@@ -105,7 +104,7 @@ env.Replace(
     '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith '
     '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard '
     '-fsingle-precision-constant -fdata-sections -ffunction-sections '
-    '-fstack-protector-all '
+    '-fstack-protector-all -ffreestanding '
     + CCFLAGS_MOD,
     CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
     LINKFLAGS='-nostdlib -T embed/boardloader/memory.ld --gc-sections',
@@ -143,7 +142,7 @@ program_elf = env.Command(
     target='boardloader.elf',
     source=obj_program,
     action=
-    '$LINK -o $TARGET $LINKFLAGS $SOURCES `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-libgcc-file-name`',
+    '$LINK -o $TARGET $LINKFLAGS $SOURCES `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-libgcc-file-name` `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-file-name=libc_nano.a`',
 )
 
 program_bin = env.Command(
diff --git a/SConscript.bootloader b/SConscript.bootloader
index 2a7fdb566..521a2e301 100644
--- a/SConscript.bootloader
+++ b/SConscript.bootloader
@@ -39,7 +39,6 @@ SOURCE_MOD += [
 ]
 
 SOURCE_MICROPYTHON = [
-    'vendor/micropython/lib/libc/string0.c',
 ]
 
 SOURCE_STMHAL = [
@@ -122,7 +121,7 @@ env.Replace(
     '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith '
     '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard '
     '-fsingle-precision-constant -fdata-sections -ffunction-sections '
-    '-fstack-protector-all '
+    '-fstack-protector-all -ffreestanding '
     + CCFLAGS_MOD,
     CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
     LINKFLAGS='-nostdlib -T embed/bootloader/memory.ld --gc-sections',
@@ -165,7 +164,7 @@ program_elf = env.Command(
     target='bootloader.elf',
     source=obj_program,
     action=
-    '$LINK -o $TARGET $LINKFLAGS $SOURCES `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-libgcc-file-name`',
+    '$LINK -o $TARGET $LINKFLAGS $SOURCES `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-libgcc-file-name` `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-file-name=libc_nano.a`',
 )
 
 program_bin = env.Command(