From c4b8ff314abd436d0444ea884ccf142a0b82c8c8 Mon Sep 17 00:00:00 2001 From: carlosperate Date: Sun, 17 Oct 2021 00:31:21 +0100 Subject: [PATCH] Update git URLS, MCUboot is now independent w/ different GitHub org. --- .devcontainer/Dockerfile | 2 +- .devcontainer/build.sh | 2 +- bootloader/README.md | 4 ++-- docker/build.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1dd68f24..46e2facb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -55,7 +55,7 @@ RUN unzip -q /tmp/nRF5_SDK_15.3.0_59ac345 -d /opt RUN rm /tmp/nRF5_SDK_15.3.0_59ac345 # McuBoot # RUN bash -c "source /opt/build.sh; GetMcuBoot;" -RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git +RUN git clone https://github.com/mcu-tools/mcuboot.git RUN pip3 install -r ./mcuboot/scripts/requirements.txt RUN adduser infinitime diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh index 8f0d0fa9..5dcdf91d 100644 --- a/.devcontainer/build.sh +++ b/.devcontainer/build.sh @@ -43,7 +43,7 @@ GetGcc() { } GetMcuBoot() { - git clone https://github.com/JuulLabs-OSS/mcuboot.git "$TOOLS_DIR/mcuboot" + git clone https://github.com/mcu-tools/mcuboot.git "$TOOLS_DIR/mcuboot" pip3 install -r "$TOOLS_DIR/mcuboot/scripts/requirements.txt" } diff --git a/bootloader/README.md b/bootloader/README.md index c04e0e34..9f99602b 100644 --- a/bootloader/README.md +++ b/bootloader/README.md @@ -1,5 +1,5 @@ # About this bootloader -The [bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/tree/master/libs/pinetime_boot/src) is mostly developed by [Lup Yuen](https://github.com/lupyuen). It is based on [MCUBoot](https://juullabs-oss.github.io/mcuboot/) and [Mynewt](https://mynewt.apache.org/). +The [bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/tree/master/libs/pinetime_boot/src) is mostly developed by [Lup Yuen](https://github.com/lupyuen). It is based on [MCUBoot](https://www.mcuboot.com) and [Mynewt](https://mynewt.apache.org/). The goal of this project is to provide a common bootloader for multiple (all?) Pinetime projects. It allows to upgrade the current bootloader and even replace the current application by another one that supports the same bootloader. @@ -86,7 +86,7 @@ make pinetime-mcuboot-app The binary is located in */src/pinetime-mcuboot-app.bin*. -It must me converted into a MCUBoot image using *imgtool.py* from [MCUBoot](https://github.com/JuulLabs-OSS/mcuboot/tree/master/scripts). Simply checkout the project and run the script /scripts/imgtool.py with the following command line: +It must me converted into a MCUBoot image using *imgtool.py* from [MCUBoot](https://github.com/mcu-tools/mcuboot/tree/master/scripts). Simply checkout the project and run the script /scripts/imgtool.py with the following command line: ` imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header /src/pinetime-mcuboot-app.bin image.bin diff --git a/docker/build.sh b/docker/build.sh index 2fa7d920..d86e7c21 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -43,7 +43,7 @@ GetGcc() { } GetMcuBoot() { - git clone https://github.com/JuulLabs-OSS/mcuboot.git "$TOOLS_DIR/mcuboot" + git clone https://github.com/mcu-tools/mcuboot.git "$TOOLS_DIR/mcuboot" pip3 install -r "$TOOLS_DIR/mcuboot/scripts/requirements.txt" }