DeviceTree: Convert 'generated_dts_board.h' into a source file #12680
Conversation
|
All checks are passing now. Review history of this comment for details about previous failed status. |
SebastianBoe
force-pushed
the
simplify_fixup_mechanism
branch
from
934469c
to
dab5f8b
Compare
SebastianBoe
force-pushed
the
simplify_fixup_mechanism
branch
2 times, most recently
from
679b0aa
to
ad8126a
Compare
Codecov Report
@@ Coverage Diff @@
## master #12680 +/- ##
=======================================
Coverage 53.96% 53.96%
=======================================
Files 242 242
Lines 27671 27671
Branches 6720 6720
=======================================
Hits 14934 14934
Misses 9932 9932
Partials 2805 2805Continue to review full report at Codecov.
|
SebastianBoe
force-pushed
the
simplify_fixup_mechanism
branch
2 times, most recently
from
777a3bc
to
040b873
Compare
extract_dts_includes.py has been generating DT output and then concatenating it with fixup header files to create 'generated_dts_board.h'. In this patch we instead introduce a source file named 'generated_dts_board.h' and have it \#include the appropriate DT output and fixup files. This results in a simpler system because users can now read 'generated_dts_board.h' as C source code to see how fixup files and generated DT output relate to each other. Whereas before they would have to either read documentation or python code to gain the same understanding. Also, it reduces the scope and complexity of one of our most bloated python scripts, extract_dts_includes.py. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
The header comment in 'generated_dts_board_unfixed.h' was including 'compatible' as a helpful text. But something has been broken with how we extract 'compatible' because it was being evaluated to 'q'. Giving a confusing header text: Generated include file q Since the mechanism is broken, and does not appear to be important, we remove it. Also, modernize how we generate multi-line strings. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
SebastianBoe
force-pushed
the
simplify_fixup_mechanism
branch
from
040b873
to
0d6a61d
Compare
| zephyr_compile_definitions(${fixup_source}="${${fixup_source}}") | ||
| set_property(GLOBAL APPEND PROPERTY | ||
| PROPERTY_LINKER_SCRIPT_DEFINES | ||
| -D${fixup_source}="${${fixup_source}}" |
There was a problem hiding this comment.
So, this isn't really correct. I'm now getting storm of:
/home/pfalcon/projects-3rdparty/Embedded/Zephyr/zephyr/include/generated_dts_board.h:19:10: error: #include expects "FILENAME" or <FI>
#include DTS_BOARD_FIXUP_FILE
^~~~~~~~~~~~~~~~~~~~
when building MicroPython. And the error message is correct - #include argument should be string quotes. You generate it w/o quotes (the quotes you have are part of shell syntax, not of the value of the string.
| # Add defines such that generated_dts_board.h knows which fixups | ||
| # are present and where they | ||
| # are. e.g. -DDTS_SOC_FIXUP_FILE=/path/to/fixup.h | ||
| zephyr_compile_definitions(${fixup_source}="${${fixup_source}}") |
There was a problem hiding this comment.
So, for compiler flags, the problem is really in this line. Changing it to:
- zephyr_compile_definitions(${fixup_source}="${${fixup_source}}")
+ zephyr_compile_definitions(${fixup_source}="\\\"${${fixup_source}}\\\"")
Generates proper CFLAGS for MicroPython compilation. But when it comes to compiling Zephyr itself, the defines are over-quoted (extra \"), and it fails.
In other words, we need to extra-quote these defines for future output by zephyr_get_compile_definitions_for_lang_as_string, but don't need to quote for Zephyr's own needs. @SebastianBoe, my random patchings around cmake can't do that, looking for help with that.
There was a problem hiding this comment.
|
Note that this commit also broke openthread support in Zephyr as OT is not compiled with the extra -D options. |
A recent change in how the fixup mechanism works caused several regressions. See zephyrproject-rtos#12680 for more details about the regressions. The core of the matter is that using defines to pass on include paths causes interopability issues when integrating with external build systems. To resolve this we re-write the fixup mechanism to instead generate an aggregated fixup file that is ready to be included at build time. Then no paths are passed through defines and we resolve the regressions reported. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
A recent change in how the fixup mechanism works caused several regressions. See #12680 for more details about the regressions. The core of the matter is that using defines to pass on include paths causes interopability issues when integrating with external build systems. To resolve this we re-write the fixup mechanism to instead generate an aggregated fixup file that is ready to be included at build time. Then no paths are passed through defines and we resolve the regressions reported. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
extract_dts_includes.py has been generating DT output and then
concatenating it with fixup header files to create
'generated_dts_board.h'.
In this patch we instead introduce a source file named
'generated_dts_board.h' and have it #include the appropriate DT
output and fixup files.
This results in a simpler system because users can now read
'generated_dts_board.h' as C source code to see how fixup files and
generated DT output relate to each other. Whereas before they would
have to either read documentation or python code to gain the same
understanding.
Also, it reduces the scope and complexity of one of our most bloated
python scripts, extract_dts_includes.py.
Signed-off-by: Sebastian Bøe sebastian.boe@nordicsemi.no