Merge branch 'master' into Tone

Author: oclyke

boards.txt

@@ -19,8 +19,9 @@
 # SOFTWARE.
 
 # Menu Options
-menu.svl_baud=SVL Baud Rate
 menu.loader=Bootloader
+menu.svl_baud=SVL Baud Rate
+menu.sbl_baud=Ambiq Secure Bootloader Baud Rate
 
 
 
@@ -30,6 +31,7 @@ artemis.name=SparkFun Artemis Module
 artemis.build.variant=SparkFun_Artemis
 artemis.build.board=SFE_ARTEMIS
 artemis.upload.maximum_size=960000
+artemis.upload.sbl_baud=115200
 artemis.build.arch=APOLLO3
 artemis.build.mcu=cortex-m4
 artemis.build.f_cpu=48000000L
@@ -47,11 +49,11 @@ artemis.menu.svl_baud.57600=57600
 artemis.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
 artemis.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
 
-artemis.menu.svl_baud.57600.upload.baud=57600
-artemis.menu.svl_baud.115200.upload.baud=115200
-artemis.menu.svl_baud.230400.upload.baud=230400
-artemis.menu.svl_baud.460800.upload.baud=460800
-artemis.menu.svl_baud.921600.upload.baud=921600
+artemis.menu.svl_baud.57600.upload.svl_baud=57600
+artemis.menu.svl_baud.115200.upload.svl_baud=115200
+artemis.menu.svl_baud.230400.upload.svl_baud=230400
+artemis.menu.svl_baud.460800.upload.svl_baud=460800
+artemis.menu.svl_baud.921600.upload.svl_baud=921600
 
 artemis.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
 artemis.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,6 +68,7 @@ amap3blackboard.name=SparkFun BlackBoard Artemis
 amap3blackboard.build.variant=SparkFun_BlackBoard_Artemis
 amap3blackboard.build.board=AM_AP3_SFE_BB_ARTEMIS
 amap3blackboard.upload.maximum_size=960000
+amap3blackboard.upload.sbl_baud=115200
 amap3blackboard.build.arch=APOLLO3
 amap3blackboard.build.mcu=cortex-m4
 amap3blackboard.build.f_cpu=48000000L
@@ -84,11 +87,11 @@ amap3blackboard.menu.svl_baud.57600=57600
 amap3blackboard.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
 amap3blackboard.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
 
-amap3blackboard.menu.svl_baud.57600.upload.baud=57600
-amap3blackboard.menu.svl_baud.115200.upload.baud=115200
-amap3blackboard.menu.svl_baud.230400.upload.baud=230400
-amap3blackboard.menu.svl_baud.460800.upload.baud=460800
-amap3blackboard.menu.svl_baud.921600.upload.baud=921600
+amap3blackboard.menu.svl_baud.57600.upload.svl_baud=57600
+amap3blackboard.menu.svl_baud.115200.upload.svl_baud=115200
+amap3blackboard.menu.svl_baud.230400.upload.svl_baud=230400
+amap3blackboard.menu.svl_baud.460800.upload.svl_baud=460800
+amap3blackboard.menu.svl_baud.921600.upload.svl_baud=921600
 
 amap3blackboard.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
 amap3blackboard.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -102,6 +105,7 @@ amap3nano.name=SparkFun BlackBoard Artemis Nano
 amap3nano.build.variant=SparkFun_BlackBoard_Artemis_Nano
 amap3nano.build.board=AM_AP3_SFE_BB_ARTEMIS_NANO
 amap3nano.upload.maximum_size=960000
+amap3nano.upload.sbl_baud=115200
 amap3nano.build.arch=APOLLO3
 amap3nano.build.mcu=cortex-m4
 amap3nano.build.f_cpu=48000000L
@@ -120,11 +124,11 @@ amap3nano.menu.svl_baud.57600=57600
 amap3nano.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
 amap3nano.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
 
-amap3nano.menu.svl_baud.57600.upload.baud=57600
-amap3nano.menu.svl_baud.115200.upload.baud=115200
-amap3nano.menu.svl_baud.230400.upload.baud=230400
-amap3nano.menu.svl_baud.460800.upload.baud=460800
-amap3nano.menu.svl_baud.921600.upload.baud=921600
+amap3nano.menu.svl_baud.57600.upload.svl_baud=57600
+amap3nano.menu.svl_baud.115200.upload.svl_baud=115200
+amap3nano.menu.svl_baud.230400.upload.svl_baud=230400
+amap3nano.menu.svl_baud.460800.upload.svl_baud=460800
+amap3nano.menu.svl_baud.921600.upload.svl_baud=921600
 
 amap3nano.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
 amap3nano.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -138,6 +142,7 @@ amap3atp.name=SparkFun BlackBoard Artemis ATP
 amap3atp.build.variant=SparkFun_BlackBoard_Artemis_ATP
 amap3atp.build.board=AM_AP3_SFE_BB_ARTEMIS_ATP
 amap3atp.upload.maximum_size=960000
+amap3atp.upload.sbl_baud=115200
 amap3atp.build.arch=APOLLO3
 amap3atp.build.mcu=cortex-m4
 amap3atp.build.f_cpu=48000000L
@@ -156,11 +161,11 @@ amap3atp.menu.svl_baud.57600=57600
 amap3atp.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
 amap3atp.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
 
-amap3atp.menu.svl_baud.57600.upload.baud=57600
-amap3atp.menu.svl_baud.115200.upload.baud=115200
-amap3atp.menu.svl_baud.230400.upload.baud=230400
-amap3atp.menu.svl_baud.460800.upload.baud=460800
-amap3atp.menu.svl_baud.921600.upload.baud=921600
+amap3atp.menu.svl_baud.57600.upload.svl_baud=57600
+amap3atp.menu.svl_baud.115200.upload.svl_baud=115200
+amap3atp.menu.svl_baud.230400.upload.svl_baud=230400
+amap3atp.menu.svl_baud.460800.upload.svl_baud=460800
+amap3atp.menu.svl_baud.921600.upload.svl_baud=921600
 
 amap3atp.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
 amap3atp.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -175,7 +180,6 @@ edge.build.variant=SparkFun_Edge
 edge.build.board=SFE_EDGE
 edge.upload.tool=ambiq_bin2board
 edge.upload.maximum_size=960000
-edge.upload.baud=115200
 edge.build.arch=APOLLO3
 edge.build.mcu=cortex-m4
 edge.build.f_cpu=48000000L
@@ -186,12 +190,42 @@ edge.build.libs=
 edge.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
 edge.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
 
+edge.menu.sbl_baud.921600=921600 (Default)
+edge.menu.sbl_baud.115200=115200 (TensorFlow Conference Versions)
+
+edge.menu.svl_baud.921600=921600
+edge.menu.svl_baud.460800=460800
+edge.menu.svl_baud.230400=230400
+edge.menu.svl_baud.115200=115200
+edge.menu.svl_baud.57600=57600
+
+edge.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Default)
+edge.menu.loader.sparkfun_svl=SparkFun Variable Loader (Enable w/ Artemis Bootloader)
+
+edge.menu.sbl_baud.115200.upload.sbl_baud=115200
+edge.menu.sbl_baud.921600.upload.sbl_baud=921600
+
+edge.menu.svl_baud.57600.upload.svl_baud=57600
+edge.menu.svl_baud.115200.upload.svl_baud=115200
+edge.menu.svl_baud.230400.upload.svl_baud=230400
+edge.menu.svl_baud.460800.upload.svl_baud=460800
+edge.menu.svl_baud.921600.upload.svl_baud=921600
+
+edge.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
+edge.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
+
+edge.menu.loader.sparkfun_svl.upload.tool=artemis_svl
+edge.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
+
+
+
 ###############################################################
 
 edgeV2.name=SparkFun Edge V2
 edgeV2.build.variant=SparkFun_Edge_V2
 edgeV2.build.board=SFE_EDGE_V2
 edgeV2.upload.maximum_size=960000
+edgeV2.upload.sbl_baud=115200
 edgeV2.build.arch=APOLLO3
 edgeV2.build.mcu=cortex-m4
 edgeV2.build.f_cpu=48000000L
@@ -209,11 +243,11 @@ edgeV2.menu.svl_baud.57600=57600
 edgeV2.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
 edgeV2.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
 
-edgeV2.menu.svl_baud.57600.upload.baud=57600
-edgeV2.menu.svl_baud.115200.upload.baud=115200
-edgeV2.menu.svl_baud.230400.upload.baud=230400
-edgeV2.menu.svl_baud.460800.upload.baud=460800
-edgeV2.menu.svl_baud.921600.upload.baud=921600
+edgeV2.menu.svl_baud.57600.upload.svl_baud=57600
+edgeV2.menu.svl_baud.115200.upload.svl_baud=115200
+edgeV2.menu.svl_baud.230400.upload.svl_baud=230400
+edgeV2.menu.svl_baud.460800.upload.svl_baud=460800
+edgeV2.menu.svl_baud.921600.upload.svl_baud=921600
 
 edgeV2.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
 edgeV2.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld