Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf noup] boot/zephyr: nrf54h20dk support #408

Conversation

nordic-mik7
Copy link
Contributor

Added basic support for nrf54h20dk_nrf54h20_cpuapp_iron board. This commit turns off CONFIG_FPROTECT and excludes accessing hal nrf_clock.h interfaces from mcuboot for this board build.

CONFIG_SPI_NOR=n

# TODO: below are not yet supported and need fixing
CONFIG_FPROTECT=n
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should we add support for fprotect for nrf54h20 with new MCUBoot based approach ? If so, I will create a ticket
@nvlsianpu @tomchy

Copy link

Choose a reason for hiding this comment

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

As discussed, please create a ticket, so we can link it with a request for such feature in SDFW.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@@ -109,7 +113,10 @@ void nrf_cleanup_peripheral(void)
#if defined(NRF_DPPIC)
nrf_dppi_channels_disable_all(NRF_DPPIC);
#endif

#if !defined(CONFIG_SOC_SERIES_NRF54HX)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it okay just to remove this clock cleanup on nrf54h20 ? Should these actions be performed in SDFW ? @tomchy @nvlsianpu

@@ -62,10 +64,12 @@ static NRF_UARTE_Type *nrf_uarte_to_clean[] = {
};
#endif

#if !defined(CONFIG_SOC_SERIES_NRF54HX)
static void nrf_cleanup_clock(void)
Copy link

Choose a reason for hiding this comment

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

Is there a Kconfig that indicates the availability of NRF_CLOCK API?
If so, it would be cleaner to use it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think there is such Kconfig available. This hal module was common for previous boards, we would need to introduce some new config. Should I do so ?

Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

Awaiting query on why device lacks flash controller, in additional PR should be split up, anything that can go upstream should go upstream and brought in via fromlist/fromtree, the conf can be as as new noup, the cleanup should be a separate commit with nrf squash! squashing onto the original noup for that file

Comment on lines +37 to +41
#elif (defined(CONFIG_SOC_SERIES_NRF54HX) && DT_HAS_CHOSEN(zephyr_flash))

#define FLASH_DEVICE_ID SPI_FLASH_0_ID
#define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS
#define FLASH_DEVICE_NODE DT_CHOSEN(zephyr_flash)
Copy link
Contributor

@nordicjm nordicjm Mar 28, 2025

Choose a reason for hiding this comment

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

why is this needed, why is the flash controller not present in dts? change is OK, should be moved upstream

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@nordic-mik7 nordic-mik7 force-pushed the dev/lillium_mcuboot_support_push branch from 5d133e3 to a30f7c5 Compare March 28, 2025 16:50
Added basic adaptations eneeded for introducing
nrf54h20dk board support in the future.

Upstream PR #: 125

Signed-off-by: Michal Kozikowski <michal.kozikowski@nordicsemi.no>
(cherry picked from commit b1b8d9de17171bb1f36dfc3c06bca6f95ba34a78)
Added basic support for nrf54h20dk_nrf54h20_cpuapp_iron board.
This commit turns off CONFIG_FPROTECT for this board build.

Signed-off-by: Michal Kozikowski <michal.kozikowski@nordicsemi.no>
This commit removes NRF_CLOCK cleanup for this board build - for Lillium, there is no clock peripheral access from the app domain.

Signed-off-by: Michal Kozikowski <michal.kozikowski@nordicsemi.no>
@nordic-mik7 nordic-mik7 force-pushed the dev/lillium_mcuboot_support_push branch from a30f7c5 to e38e2f6 Compare March 28, 2025 16:57
@nordic-mik7 nordic-mik7 closed this by deleting the head repository Mar 31, 2025
@nordic-mik7
Copy link
Contributor Author

Created separate clone pull request with requested changes #409
Sorry for the mess.
This one is closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants