Merge branch 'master' into core-ble

Author: oclyke

boards.txt

@@ -74,7 +74,7 @@ amap3redboard.build.mcu=cortex-m4
 amap3redboard.build.f_cpu=48000000L
 amap3redboard.build.core=arduino
 amap3redboard.build.includes=-I{build.variant.path}/config
-amap3redboard.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+amap3redboard.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 amap3redboard.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
 amap3redboard.build.preferred_export_format=axf
 amap3redboard.build.defs=
@@ -111,7 +111,7 @@ amap3nano.build.mcu=cortex-m4
 amap3nano.build.f_cpu=48000000L
 amap3nano.build.core=arduino
 amap3nano.build.includes=-I{build.variant.path}/config
-amap3nano.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+amap3nano.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 amap3nano.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
 amap3nano.build.preferred_export_format=axf
 amap3nano.build.defs=
@@ -149,7 +149,7 @@ amap3atp.build.f_cpu=48000000L
 amap3atp.build.core=arduino
 amap3atp.build.includes=-I{build.variant.path}/config
 amap3atp.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
-amap3atp.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+amap3atp.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 amap3atp.build.preferred_export_format=axf
 amap3atp.build.defs=
 amap3atp.build.libs=
@@ -185,7 +185,7 @@ amap3thing.build.mcu=cortex-m4
 amap3thing.build.f_cpu=48000000L
 amap3thing.build.core=arduino
 amap3thing.build.includes=-I{build.variant.path}/config
-amap3thing.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+amap3thing.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 amap3thing.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
 amap3thing.build.preferred_export_format=axf
 amap3thing.build.defs=
@@ -270,7 +270,7 @@ edge2.build.f_cpu=48000000L
 edge2.build.core=arduino
 edge2.build.includes=-I{build.variant.path}/config
 edge2.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
-edge2.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+edge2.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 edge2.build.preferred_export_format=axf
 edge2.build.defs=
 edge2.build.libs=