W dniu 31.01.2020 o 19:47, Adrian Schmutzler pisze: > Hi, > >> -----Original Message----- >> From: Tomasz Maciej Nowak [mailto:[email protected]] >> Sent: Freitag, 31. Januar 2020 19:39 >> To: Adrian Schmutzler <[email protected]>; openwrt- >> [email protected] >> Subject: Re: [OpenWrt-Devel] [PATCH 4/8] mvebu: image: keep global DTS_DIR >> intact >> >> W dniu 31.01.2020 o 17:02, Adrian Schmutzler pisze: >>> Hi, >>> >>>> -----Original Message----- >>>> From: openwrt-devel [mailto:[email protected]] On >>>> Behalf Of Tomasz Maciej Nowak >>>> Sent: Freitag, 31. Januar 2020 16:46 >>>> To: [email protected] >>>> Subject: [OpenWrt-Devel] [PATCH 4/8] mvebu: image: keep global DTS_DIR >> intact >>>> >>>> Don't rewrite global DTS_DIR, instead, use proper variable for >>>> specifying devices dts directory. >>> >>> Have you build-tested this? >> >> Yes, images built fine before sending and from glance, they looked fine. >> What I >> did not test was Image Builder. Will do that and send a feedback. > > On a second look, if you introduce DEVICE_DTS_DIR for Default-arm64, we > should also introduce it to Device/Default: > > DEVICE_DTS_DIR := $(DTS_DIR) > > Otherwise, we would have part of the target relying on the device-specific > variable and part on the global one, and I do not think that's desirable. > With the change, the whole target will use DEVICE_DTS_DIR.
Ok, will send this as part of v2. Regards > >> >>> DEVICE_DTS_DIR and DTS_DIR might behave differently >>> when it comes to includes in DTS files. >>> That's why I couldn't replace SUNXI_DTS_DIR with DEVICE_DTS_DIR when >> touching >>> this some months ago. >> >> The issue might stem from DEVICE_VARS defined inside the profile, which might >> be exported too late? I'm not so good at Makefile syntax so maybe others can >> comment on that. > > For sunxi, no. There the problem is that DEVICE_DTS_DIR is present in > conditions in image.mk (or one of those files), and the device setup in sunxi > itself assumes that subdirs are part of DEVICE_DTS. But this effectively > might be a separate issue, as it is connected to the setup in sunxi. > It's not easy to fix that in a proper way. > > Best > > Adrian > >> >>> >>> Best >>> >>> Adrian >> >> Regards >> >>> >>>> >>>> Signed-off-by: Tomasz Maciej Nowak <[email protected]> >>>> --- >>>> target/linux/mvebu/image/Makefile | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/target/linux/mvebu/image/Makefile >>>> b/target/linux/mvebu/image/Makefile >>>> index d9e4b1acce..ae4d3b9594 100644 >>>> --- a/target/linux/mvebu/image/Makefile >>>> +++ b/target/linux/mvebu/image/Makefile >>>> @@ -91,7 +91,7 @@ endef >>>> >>>> define Device/Default-arm64 >>>> BOOT_SCRIPT := generic-arm64 >>>> - DTS_DIR := $(DTS_DIR)/marvell >>>> + DEVICE_DTS_DIR := $(DTS_DIR)/marvell >>>> IMAGES := sdcard.img.gz >>>> IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | >>>> gzip | >>>> append-metadata >>>> KERNEL_NAME := Image >>>> -- >>>> 2.25.0 >>>> >>>> >>>> _______________________________________________ >>>> openwrt-devel mailing list >>>> [email protected] >>>> https://lists.openwrt.org/mailman/listinfo/openwrt-devel >>> >> >> >> -- >> TMN > -- TMN _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
