zephyr/Makefile: Rework to use modern, official build integration. #2980
Conversation
|
@daniel-thompson : I guess this is right and tested it more or less, but as you consistently see more than I, please review if you have some time. Thanks! |
| @@ -71,15 +70,10 @@ $(GENERIC_TARGETS): $(LIBMICROPYTHON) | |||
| $(CLEAN_TARGETS): clean | |||
|
|
|||
| $(GENERIC_TARGETS) $(KCONFIG_TARGETS) $(CLEAN_TARGETS): | |||
| $(RM) -f outdir/$(OUTDIR_PREFIX)/zephyr.lnk | |||
There was a problem hiding this comment.
What has replaced this?
We've discussed before that doing the $(RM) here is over-zealous but we do need to remove zephyr.lnk when libmicropython.a is rebuilt and I can't see any logic to do that. Without that then when we change uPy C files they won't make it into the final zephyr application.
There was a problem hiding this comment.
Damn. Didn't you submit some patch to Z to address this?.. I'll submit new version which is going to execute $(RM) only if the library was actually updated...
There was a problem hiding this comment.
I did but since what I wrote was hopelessly broken Anas pulled it just before v1.6 went out of the door (I did have a fix but is was pretty ugly).
There was a problem hiding this comment.
Ok, I posted updated patch which addresses this. Testes all of: 1) build from scratch; 2) empty build afterwards; 3) touching a file and building. Behaves as expected (links in 1) and 3) cases, minimal extra command noise in 2) case).
zephyr/Makefile
Outdated
| $(Z_SYSGEN_H): | ||
| rm -f $(LIBMICROPYTHON) | ||
| -$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE) | ||
| $(LIBMICROPYTHON): | $(Z_EXPORTS) |
There was a problem hiding this comment.
What does this line do?
#include <untested_idea.h> ... it occurs to me we should say what we actually mean and make mpconfigport.h depend on sysgen.h (e.g. the config file may inherit values from the config). Once we do that I think everything else will flow correctly (i.e. when we change the config and the uPy C files rebuild and the library will be relinked).
There was a problem hiding this comment.
Make order-only deps are a bit weird, they don't work oftentime in DWIM manner. But here they did. The idea is that I'm telling that libmicropython should be be only after Z_EXPORTS is generated (which generates autoconf.h as a by-product, on which source files for libmicropython depend). But if i use a normal dependency, Z_EXPORTS (Makefile.exports) ends up inside .a file, which isn't cute. So, with order-only syntax I say: "depend on it, but not include in prerequisite list", and this time, it works as expected (it doesn't always ;-) ).
it occurs to me we should say what we actually mean and make mpconfigport.h depend on sysgen.h
Well, sysgen.h is gone completely after dbb2aea , that's why refs to it are removed . And otherwise logic is per above and appear to work as expected.
Build happens in 3 stages: 1. Zephyr config header and make vars are generated from prj.conf. 2. libmicropython is built using them. 3. Zephyr is built and final link happens.
pfalcon
force-pushed
the
zephyr-revamp-make
branch
from
fb482fd
to
d9280a4
Compare
|
Ok, I'm definitely sure this patch is a big leap in the right direction, so even if there're some issue, we can fix them as a follow-up. Merging. |
|
LOL, this broke all the DTS boards. Will need to ping @andygross about it. |
.../devices.h: Add GigaDevices GD25S512MD 64 MiB flash chip support.
Build happens in 3 stages: