Skip to content

Conversation

@MarekPieta
Copy link
Contributor

@MarekPieta MarekPieta commented Sep 13, 2022

Change removes the legacy configuration. The configuration can no longer be used, because GPIO DTS nodes no longer support labels. The GPIO must be configured by board's DTS.

PR also adds default values of boot detect pins to prevent build failures.

fixes #1473

MarekPieta added a commit to MarekPieta/sdk-mcuboot that referenced this pull request Sep 13, 2022
Change introduces default values of CONFIG_BOOT_SERIAL_DETECT_PIN
and CONFIG_BOOT_USB_DFU_DETECT_PIN. This is needed to prevent build
issues caused by uninitialized Kconfig.

Upstream PR: mcu-tools/mcuboot#1472

Jira: NCSDK-16550

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit 01a67d2)
MarekPieta added a commit to MarekPieta/sdk-mcuboot that referenced this pull request Sep 13, 2022
…guration

Change removes the legacy configuration. The configuration can no
longer be used, because GPIO DTS nodes no longer support labels.
The GPIO must be configured by board's DTS.

Upstream PR: mcu-tools/mcuboot#1472

Jira: NCSDK-16550

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry-picked from commit 39f61921c4d005aa7d65f3b6f4dfaec59d485d24)

# MCUboot serial recovery
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop this board patch
this is a unknown board.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropped. Btw. should we keep configuration of non-zephyr board in here?

@nvlsianpu
Copy link
Collaborator

nvlsianpu commented Sep 13, 2022

2nd commit message:

Change removes the legacy configuration. The legacy configuration become problematic as can not
longer use GPIO DTS nodes labels, because GPIO DTS nodes no longer support labels. Therefore need to use GPIO DTS node name with the legacy approach.

The GPIO is preferred to be configured by board's DTS, which is a loot more easier,

Change introduces default values of CONFIG_BOOT_SERIAL_DETECT_PIN
and CONFIG_BOOT_USB_DFU_DETECT_PIN. This is needed to prevent build
issues caused by uninitialized Kconfig.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Change removes the legacy configuration. The legacy configuration
became problematic, because GPIO DTS nodes no longer support labels
that were used to identify nodes in MCUboot. Therefore we need to
use GPIO DTS node name with the legacy approach.

The GPIO should be configured by board's DTS, which is simpler.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
MarekPieta added a commit to MarekPieta/sdk-mcuboot that referenced this pull request Sep 13, 2022
Change introduces default values of CONFIG_BOOT_SERIAL_DETECT_PIN
and CONFIG_BOOT_USB_DFU_DETECT_PIN. This is needed to prevent build
issues caused by uninitialized Kconfig.

Upstream PR: mcu-tools/mcuboot#1472

Jira: NCSDK-16550

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit fddbe51b5bd4b400f736b28ed040fe87cf1d969a)
MarekPieta added a commit to MarekPieta/sdk-mcuboot that referenced this pull request Sep 13, 2022
…guration

Change removes the legacy configuration. The legacy configuration
became problematic, because GPIO DTS nodes no longer support labels
that were used to identify nodes in MCUboot. Therefore we need to
use GPIO DTS node name with the legacy approach.

The GPIO should be configured by board's DTS, which is simpler.

Jira: NCSDK-16550

Upstream PR: mcu-tools/mcuboot#1472

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit fda18fdafd1c83bd30a58c41c85344c78b1c80fb)
@nvlsianpu nvlsianpu added the area: zephyr Affects the Zephyr port label Sep 13, 2022
@nvlsianpu nvlsianpu merged commit f1fd510 into mcu-tools:main Sep 13, 2022
@MarekPieta MarekPieta deleted the mcuboot_sr_fix branch September 13, 2022 14:53
rlubos pushed a commit to nrfconnect/sdk-mcuboot that referenced this pull request Sep 14, 2022
Change introduces default values of CONFIG_BOOT_SERIAL_DETECT_PIN
and CONFIG_BOOT_USB_DFU_DETECT_PIN. This is needed to prevent build
issues caused by uninitialized Kconfig.

Upstream PR: mcu-tools/mcuboot#1472

Jira: NCSDK-16550

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit fddbe51b5bd4b400f736b28ed040fe87cf1d969a)
rlubos pushed a commit to nrfconnect/sdk-mcuboot that referenced this pull request Sep 14, 2022
…guration

Change removes the legacy configuration. The legacy configuration
became problematic, because GPIO DTS nodes no longer support labels
that were used to identify nodes in MCUboot. Therefore we need to
use GPIO DTS node name with the legacy approach.

The GPIO should be configured by board's DTS, which is simpler.

Jira: NCSDK-16550

Upstream PR: mcu-tools/mcuboot#1472

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
(cherry picked from commit fda18fdafd1c83bd30a58c41c85344c78b1c80fb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: zephyr Affects the Zephyr port

Projects

None yet

Development

Successfully merging this pull request may close these issues.

zephyr/serial_recovery: build failure if CONFIG_BOOT_SERIAL_DETECT_PIN has undefined value

2 participants