buildsystem: fix kconfig mismatches #19813
Merged
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
This matches the behavior when KConfig is used.
Without KConfig presence of the TFT is assumed in anycase, with KConfig it is optional. This turns the opt-in into an opt-out to match behavior with make by default, fixing the nightly breakage.
maribu
added
Type: bug
maribu
requested review from
leandrolanzieri,
jia200x,
MrKevinWeiss,
smlng,
aabadie,
MichelRottleuthner,
fjmolinas and
gschorcht
as code owners
github-actions
bot
added
Area: tests
gschorcht
reviewed
Jul 9, 2023
drivers/st7735/Kconfig
Outdated
| @@ -26,6 +26,12 @@ config MODULE_ST7789 | |||
| bool "ST7789 display driver" | |||
| select MODULE_ST7735 | |||
|
|
|||
| config ST77XX | |||
There was a problem hiding this comment.
BTW, I have already a fix here and would solve it in a different way since the driver ST7735 is the selected component:
diff --git a/drivers/st7735/Kconfig b/drivers/st7735/Kconfig
index 40fa5643b7..0a27a4ef63 100644
--- a/drivers/st7735/Kconfig
+++ b/drivers/st7735/Kconfig
@@ -22,16 +22,16 @@ config HAVE_ST7735
help
Indicates that an ST7735 display is present.
-config MODULE_ST7789
- bool "ST7789 display driver"
- select MODULE_ST7735
-
config HAVE_ST7789
bool
- select MODULE_ST7789 if MODULE_DISP_DEV
help
Indicates that an ST7789 display is present.
+config MODULE_ST7789
+ bool
+ depends on HAVE_ST7789
+ default y if MODULE_ST7735
+
menuconfig KCONFIG_USEMODULE_ST7735
bool "Configure ST7735 driver"
depends on USEMODULE_ST7735That is, of the board selects HAVE_ST7789, MODULE_ST7789 is enabled by default if MODULE_ST7735 is used.
I have already locally an according extension for ST7796.
There was a problem hiding this comment.
That's better, I'll update when I'm back at the keyboard
In KConfig `MODULE_ST7789` now is hidden module that automatically gets selected when `HAVE_ST7789` is selected in `MODULE_ST7735` is used. Co-authored-by: Gunar Schorcht <[email protected]>
|
bors merge |
|
🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set. |
maribu
added
CI: ready for build
|
bors retry |
|
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
This was referenced Jul 12, 2023
bors bot
added a commit
that referenced
this pull request
Aug 7, 2023
19824: boards/sipeed_longan_nano: separate board definition for Sipeed Longan Nano TFT r=benpicco a=gschorcht ### Contribution description This PR provides a minimal separate board definition for the Sipeed Longan Nano version with TFT display which is just an extension of `boards/sipeed-longan-nano` with enabled TFT display module. From the lessons we had to learn with the Kconfig modelling of optional hardware, the TFT version of the Sipeed Longan Nano board has been split off into its own board definition based on the existing Siepeed Longan Nano board. Commits ba29a5e, 237819e, 6d8b56d and c5faf34 are small cleanups of peripheral configurations and could be split from this PR as follow-up PR (changes +70 -36). ### Testing procedure Green CI ``` BOARD=sipeed-longan-nano-tft make -j8 -C tests/drivers/st77xx flash ``` should work ### Issues/PRs references Follow up to PR #19813 and PR #19814 Prerequisite for PR #19825 and PR #19827 19855: gnrc_static: fix static PID assignment r=benpicco a=benpicco Co-authored-by: Gunar Schorcht <[email protected]> Co-authored-by: Benjamin Valentin <[email protected]>
bors bot
added a commit
that referenced
this pull request
Aug 7, 2023
19824: boards/sipeed_longan_nano: separate board definition for Sipeed Longan Nano TFT r=benpicco a=gschorcht ### Contribution description This PR provides a minimal separate board definition for the Sipeed Longan Nano version with TFT display which is just an extension of `boards/sipeed-longan-nano` with enabled TFT display module. From the lessons we had to learn with the Kconfig modelling of optional hardware, the TFT version of the Sipeed Longan Nano board has been split off into its own board definition based on the existing Siepeed Longan Nano board. Commits ba29a5e, 237819e, 6d8b56d and c5faf34 are small cleanups of peripheral configurations and could be split from this PR as follow-up PR (changes +70 -36). ### Testing procedure Green CI ``` BOARD=sipeed-longan-nano-tft make -j8 -C tests/drivers/st77xx flash ``` should work ### Issues/PRs references Follow up to PR #19813 and PR #19814 Prerequisite for PR #19825 and PR #19827 Co-authored-by: Gunar Schorcht <[email protected]>
bors bot
added a commit
that referenced
this pull request
Aug 7, 2023
19824: boards/sipeed_longan_nano: separate board definition for Sipeed Longan Nano TFT r=benpicco a=gschorcht ### Contribution description This PR provides a minimal separate board definition for the Sipeed Longan Nano version with TFT display which is just an extension of `boards/sipeed-longan-nano` with enabled TFT display module. From the lessons we had to learn with the Kconfig modelling of optional hardware, the TFT version of the Sipeed Longan Nano board has been split off into its own board definition based on the existing Siepeed Longan Nano board. Commits ba29a5e, 237819e, 6d8b56d and c5faf34 are small cleanups of peripheral configurations and could be split from this PR as follow-up PR (changes +70 -36). ### Testing procedure Green CI ``` BOARD=sipeed-longan-nano-tft make -j8 -C tests/drivers/st77xx flash ``` should work ### Issues/PRs references Follow up to PR #19813 and PR #19814 Prerequisite for PR #19825 and PR #19827 19855: gnrc_static: fix static PID assignment r=benpicco a=benpicco 19862: cpu/riscv_common: remove picolibc from blacklisting in CI r=benpicco a=gschorcht ### Contribution description `picolibc` is now supported by the RISC-V toolchain in `riotdocker`. It is not necessary to blacklist it in CI any longer. Reference: `picolib` was blacklisted by commit 45270da in PR #15011. ### Testing procedure 1. Green CI 2. Check feature list for CI compilation: ``` BUILD_IN_DOCKER=1 RIOT_CI_BUILD=1 FEATURES_OPTIONAL=picolibc \ BOARD=sipeed-longan-nano make -j8 -C tests/sys/shell info-modules | grep picolib picolibc picolibc_stdout_buffered picolibc_syscalls_default ``` ### Issues/PRs references Co-authored-by: Gunar Schorcht <[email protected]> Co-authored-by: Benjamin Valentin <[email protected]>
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.
Contribution description
This adds three commits each addressing a deviation between dependency resolutions done with and without Kconfig. Hopefully, these in combination should fix the nightly builds.
Testing procedure
For each
$failing_boardand$failing_apppair in the latest nightly build, do:should yield an empty diff other than the
=== [ATTENTION] Testing Kconfig dependency modelling ===.Issues/PRs references
None