boards/sipeed-longan-nano: revert default to variant with TFT #19814
Conversation
This reverts commit 69fb00b.
gschorcht
requested review from
leandrolanzieri,
jia200x and
MrKevinWeiss
as code owners
github-actions
bot
added
Area: boards
gschorcht
added
Type: bug
|
This was intended to fix https://ci.riot-os.org/results/87ababc017c34548931760b535fd1635/output/builds/tests/drivers/disp_dev/sipeed-longan-nano:gnu.txt where the modules used and the firmware sizes differ. And indeed, now the modules used and the firmware sizes for this app/board combi matches, only the hashes differ: https://ci.riot-os.org/results/c75caeb32cba4b0486da5a0617302de7/output/builds/tests/drivers/disp_dev/sipeed-longan-nano:gnu.txt So this does improve things for this test. Looking at the diff --git a/boards/sipeed-longan-nano/Kconfig b/boards/sipeed-longan-nano/Kconfig
index 0899330d76..7f65aa90a6 100644
--- a/boards/sipeed-longan-nano/Kconfig
+++ b/boards/sipeed-longan-nano/Kconfig
@@ -38,7 +38,7 @@ menu "Sipeed Longan Nano Board Configuration"
config SIPEED_LONGAN_NANO_WITH_TFT
bool "Board with TFT display"
- default y
+ default y if MODULE_DISP_DEV
select HAVE_ST7735
help
Indicates that a Sipeed Longan Nano board with TFT display is used.might be the way to go if we want to stick with behavior of the non-KConfig resolution. I can reproduce the mis-matching hashes, though. |
would fix the mismatch, as without |
Ok let's try this change. |
|
@maribu It's still an open issue. Should I squash so that we can try the next round? |
|
Please squash, this is such a simple change now |
|
It will not fix the issue, though:
The diff in the params will result in mismatching firmwares. See #19814 (comment) for a patch |
gschorcht
force-pushed
the
boards/sipeed-longan-nano/revert_kconfig_fix
branch
from
0c24c6c
to
ce653b7
Compare
Sorry I missed the diff for |
|
bors merge |
|
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. |
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]>
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]>
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]>
Contribution description
This PR reverts commit 69fb00b to fix CI compilation.
Testing procedure
Green CI with full build.
Issues/PRs references