-
Notifications
You must be signed in to change notification settings - Fork 1.4k
tools: Update Unix.mk for CONFIG_ARCH_BOARD_COMMON #16241
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
Conversation
@@ -753,6 +753,7 @@ savedefconfig: apps_preconfig | |||
$(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true | |||
$(Q) grep "CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true | |||
$(Q) grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true | |||
$(Q) grep "CONFIG_ARCH_BOARD_COMMON=" .config >> defconfig.tmp; true |
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.
but, the change can't pass ci check
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.
Could you point me to the error, I don't understand what is falling in CI
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.
@shtirlic because this modification will include the common board to some boards that were adding it over other Kconfig, see the raspberrypi-pico-2 as example:
[1/1] Normalize raspberrypi-pico-2/usbnsh
16a17
> CONFIG_ARCH_BOARD_COMMON=y
Saving the new configuration file
HEAD detached at pull/16241/merge
Inside arch/arm/Kconfig, there is this rule:
config ARCH_CHIP_RP23XX
bool "Raspberry Pi RP23XX"
select ARCH_CORTEXM33
select ARCH_HAVE_RAMVECTORS
select ARCH_HAVE_MULTICPU
select ARCH_HAVE_I2CRESET
select ARM_HAVE_WFE_SEV
select ARCH_HAVE_CUSTOM_TESTSET
select ARCH_HAVE_PWM_MULTICHAN
select ARCH_BOARD_COMMON
So, ARCH_BOARD_COMMON were defined by default when the chip is RP23XX. I am NOT sure this is the right way, because this way user has no option to disable common board (if he wants to use his own board initialization drivers)
So, you will need to update all the board profiles using this command:
$ ./tools/refresh.sh --silent --defaults all
It will take some time, about 1 or 2h depending on your machine.
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.
@acassis got it, thank you, will force push the branch when the update is ready.
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.
@shtirlic maybe after you include the ARCH_BOARD_COMMON to the boards we could remove the ARCH_BOARD_COMMON from "config ARCH_CHIP_RP23XX". We need to align with original author about it. I think a chip definition shouldn't include a board policy like this
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.
@xiaoxiang781216 @lupyuen @raiden00pl what do you think?
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.
@acassis I still see the modified
in CI job, but unable to determine what is the cause. whitespace or smth?
[Experimental Bot, please feedback here] Yes, this PR appears to meet the basic NuttX requirements, but it lacks crucial details. While it addresses the sections required, the content is too brief and lacks specifics. Here's why it's insufficient and what needs improvement:
In short: While the PR touches on the required sections, it's missing the essential details that allow reviewers to understand the change, its impact, and its verification. More complete and specific information is needed for proper review and acceptance. |
@lupyuen what is this error:
|
@acassis It's a known but unsolved problem, restarting the CI Job will fix it: |
Thank you Lup, I already did it |
@shtirlic please try to update only boards/arm/stm32f7/stm32f777zit6-meadow/configs/nsh/defconfig now:
If I merge your PR with this error all the new PRs will fail |
@shtirlic strange, now all the configs from that board are reported as modified:
Please run the refresh command for them, create the commit, squash and git push -f to upload. Strange why refresh all didn't fix it, maybe there are some issue we are not realizing it, at least projectab and f7corecomp are different board based on meadow board |
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.
Please separate the tools commit changes from the board config updates
Both should be in the same PR
Thanks
@acassis yes, that's what I did first time, and CI job showed no changes and still fails. Let's see this time. |
hi @shtirlic build with CMake goes into error !!!
|
here is different Make.defs nuttx/arch/arm/src/stm32f7/Make.defs Line 36 in ed0c18c
ifneq ($(CONFIG_SCHED_TICKLESS),y) CMakeLists.txt nuttx/arch/arm/src/stm32f7/CMakeLists.txt Line 40 in ed0c18c
if(CONFIG_STM32F7_TICKLESS_TIMER) Update D:\shtirlic\nuttx>cmake -B build -DBOARD_CONFIG=stm32f777zit6-meadow:nsh -GNinja D:\shtirlic\nuttx>cmake --build build so you need to see in the next step refresh try adding CONFIG_ARCH_BOARD_COMMON here nuttx/cmake/savedefconfig.cmake Line 38 in ed0c18c
|
@simbit18 thank you for the help, updated and waiting for CI |
…OMMON Preserve CONFIG_ARCH_BOARD_COMMON in savedconfig Signed-off-by: Serg Podtynnyi <[email protected]>
refresh boards defconfigs for CONFIG_ARCH_BOARD_COMMON Signed-off-by: Serg Podtynnyi <[email protected]>
@shtirlic The error displayed in the Linux job (arm-13) appears to be resolved.
https://github.com/apache/nuttx/actions/runs/14775231664/job/41482271675?pr=16241#logs @acassis @lupyuen @xiaoxiang781216 @cederom Can you restart the msys2 job ? |
restarted |
Summary
Preserve CONFIG_ARCH_BOARD_COMMON in
make savedconfig
tools commandRelated: issue #12122
Impact
Fix the CONFIG_ARCH_BOARD_COMMON configurations
Testing
Tested with out of tree board config