Update tutorial to use MCUBoot as bootloader
diff --git a/docs/tutorials/ble/blehci_project.rst b/docs/tutorials/ble/blehci_project.rst
index 04144ae..0dbce65 100644
--- a/docs/tutorials/ble/blehci_project.rst
+++ b/docs/tutorials/ble/blehci_project.rst
@@ -67,7 +67,7 @@
::
$ newt target create nrf52_boot
- $ newt target set nrf52_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set nrf52_boot app=@mcuboot/boot/mynewt
$ newt target set nrf52_boot bsp=@apache-mynewt-core/hw/bsp/nrf52dk
$ newt target set nrf52_boot build_profile=optimized
@@ -92,7 +92,7 @@
bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=optimized
targets/nrf52_boot
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=optimized
@@ -105,7 +105,7 @@
$ newt build nrf52_boot
<snip>
- Linking ~/dev/blehciproj/bin/targets/nrf52_boot/app/apps/boot/boot.elf
+ Linking ~/dev/blehciproj/bin/targets/nrf52_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/nrf52_boot
$ newt build myble2
diff --git a/docs/tutorials/blinky/arduino_zero.rst b/docs/tutorials/blinky/arduino_zero.rst
index 3cc347d..26b153f 100644
--- a/docs/tutorials/blinky/arduino_zero.rst
+++ b/docs/tutorials/blinky/arduino_zero.rst
@@ -134,7 +134,7 @@
$ newt target create arduino_boot
$ newt target set arduino_boot bsp=@mynewt_arduino_zero/hw/bsp/arduino_zero
- $ newt target set arduino_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set arduino_boot app=@mcuboot/boot/mynewt
$ newt target set arduino_boot build_profile=optimized
Target targets/arduino_boot successfully set target.build_profile to optimized
$ newt target set arduino_boot syscfg=BSP_ARDUINO_ZERO_PRO=1
@@ -150,7 +150,7 @@
- Create a target named ``arduino_boot`` for the Arduino Zero
Bootloader.
- Set the application for the ``arduino_boot`` target to the default
- Apache Mynewt bootloader (``@apache-mynewt-core/apps/boot``)
+ MCUBoot bootloader (``@mcuboot/boot/mynewt``)
- Set the board support package for the target to
``@mynewt_arduino_zero/hw/bsp/arduino_zero``. This is a reference to
the downloaded Arduino Zero support from Github.
@@ -198,15 +198,15 @@
$ newt build arduino_boot
Building target targets/arduino_boot
Compiling bin/targets/arduino_boot/generated/src/arduino_boot-sysinit-app.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
Compiling bin/targets/arduino_boot/generated/src/arduino_boot-sysflash.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/arc4.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
....
@@ -214,7 +214,7 @@
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/arduino_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/arduino_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/arduino_boot
Build the Blinky Application
@@ -290,7 +290,7 @@
$ newt load arduino_boot -v
Loading bootloader
- Error: Downloading ~/dev/myproj/bin/targets/arduino_boot/app/apps/boot/boot.elf.bin to 0x0
+ Error: Downloading ~/dev/myproj/bin/targets/arduino_boot/boot/mynewt/mynewt.elf.bin to 0x0
Open On-Chip Debugger 0.9.0 (2015-11-15-05:39)
Licensed under GNU GPL v2
For bug reports, read
diff --git a/docs/tutorials/blinky/blinky_primo.rst b/docs/tutorials/blinky/blinky_primo.rst
index 429300f..c451371 100644
--- a/docs/tutorials/blinky/blinky_primo.rst
+++ b/docs/tutorials/blinky/blinky_primo.rst
@@ -76,7 +76,7 @@
.. code-block:: console
$ newt target create primo_boot
- $ newt target set primo_boot app=@apache-mynewt-core/apps/boot bsp=@apache-mynewt-core/hw/bsp/arduino_primo_nrf52 build_profile=optimized
+ $ newt target set primo_boot app=@mcuboot/boot/mynewt bsp=@apache-mynewt-core/hw/bsp/arduino_primo_nrf52 build_profile=optimized
Run the following ``newt target`` commands to create a target for the
Blinky application. We name the target ``primoblinky``.
@@ -105,7 +105,7 @@
bsp=@apache-mynewt-core/hw/bsp/native
build_profile=debug
targets/primo_boot
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/arduino_primo_nrf52
build_profile=optimized
targets/primoblinky
@@ -122,20 +122,20 @@
$ newt build primo_boot
Building target targets/primo_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
...
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/primo_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/primo_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/primo_boot
Run the ``newt build primoblinky`` command to build the Blinky
diff --git a/docs/tutorials/blinky/blinky_stm32f4disc.rst b/docs/tutorials/blinky/blinky_stm32f4disc.rst
index 094e2f7..d5e45b6 100644
--- a/docs/tutorials/blinky/blinky_stm32f4disc.rst
+++ b/docs/tutorials/blinky/blinky_stm32f4disc.rst
@@ -46,7 +46,7 @@
.. code-block:: console
$ newt target create stm32f4disc_boot
- $ newt target set stm32f4disc_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set stm32f4disc_boot app=@mcuboot/boot/mynewt
$ newt target set stm32f4disc_boot bsp=@apache-mynewt-core/hw/bsp/stm32f4discovery
$ newt target set stm32f4disc_boot build_profile=optimized
@@ -75,7 +75,7 @@
bsp=@apache-mynewt-core/hw/bsp/stm32f4discovery
build_profile=debug
targets/stm32f4disc_boot
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/stm32f4discovery
build_profile=optimized
@@ -88,13 +88,13 @@
$ newt build stm32f4disc_boot
Building target targets/stm32f4disc_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
...
@@ -102,7 +102,7 @@
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/stm32f4disc_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/stm32f4disc_boot/app/boot/mynwet/mynewt.elf
Target successfully built: targets/stm32f4disc_boot
Run the ``newt build stm32f4disc_blinky`` command to build the Blinky
diff --git a/docs/tutorials/blinky/nRF52.rst b/docs/tutorials/blinky/nRF52.rst
index 45e1b07..cb8f742 100644
--- a/docs/tutorials/blinky/nRF52.rst
+++ b/docs/tutorials/blinky/nRF52.rst
@@ -67,7 +67,7 @@
:emphasize-lines: 3
$ newt target create nrf52_boot
- $ newt target set nrf52_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set nrf52_boot app=@mcuboot/boot/mynewt
$ newt target set nrf52_boot bsp=@apache-mynewt-core/hw/bsp/nrf52dk
$ newt target set nrf52_boot build_profile=optimized
@@ -93,7 +93,7 @@
bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=debug
targets/nrf52_boot
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=optimized
@@ -106,21 +106,21 @@
$ newt build nrf52_boot
Building target targets/nrf52_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
...
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/nrf52_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/nrf52_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/nrf52_boot
Run the ``newt build nrf52_blinky`` command to build the Blinky
diff --git a/docs/tutorials/blinky/olimex.rst b/docs/tutorials/blinky/olimex.rst
index fcb08a9..a213d7a 100644
--- a/docs/tutorials/blinky/olimex.rst
+++ b/docs/tutorials/blinky/olimex.rst
@@ -55,7 +55,7 @@
$ newt target create boot_olimex
$ newt target set boot_olimex build_profile=optimized
- $ newt target set boot_olimex app=@apache-mynewt-core/apps/boot
+ $ newt target set boot_olimex app=@mcuboot/boot/mynewt
$ newt target set boot_olimex bsp=@apache-mynewt-core/hw/bsp/olimex_stm32-e407_devboard
Run the following ``newt target`` commands to create a target for the
@@ -77,9 +77,9 @@
$ newt build boot_olimex
Building target targets/boot_olimex
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
Compiling bin/targets/boot_olimex/generated/src/boot_olimex-sysflash.c
...
@@ -89,7 +89,7 @@
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/boot_olimex/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/boot_olimex/app/boot/mynewt/mynewt.elf
Target successfully built: targets/boot_olimex
Build the Blinky Application
@@ -184,7 +184,7 @@
$ newt load -v boot_olimex
Loading bootloader
- Load command: ~/dev/myproj/repos/apache-mynewt-core/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh ~/dev/myproj/repos/apache-mynewt-core/hw/bsp/olimex_stm32-e407_devboard ~/dev/myproj/bin/targets/boot_olimex/app/apps/boot/boot
+ Load command: ~/dev/myproj/repos/apache-mynewt-core/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh ~/dev/myproj/repos/apache-mynewt-core/hw/bsp/olimex_stm32-e407_devboard ~/dev/myproj/bin/targets/boot_olimex/app/boot/mynewt/mynewt
Successfully loaded image.
Note: If you are using Windows and get a ``no device found`` error, you
diff --git a/docs/tutorials/blinky/rbnano2.rst b/docs/tutorials/blinky/rbnano2.rst
index 88042aa..d7dd642 100644
--- a/docs/tutorials/blinky/rbnano2.rst
+++ b/docs/tutorials/blinky/rbnano2.rst
@@ -49,7 +49,7 @@
.. code-block:: console
$ newt target create rbnano2_boot
- $ newt target set rbnano2_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set rbnano2_boot app=@mcuboot/boot/mynewt
$ newt target set rbnano2_boot bsp=@apache-mynewt-core/hw/bsp/rb-nano2
$ newt target set rbnano2_boot build_profile=optimized
@@ -74,7 +74,7 @@
bsp=@apache-mynewt-core/hw/bsp/rb-nano2
build_profile=debug
targets/rbnano2_boot
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/rb-nano2
build_profile=optimized
@@ -87,20 +87,20 @@
$ newt build rbnano2_boot
Building target targets/rbnano2_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
...
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/rbnano2_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/rbnano2_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/rbnano2_boot
Run the ``newt build rbnano2_blinky`` command to build the Blinky
diff --git a/docs/tutorials/devmgmt/add_newtmgr.rst b/docs/tutorials/devmgmt/add_newtmgr.rst
index 97bec60..6b0f358 100644
--- a/docs/tutorials/devmgmt/add_newtmgr.rst
+++ b/docs/tutorials/devmgmt/add_newtmgr.rst
@@ -149,7 +149,7 @@
$ newt build nrf52_boot
<snip>
- App successfully built: ./bin/nrf52_boot/apps/boot/boot.elf
+ App successfully built: ./bin/nrf52_boot/boot/mynewt/mynewt.elf
$ newt build myble
Compiling hci_common.c
Compiling util.c
diff --git a/docs/tutorials/lora/lorawanapp.rst b/docs/tutorials/lora/lorawanapp.rst
index 2667739..b17ad97 100644
--- a/docs/tutorials/lora/lorawanapp.rst
+++ b/docs/tutorials/lora/lorawanapp.rst
@@ -63,7 +63,7 @@
$ newt target create telee02_boot
$ newt target set telee02_boot bsp=@apache-mynewt-core/hw/bsp/telee02
- $ newt target set telee02_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set telee02_boot app=@mcuboot/boot/mynewt
$ newt target set telee02_boot build_profile=optimized
$ newt target create lora_app_shell_telee02
@@ -89,7 +89,7 @@
$ newt target show telee02_boot
targets/telee02_boot
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/telee02
build_profile=optimized
@@ -119,7 +119,7 @@
Archiving telee02_boot-sysinit-app.a
Archiving util_mem.a
- Linking /Users/wes/dev/wes/bin/targets/telee02_boot/app/apps/boot/boot.elf
+ Linking /Users/wes/dev/wes/bin/targets/telee02_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/telee02_boot
$ newt clean lora_app_shell_telee02
diff --git a/docs/tutorials/other/wi-fi_on_arduino.rst b/docs/tutorials/other/wi-fi_on_arduino.rst
index a27ce8f..22f4c6f 100644
--- a/docs/tutorials/other/wi-fi_on_arduino.rst
+++ b/docs/tutorials/other/wi-fi_on_arduino.rst
@@ -146,7 +146,7 @@
$ newt target create mkr1000_boot
$ newt target set mkr1000_boot bsp=@mynewt_arduino_zero/hw/bsp/arduino_mkr1000
- $ newt target set mkr1000_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set mkr1000_boot app=@mcuboot/boot/mynewt
$ newt target set mkr1000_boot build_profile=optimized
$ newt target set mkr1000_boot syscfg=BSP_ARDUINO_ZERO_PRO=1
@@ -175,17 +175,17 @@
$ newt build mkr1000_boot
Building target targets/mkr1000_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
...
Archiving util_mem.a
- Linking ~/dev/arduinowifi/bin/targets/mkr1000_boot/app/apps/boot/boot.elf
+ Linking ~/dev/arduinowifi/bin/targets/mkr1000_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/mkr1000_boot
$
@@ -378,4 +378,4 @@
on the Arduino board.
.. |J-Link debug probe to MKR1000| image:: ../pics/mkr1000-jlink.jpg
-.. |Serial Connection to MKR1000| image:: ../pics/mkr1000-serial.jpg
\ No newline at end of file
+.. |Serial Connection to MKR1000| image:: ../pics/mkr1000-serial.jpg
diff --git a/docs/tutorials/sensors/air_quality_sensor.rst b/docs/tutorials/sensors/air_quality_sensor.rst
index 62bb103..ff69a08 100644
--- a/docs/tutorials/sensors/air_quality_sensor.rst
+++ b/docs/tutorials/sensors/air_quality_sensor.rst
@@ -58,8 +58,8 @@
Target targets/boot_nrf52dk successfully created
[user@IsMyLaptop:~/src/air_quality]$ newt target set boot_nrf52dk bsp=@apache-mynewt-core/hw/bsp/nrf52dk
Target targets/boot_nrf52dk successfully set target.bsp to @apache-mynewt-core/hw/bsp/nrf52dk
- [user@IsMyLaptop:~/src/air_quality]$ newt target set boot_nrf52dk app=@apache-mynewt-core/apps/boot
- Target targets/boot_nrf52dk successfully set target.app to @apache-mynewt-core/apps/boot
+ [user@IsMyLaptop:~/src/air_quality]$ newt target set boot_nrf52dk app=@mcuboot/boot/mynewt
+ Target targets/boot_nrf52dk successfully set target.app to @mcuboot/boot/mynewt
[user@IsMyLaptop:~/src/air_quality]$ newt target set boot_nrf52dk build_profile=optimized
Target targets/boot_nrf52dk successfully set target.build_profile to optimized
[user@IsMyLaptop:~/src/air_quality]$ newt target show
@@ -68,7 +68,7 @@
build_profile=debug
compiler=compiler/sim
targets/boot_nrf52dk
- app=@apache-mynewt-core/apps/boot
+ app=@mcuboot/boot/mynewt
bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=optimized
targets/my_blinky_sim
@@ -83,7 +83,7 @@
newt build boot_nrf52dk
....
Linking boot.elf
- App successfully built: /Users/user/src/air_quality/bin/boot_nrf52dk/apps/boot/boot.elf
+ App successfully built: /Users/user/src/air_quality/bin/boot_nrf52dk/boot/mynewt/mynewt.elf
[user@IsMyLaptop:~/src/air_quality]
$ newt load boot_nrf52dk
@@ -110,9 +110,9 @@
pkg.homepage: "http://mynewt.apache.org/"
pkg.keywords:
- pkg.deps:
+ pkg.deps:
- "@apache-mynewt-core/boot/split"
- - "@apache-mynewt-core/boot/bootutil"
+ - "@mcuboot/boot/bootutil"
- "@apache-mynewt-core/kernel/os"
- "@apache-mynewt-core/mgmt/imgmgr"
- "@apache-mynewt-core/mgmt/newtmgr"
@@ -273,7 +273,7 @@
pkg.deps:
- "@apache-mynewt-core/boot/split"
- - "@apache-mynewt-core/boot/bootutil"
+ - "@mcuboot/boot/bootutil"
- "@apache-mynewt-core/kernel/os"
....
- "@apache-mynewt-core/sys/id"
diff --git a/docs/tutorials/sensors/nrf52_adc.rst b/docs/tutorials/sensors/nrf52_adc.rst
index 8c2c1cc..920e63d 100644
--- a/docs/tutorials/sensors/nrf52_adc.rst
+++ b/docs/tutorials/sensors/nrf52_adc.rst
@@ -83,8 +83,11 @@
....
Downloading repository mynewt-nimble (commit: master) ...
....
+ Downloading repository mcuboot (commit: master) ...
+ ....
apache-mynewt-core successfully installed version 0.0.0
apache-mynewt-nimble successfully installed version 0.0.0
+ mcuboot successfully installed version 0.0.0
Create the App and Targets
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -109,9 +112,9 @@
pkg.homepage: "http://mynewt.apache.org/"
pkg.keywords:
- pkg.deps:
+ pkg.deps:
- "@apache-mynewt-core/boot/split"
- - "@apache-mynewt-core/boot/bootutil"
+ - "@mcuboot/boot/bootutil"
- "@apache-mynewt-core/kernel/os"
- "@apache-mynewt-core/mgmt/imgmgr"
- "@apache-mynewt-core/mgmt/newtmgr"
@@ -144,18 +147,18 @@
$ newt target set nrf52_adc build_profile=debug
$ newt target create nrf52_boot
- $ newt target set nrf52_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set nrf52_boot app=@mcuboot/boot/mynewt
$ newt target set nrf52_boot bsp=@apache-mynewt-core/hw/bsp/nrf52dk
$ newt target set nrf52_boot build_profile=optimized
- $ newt target show
- targets nrf52_adc
+ $ newt target show
+ targets nrf52_adc
app=apps/nrf52_adc
- bsp=@apache-mynewt-core/hw/bsp/nrf52dk
+ bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=debug
- targets nrf52_boot
- app=@apache-mynewt-core/apps/boot
- bsp=@apache-mynewt-core/hw/bsp/nrf52dk
+ targets nrf52_boot
+ app=@mcuboot/boot/mynewt
+ bsp=@apache-mynewt-core/hw/bsp/nrf52dk
build_profile=optimized
**Note**: If you've already built and installed a bootloader for your NRF52dk then you do
@@ -166,12 +169,12 @@
.. code-block:: console
- $ newt build nrf52_boot
- ...
- Compiling boot.c
- Archiving boot.a
- Linking boot.elf
- App successfully built: ~/dev/myadc/bin/nrf52_boot/apps/boot/boot.elf
+ $ newt build nrf52_boot
+ ...
+ Compiling boot.c
+ Archiving boot.a
+ Linking boot.elf
+ App successfully built: ~/dev/myadc/bin/nrf52_boot/boot/mynewt/mynewt.elf
.. code-block:: console
@@ -483,7 +486,7 @@
pkg.deps:
- "@apache-mynewt-core/boot/split"
- - "@apache-mynewt-core/boot/bootutil"
+ - "@mcuboot/boot/bootutil"
- "@apache-mynewt-core/kernel/os"
- "@apache-mynewt-core/mgmt/imgmgr"
- "@apache-mynewt-core/mgmt/newtmgr"
diff --git a/docs/tutorials/sensors/sensor_nrf52_bno055.rst b/docs/tutorials/sensors/sensor_nrf52_bno055.rst
index 2066f34..7d7faeb 100644
--- a/docs/tutorials/sensors/sensor_nrf52_bno055.rst
+++ b/docs/tutorials/sensors/sensor_nrf52_bno055.rst
@@ -171,8 +171,8 @@
$ newt target create nrf52_boot
Target targets/nrf52_boot successfully created
- $ newt target set nrf52_boot app=@apache-mynewt-core/apps/boot bsp=@apache-mynewt-core/hw/bsp/nrf52dk build_profile=optimized
- Target targets/nrf52_boot successfully set target.app to @apache-mynewt-core/apps/boot
+ $ newt target set nrf52_boot app=@mcuboot/boot/mynewt bsp=@apache-mynewt-core/hw/bsp/nrf52dk build_profile=optimized
+ Target targets/nrf52_boot successfully set target.app to @mcuboot/boot/mynewt
Target targets/nrf52_boot successfully set target.bsp to @apache-mynewt-core/hw/bsp/nrf52dk
Target targets/nrf52_boot successfully set target.build_profile to optimized
$
@@ -186,19 +186,19 @@
$ newt build nrf52_boot
Building target targets/nrf52_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
...
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/nrf52_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/nrf52_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/nrf52_boot
2. Run the ``newt build nrf52_bno055_test`` command to build the
@@ -208,11 +208,11 @@
$ newt build nrf52_bno055_test
Building target targets/nrf52_bno055_test
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
Compiling repos/apache-mynewt-core/apps/sensors_test/src/misc.c
Compiling repos/apache-mynewt-core/apps/sensors_test/src/gatt_svr.c
Compiling repos/apache-mynewt-core/apps/sensors_test/src/main.c
diff --git a/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst b/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst
index ede71fd..6c125d2 100644
--- a/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst
+++ b/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst
@@ -201,8 +201,8 @@
Target targets/thingy_boot successfully created
$ newt target set thingy_boot bsp=@apache-mynewt-core/hw/bsp/nrf52-thingy
Target targets/thingy_boot successfully set target.bsp to @apache-mynewt-core/hw/bsp/nrf52-thingy
- $ newt target set thingy_boot app=@apache-mynewt-core/apps/boot
- Target targets/thingy_boot successfully set target.app to @apache-mynewt-core/apps/boot
+ $ newt target set thingy_boot app=@mcuboot/boot/mynewt
+ Target targets/thingy_boot successfully set target.app to @mcuboot/boot/mynewt
$ newt target set thingy_boot build_profile=optimized
Target targets/thingy_boot successfully set target.build_profile to optimized
@@ -218,7 +218,7 @@
Archiving thingy_boot-sysinit-app.a
Archiving util_mem.a
- Linking ~/dev/myproj/bin/targets/thingy_boot/app/apps/boot/boot.elf
+ Linking ~/dev/myproj/bin/targets/thingy_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/thingy_boot
Step 6: Connecting the Thingy to your Computer
@@ -774,4 +774,4 @@
data callback.
.. |Thingy| image:: ../pics/thingy.jpg
-.. |J-Link debug probe to Thingy| image:: ../pics/thingy_jlink.jpg
\ No newline at end of file
+.. |J-Link debug probe to Thingy| image:: ../pics/thingy_jlink.jpg
diff --git a/docs/tutorials/slinky/project-nrf52-slinky.rst b/docs/tutorials/slinky/project-nrf52-slinky.rst
index bd4da07..74f5508 100644
--- a/docs/tutorials/slinky/project-nrf52-slinky.rst
+++ b/docs/tutorials/slinky/project-nrf52-slinky.rst
@@ -53,7 +53,7 @@
$ newt target create nrf52_boot
$ newt target set nrf52_boot bsp=@apache-mynewt-core/hw/bsp/nrf52dk
$ newt target set nrf52_boot build_profile=optimized
- $ newt target set nrf52_boot app=@apache-mynewt-core/apps/boot
+ $ newt target set nrf52_boot app=@mcuboot/boot/mynewt
Run the following ``newt target`` commands to create a target for the
Slinky application. We name the target ``nrf52_slinky``.
@@ -74,20 +74,20 @@
$ newt build nrf52-boot
Building target targets/nrf52_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
+ Compiling repos/mucboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
...
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/slinky/bin/targets/nrf52_boot/app/apps/boot/boot.elf
+ Linking ~/dev/slinky/bin/targets/nrf52_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/nrf52_boot
Run the ``newt build nrf52_slinky`` command to build the Slinky
@@ -97,15 +97,15 @@
$newt build nrf52_slinky
Building target targets/nrf52_slinky
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
Compiling repos/apache-mynewt-core/boot/split/src/split.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
Compiling repos/apache-mynewt-core/boot/split/src/split_config.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aesni.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
Compiling repos/apache-mynewt-core/apps/slinky/src/main.c
diff --git a/docs/tutorials/slinky/project-stm32-slinky.rst b/docs/tutorials/slinky/project-stm32-slinky.rst
index 6c45865..8a2965a 100644
--- a/docs/tutorials/slinky/project-stm32-slinky.rst
+++ b/docs/tutorials/slinky/project-stm32-slinky.rst
@@ -52,7 +52,7 @@
$ newt target create stm32_boot
$ newt target set stm32_boot bsp=@apache-mynewt-core/hw/bsp/olimex_stm32-e407_devboard
$ newt target set stm32_boot build_profile=optimized
- $ newt target set stm32_boot target.app=@apache-mynewt-core/apps/boot
+ $ newt target set stm32_boot target.app=@mcuboot/boot/mynewt
Run the following ``newt target`` commands to create a target for the
Slinky application. We name the target ``stm32_slinky``.
@@ -73,21 +73,21 @@
$ newt build stm32_boot
Building target targets/stm32_boot
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
Compiling repos/apache-mynewt-core/crypto/mbedtls/src/aes.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
- Compiling repos/apache-mynewt-core/apps/boot/src/boot.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/mynewt/src/main.c
...
Archiving sys_mfg.a
Archiving sys_sysinit.a
Archiving util_mem.a
- Linking ~/dev/slinky/bin/targets/stm32_boot/app/apps/boot/boot.elf
+ Linking ~/dev/slinky/bin/targets/stm32_boot/app/boot/mynewt/mynewt.elf
Target successfully built: targets/stm32_boot
$
@@ -98,13 +98,13 @@
$newt build stm32_slinky
Building target targets/stm32_slinky
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_rsa.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_ec256.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/loader.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/image_validate.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_rsa.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_ec256.c
+ Compiling repos/mcuboot/boot/bootutil/src/loader.c
+ Compiling repos/mcuboot/boot/bootutil/src/image_validate.c
Compiling repos/apache-mynewt-core/boot/split/src/split.c
- Compiling repos/apache-mynewt-core/boot/bootutil/src/bootutil_misc.c
+ Compiling repos/mcuboot/boot/bootutil/src/bootutil_misc.c
Compiling repos/apache-mynewt-core/apps/slinky/src/main.c
...
