Hi Tom, On Tue, 2 Jan 2024 at 23:36, Tom Rini <tr...@konsulko.com> wrote: > > On Tue, Jan 02, 2024 at 09:07:48PM +0530, Sumit Garg wrote: > > On Tue, 2 Jan 2024 at 19:36, Simon Glass <s...@chromium.org> wrote: > [snip] > > > 2. Choose a directory target for devicetree-rebasing. I see that > > > 'barebox' uses 'dts' which seems better to me than > > > 'devicetree-rebasing/src/'. > > > > Actually as part of this patch-set we try to reuse the U-Boot 'dts' > > directory (via dts/arch/arm64/<vendor> soft links) since it was > > already taken for U-Boot specific DT Makefile. However, I am open to > > renaming 'devicetree-rebasing' but to me that sounds more clear that > > we maintain a specific subtree within U-Boot. > > Looking at what little is in dts/ here today could we just use subtree > and pop the contents under there, and basically ignore the > project-provided Makefile? Or is that not really worth it? >
If we really want to avoid soft links then I did try to add the subree with the prefix as dts/upstream here [1]. It works well with the downside that we will pollute the subtree source code with U-Boot specific Makefiles [2]. However, the subtree pull works fine still. If this sounds better to you and Simon then let me know I will use this approach for v4. [1] https://github.com/b49020/u-boot/commits/use_dts_dir/ [2] https://github.com/b49020/u-boot/commit/90eabe614e77bc30a437e7d5559c1ac414ac07b3 -Sumit > -- > Tom
