pkg/micropython: model in Kconfig#19672
Merged
bors[bot] merged 2 commits intoRIOT-OS:masterfrom May 31, 2023
Merged
Conversation
7845cee to
3ea6117
Compare
Contributor
|
I can look into that. It seems the package wasn't updated for quite some time. We should also probably upstream the ztimer update... |
MrKevinWeiss
requested changes
May 30, 2023
3ea6117 to
dfcc054
Compare
MrKevinWeiss
requested changes
May 31, 2023
Contributor
MrKevinWeiss
left a comment
There was a problem hiding this comment.
I think the standard is a bit closer to the following diff:
diff --git a/examples/micropython/Kconfig b/examples/micropython/Kconfig
index 6e1b6464e8..32980b2927 100644
--- a/examples/micropython/Kconfig
+++ b/examples/micropython/Kconfig
@@ -5,8 +5,9 @@
# directory for more details.
#
-config APPLICATION_EXAMPLES_MICROPYTHON
- bool "Micropython example application"
+config APPLICATION
+ bool
+ default y
depends on TEST_KCONFIG
select MODULE_PERIPH_ADC if HAS_PERIPH_ADC
diff --git a/examples/micropython/Makefile b/examples/micropython/Makefile
index 247540cfbe..e5e7829693 100644
--- a/examples/micropython/Makefile
+++ b/examples/micropython/Makefile
@@ -34,4 +34,7 @@ TESTRUNNER_RESET_AFTER_TERM ?= 1
# failing on native with floating point exception (#15870)
TEST_ON_CI_BLACKLIST = native
+# avoid running Kconfig by default
+SHOULD_RUN_KCONFIG ?=
+
include $(RIOTBASE)/Makefile.include
diff --git a/examples/micropython/app.config.test b/examples/micropython/app.config.test
index f03643a0c9..d2c7fc42c9 100644
--- a/examples/micropython/app.config.test
+++ b/examples/micropython/app.config.test
@@ -1,2 +1 @@
CONFIG_PACKAGE_MICROPYTHON=y
-CONFIG_APPLICATION_EXAMPLES_MICROPYTHON=ydfcc054 to
c7f1226
Compare
Contributor
|
bors merge |
Contributor
|
🕐 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. |
Contributor
Author
|
bors merge |
Contributor
Author
|
bors cancel |
Contributor
|
Canceled. |
Contributor
|
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 file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
For some reason, I had to add a dependency to
periph_spi. Otherwise, the generated firmware size was bigger with TEST_KCONFIG=1 on native. Not sure why.In general, I think there's room for improvement with the build system integration of micropython, for example to select which feature (uart, spi, timer, etc) to add in the firmware, if that is possible.
Testing procedure
Issues/PRs references
Tick one item in #16875