Add SBL baud rate menu choice for Edge

Now Edge board users have two different baud rate options via the menus. One is used for the Ambiq Secure Bootloader (SBL) and the other is used for the SparkFun Variable Loader (SVL).

Two baud rates are provided - 921600 for the majority of boards out there which were purchased from SparkFun, and 115200 for the TensorFlow conference boards.

Edge boards do not come with the SVL, so they default to using the SBL at 921600. You may use SBL to load the SVL sketch and thus get the benefits of the variable bootloader.

Future improvements would be to hide the baud rate selection for the bootloader that is not selected, but this only affects the Edge variant.

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

platform.txt

@@ -133,15 +133,15 @@ recipe.output.save_file={build.project_name}.{build.preferred_export_format}
 # Host-specific definitions for upload tool (using Ambiq's Secure Bootloader SBL)
     # Linux
 tools.ambiq_bin2board.pgm={runtime.platform.path}/tools/ambiq/linux/ambiq_bin2board
-tools.ambiq_bin2board.args=--bin "{build.path}/{build.project_name}.bin" --load-address-blob 0x20000 --magic-num 0xCB -o {build.path}/{build.project_name} --version 0x0 --load-address-wired 0xC000 -i 6 --options 0x1 -b 115200 -port "{serial.port}" -r 2 {upload.verbose}
+tools.ambiq_bin2board.args=--bin "{build.path}/{build.project_name}.bin" --load-address-blob 0x20000 --magic-num 0xCB -o {build.path}/{build.project_name} --version 0x0 --load-address-wired 0xC000 -i 6 --options 0x1 -b {upload.sbl_baud} -port "{serial.port}" -r 2 {upload.verbose}
 
     # MacOSX
 tools.ambiq_bin2board.pgm.macosx={runtime.platform.path}/tools/ambiq/macosx/ambiq_bin2board
-tools.ambiq_bin2board.args.macosx=--bin "{build.path}/{build.project_name}.bin" --load-address-blob 0x20000 --magic-num 0xCB -o {build.path}/{build.project_name} --version 0x0 --load-address-wired 0xC000 -i 6 --options 0x1 -b 115200 -port "{serial.port}" -r 2 {upload.verbose}
+tools.ambiq_bin2board.args.macosx=--bin "{build.path}/{build.project_name}.bin" --load-address-blob 0x20000 --magic-num 0xCB -o {build.path}/{build.project_name} --version 0x0 --load-address-wired 0xC000 -i 6 --options 0x1 -b {upload.sbl_baud} -port "{serial.port}" -r 2 {upload.verbose}
 
     # Windows
 tools.ambiq_bin2board.pgm.windows="{runtime.platform.path}/tools/ambiq/windows/ambiq_bin2board.exe"
-tools.ambiq_bin2board.args.windows=--bin "{build.path}/{build.project_name}.bin" --load-address-blob 0x20000 --magic-num 0xCB -o {build.path}/{build.project_name} --version 0x0 --load-address-wired 0xC000 -i 6 --options 0x1 -b 115200 -port "{serial.port}" -r 2 {upload.verbose}
+tools.ambiq_bin2board.args.windows=--bin "{build.path}/{build.project_name}.bin" --load-address-blob 0x20000 --magic-num 0xCB -o {build.path}/{build.project_name} --version 0x0 --load-address-wired 0xC000 -i 6 --options 0x1 -b {upload.sbl_baud} -port "{serial.port}" -r 2 {upload.verbose}
 
 # Additional Loader Parameters
 tools.ambiq_bin2board.upload.protocol=ap3
@@ -155,15 +155,15 @@ tools.ambiq_bin2board.upload.pattern={pgm} {args}
 
     # Linux
 tools.artemis_svl.pgm={runtime.platform.path}/tools/artemis/linux/artemis_svl
-tools.artemis_svl.args="{serial.port}" -f "{build.path}/{build.project_name}.bin" -b {upload.baud} {upload.verbose}
+tools.artemis_svl.args="{serial.port}" -f "{build.path}/{build.project_name}.bin" -b {upload.svl_baud} {upload.verbose}
 
     # MacOSX
 tools.artemis_svl.pgm.macosx={runtime.platform.path}/tools/artemis/macosx/artemis_svl
-tools.artemis_svl.args.macosx="{serial.port}" -f "{build.path}/{build.project_name}.bin" -b {upload.baud} {upload.verbose}
+tools.artemis_svl.args.macosx="{serial.port}" -f "{build.path}/{build.project_name}.bin" -b {upload.svl_baud} {upload.verbose}
 
     # Windows
 tools.artemis_svl.pgm.windows="{runtime.platform.path}/tools/artemis/windows/artemis_svl.exe"
-tools.artemis_svl.args.windows="{serial.port}" -f "{build.path}/{build.project_name}.bin" -b {upload.baud} {upload.verbose}
+tools.artemis_svl.args.windows="{serial.port}" -f "{build.path}/{build.project_name}.bin" -b {upload.svl_baud} {upload.verbose}
 
 # Additional Loader Parameters
 tools.artemis_svl.upload.protocol=ap3