8000 Comparing zephyrproject-rtos:main...joerchan:master · zephyrproject-rtos/mcuboot · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zephyrproject-rtos/mcuboot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: joerchan/mcuboot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 30, 2020

  1. zephyr: Replace DT_FLASH_DEV_NAME with DT_CHOSEN_ZEPHYR_FLASH_CONTROL… 

    …LER_LABEL

As upstream zephyr is phasing out DT_FLASH defines for non-partition
usage replace DT_FLASH_DEV_NAME with
DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
    @galak
    galak committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    014f42d View commit details
    Browse the repository at this point in the history

  2. zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros 

    As the DT define DT_JEDEC_SPI_NOR_0_LABEL is intended to be deprecated
move to the new macro style to determine for DT_JEDEC_SPI_NOR_0_LABEL

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
    @galak
    galak committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    8cd5dc5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros" 

    This reverts commit 8cd5dc5.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    @nvlsianpu
    nvlsianpu committed May 7, 2020
    Configuration menu
    Copy the full SHA
    39d1aef View commit details
    Browse the repository at this point in the history

  2. Revert "Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt ma… 

    …cros""

This reverts commit 39d1aef.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    @nvlsianpu
    nvlsianpu committed May 7, 2020
    Configuration menu
    Copy the full SHA
    48b8ef0 View commit details
    Browse the repository at this point in the history

  3. mergeup: merge up to upstream 82c5f7c 

    Synchronize up to

mcu-tools@82c5f7
which is same as v1.6.0-rc2 tag.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    @nvlsianpu
    nvlsianpu committed May 7, 2020
    Configuration menu
    Copy the full SHA
    5657d00 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_ 

    As we replace the legacy DT_FLASH_ support use the new FLASH_AREA_
macros.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
    @galak @nvlsianpu
    galak authored and nvlsianpu committed May 12, 2020
    Configuration menu
    Copy the full SHA
    b7254d1 View commit details
    Browse the repository at this point in the history

  2. zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA for multimage 

    Use the new FLASH_AREA_ macros.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    @nvlsianpu
    nvlsianpu committed May 12, 2020
    Configuration menu
    Copy the full SHA
    322b11a View commit details
    Browse the repository at this point in the history

  3. sim: Fixup devicetree.h for changes to mcuboot 

    Fixup how we fake out devicetree.h, which is now really the flash map
API for what mcuboot is using.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
    @galak @nvlsianpu
    galak authored and nvlsianpu committed May 12, 2020
    Configuration menu
    Copy the full SHA
    1f181dd View commit details
    Browse the repository at this point in the history

  4. scripts/assemble: Rework to use EDT library to get devicetree data 

    Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
    @galak @nvlsianpu
    galak authored and nvlsianpu committed May 12, 2020
    Configuration menu
    Copy the full SHA
    e88113b View commit details
    Browse the repository at this point in the history
Loading
0