of_diff - + is quite useful to find what fixups barebox would apply to its own device tree. But for some cases, like barebox-state or OP-TEE reservations, the nodes that would be fixed up into the kernel device tree already exist within the barebox device tree and wouldn't be shown by of_diff - +. To make them visible, let's redefine +: - Previously, it always meant the fixed up barebox DT - Now, it means the other DT with fixups applied That way, of_diff - + continues to work, but kernel DTs can now be diffed against their fixed up version by doing: of_diff /mnt/tftp/afa-oftree-myboard + Ahmad Fatoum (3): of: change superfluous of_fix_tree int return type to void commands: of_diff: simplify error handling commands: of_diff: support applying fixups on arbitrary device trees commands/of_compatible.c | 7 ++--- commands/of_diff.c | 63 +++++++++++++++++++--------------------- commands/of_dump.c | 7 ++--- common/oftree.c | 10 ++----- drivers/of/base.c | 3 ++ include/of.h | 2 +- 6 files changed, 40 insertions(+), 52 deletions(-) -- 2.39.2
