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.

Sign up for GitHub

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

cpu/nrf9160: add Kconfig dependencies #17291

Merged
merged 1 commit into from
Dec 2, 2021
Merged

cpu/nrf9160: add Kconfig dependencies #17291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .murdock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ mega-xplained
microbit
native
nrf52840dk
nrf9160dk
nucleo-f072rb
nucleo-f103rb
nucleo-f207zg
Expand Down
4 changes: 3 additions & 1 deletion cpu/nrf9160/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ config HAS_CPU_NRF9160
help
Indicates that the current cpu is 'nrf9160'.

source "$(RIOTCPU)/cortexm_common/Kconfig"
rsource "vectors/Kconfig"

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you are missing: source "$(RIOTCPU)/nrf5x_common/Kconfig". As that one already includes the cortexm_common Kconfig you can remove it from here.

Copy link
Member

Choose a reason for hiding this comment

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

@leandrolanzieri The problem here is that nRF9160 doesn't fully reuse nrf5x_common for now because some work is still needed on the driver side. That's why this CPU defines by itself which features it has instead of relying on nrf5x_common.
If this is problem, I can have a look to fix the remaining issues with the shared drivers first, then let nRF9160 fully relies on nrf5x_common. What do you think ?

Copy link
Contributor

Choose a reason for hiding this comment

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

But if we don't select CPU_COMMON_NRF5X its features should not be provided, right? This is currently failing because MODULE_NRF5X_COMMON_PERIPH is missing (defined in cpu/nrf5x_common/periph/Kconfig.nrf5x)

source "$(RIOTCPU)/nrf5x_common/Kconfig"
11 changes: 11 additions & 0 deletions cpu/nrf9160/vectors/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright (c) 2021 Inria
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
#

config MODULE_NRF9160_VECTORS
bool
depends on TEST_KCONFIG
default y