zephyr: io: trivial fixes after I/O functions separation (if MCUBOOT_INDICATION_LED enabled) #1874
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nordicjm
approved these changes
Dec 5, 2023
de-nordic
approved these changes
Dec 5, 2023
|
@nordicjm @de-nordic thanks for review and approval but it seems I have changed this PR to draft to make sure it won't get merged until this is sorted out. |
This fixes below warning when building with 'MCUBOOT_INDICATION_LED'
enabled:
mcuboot/boot/zephyr/main.c:410:5:
warning: implicit declaration of function 'led_init';
did you mean 'io_led_init'? [-Wimplicit-function-declaration]
410 | led_init();
| ^~~~~~~~
| io_led_init
Fixes: 433b848 ("zephyr: Move IO functions out of main to separate file")
Signed-off-by: Piotr Dymacz <[email protected]>
This fixes below error when building with 'MCUBOOT_INDICATION_LED' and
'LOG' enabled:
In file included from zephyr/include/zephyr/logging/log.h:11,
from zephyr/include/zephyr/usb/usb_device.h:43,
from bootloader/mcuboot/boot/zephyr/io.c:26:
mcuboot/boot/zephyr/io.c: In function 'io_led_init':
zephyr/include/zephyr/logging/log_core.h:151:20: error:
'__log_level' undeclared (first use in this function)
151 | (_level <= __log_level) && \
| ^~~~~~~~~~~
Fixes: 433b848 ("zephyr: Move IO functions out of main to separate file")
Signed-off-by: Piotr Dymacz <[email protected]>
The static declaration of 'led0' was moved to 'io.c' which broke
building with the 'MCUBOOT_INDICATION_LED' enabled:
mcuboot/boot/zephyr/main.c:380:22: error:
'led0' undeclared (first use in this function)
380 | gpio_pin_set_dt(&led0, 1);
| ^~~~
This adds simple function 'io_led_set()' for changing LED's value.
Fixes: 433b848 ("zephyr: Move IO functions out of main to separate file")
Signed-off-by: Piotr Dymacz <[email protected]>
pepe2k
force-pushed
the
main__io-separate-leftovers-fixes
branch
from
248246b to
1f3b103
Compare
|
Sorted out, |
nordicjm
approved these changes
Dec 6, 2023
de-nordic
approved these changes
Dec 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This short series includes 3 warning/error fixes found when building with
MCUBOOT_INDICATION_LEDandLOGenabled:zephyr: rename 'led_init()' to 'io_led_init()'zephyr: io: include 'bootutil_log.h' and declare log module membershipzephyr: io: add 'io_led_set()'All issues were introduced in 433b848.
The last fix (
zephyr: io: add 'io_led_set()') should be treated as more a proposal as there might be other solutions/approaches preferred.