-
Notifications
You must be signed in to change notification settings - Fork 19
treewide: add support for S145 SoftDevice #408
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
base: main
Are you sure you want to change the base?
Conversation
You can find the documentation preview for this PR here. |
c04ea43
to
1cfb9aa
Compare
ram: 78 | ||
flash: 384 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ram: 78 | |
flash: 384 | |
ram: 77 | |
flash: 347 |
ram: 78 | ||
flash: 282 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ram: 78 | |
flash: 282 | |
ram: 77 | |
flash: 244 |
ram: 174 | ||
flash: 896 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ram: 174 | |
flash: 896 | |
ram: 173 | |
flash: 859 |
ram: 174 | ||
flash: 794 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ram: 174 | |
flash: 794 | |
ram: 173 | |
flash: 756 |
ram: 238 | ||
flash: 1408 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ram: 238 | |
flash: 1408 | |
ram: 237 | |
flash: 1371 |
ram: 238 | ||
flash: 1306 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ram: 238 | |
flash: 1306 | |
ram: 237 | |
flash: 1268 |
select SOC_NRF54L05_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE_MCUBOOT | ||
select SOC_NRF54L10_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE_MCUBOOT | ||
select SOC_NRF54L15_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE_MCUBOOT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
select SOC_NRF54L05_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE_MCUBOOT | |
select SOC_NRF54L10_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE_MCUBOOT | |
select SOC_NRF54L15_CPUAPP if BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE || BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE_MCUBOOT | |
select SOC_NRF54L05_CPUAPP if (BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || \ | |
BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \ | |
BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE || \ | |
BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE_MCUBOOT) | |
select SOC_NRF54L10_CPUAPP if (BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || \ | |
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \ | |
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE || \ | |
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE_MCUBOOT) | |
select SOC_NRF54L15_CPUAPP if (BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || \ | |
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \ | |
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE || \ | |
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE_MCUBOOT) |
To avoid super long lines.
default SOFTDEVICE_S115 if BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE || \ | ||
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE || \ | ||
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE || \ | ||
BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \ | ||
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S115_SOFTDEVICE_MCUBOOT || \ | ||
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S115_SOFTDEVICE_MCUBOOT | ||
default SOFTDEVICE_S145 if BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE || \ | ||
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE || \ | ||
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE || \ | ||
BOARD_BM_NRF54L15DK_NRF54L05_CPUAPP_S145_SOFTDEVICE_MCUBOOT || \ | ||
BOARD_BM_NRF54L15DK_NRF54L10_CPUAPP_S145_SOFTDEVICE_MCUBOOT || \ | ||
BOARD_BM_NRF54L15DK_NRF54L15_CPUAPP_S145_SOFTDEVICE_MCUBOOT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This does not seem right.
There is a difference between having an if
around the choice which adds a depends on ...
, and using if
to conditionally set a default value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted
1cfb9aa
to
8606e6b
Compare
# Disable partition manager | ||
CONFIG_PARTITION_MANAGER_ENABLED=n | ||
|
||
# Disable multithreading | ||
CONFIG_MULTITHREADING=n |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lots of things should not be here, this should be taken care of by default image config
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That also applies to the S115 variants. Can we take that in a follow-up PR?
|
||
boot_partition: partition@0 { | ||
label = "boot"; | ||
reg = <0x00000000 DT_SIZE_K(36)>; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change all MCUboot to 31KiB
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That applies to S115 as well so should be done boardwide in a separate commit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we take this as a separate PR for all board variants?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it already is for s115 #357
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When do you expect that PR to be ready? Would like to get this in as soon as possible. We should not reduce this here if it is not done for S115 in main while merging.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've been asking people to review it for weeks...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I'll leave this as is for now and update if that PR is merged to main before this. If it is the other way around I can create a commit for #357 to align the S145 boards.
reg = <0x00048000 DT_SIZE_K(64)>; | ||
}; | ||
|
||
/* 1 kB free space due too slot1_partition partition 2k alignment. */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
*to
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
Add support for S145 SoftDevice. This adds the bm_nrf54l15dk board variants for S145 in addition to updating Kconfig etc. to use the new board variants. Signed-off-by: Eivind Jølsgard <[email protected]>
Add S145 support to selected bluetooth samples. Signed-off-by: Eivind Jølsgard <[email protected]>
8606e6b
to
c57bec2
Compare
Depends on #407
Add support for S145 SoftDevice.
This adds the bm_nrf54l15dk board variants for S145 in addition to updating Kconfig etc. to use the new board variants.