mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 363547d2191cbc32ca954ba75d72908712398ff2 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Davis <afd@ti.com>
|
|
Date: Mon, 24 Oct 2022 12:34:28 -0500
|
|
Subject: [PATCH] kbuild: Allow DTB overlays to built from .dtso named source
|
|
files
|
|
|
|
Currently DTB Overlays (.dtbo) are build from source files with the same
|
|
extension (.dts) as the base DTs (.dtb). This may become confusing and
|
|
even lead to wrong results. For example, a composite DTB (created from a
|
|
base DTB and a set of overlays) might have the same name as one of the
|
|
overlays that create it.
|
|
|
|
Different files should be generated from differently named sources.
|
|
.dtb <-> .dts
|
|
.dtbo <-> .dtso
|
|
|
|
We do not remove the ability to compile DTBO files from .dts files here,
|
|
only add a new rule allowing the .dtso file name. The current .dts named
|
|
overlays can be renamed with time. After all have been renamed we can
|
|
remove the other rule.
|
|
|
|
Signed-off-by: Andrew Davis <afd@ti.com>
|
|
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
|
|
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
|
|
Reviewed-by: Frank Rowand <frowand.list@gmail.com>
|
|
Tested-by: Frank Rowand <frowand.list@gmail.com>
|
|
Link: https://lore.kernel.org/r/20221024173434.32518-2-afd@ti.com
|
|
Signed-off-by: Rob Herring <robh@kernel.org>
|
|
---
|
|
scripts/Makefile.lib | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -408,6 +408,9 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_T
|
|
$(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE
|
|
$(call if_changed_dep,dtc)
|
|
|
|
+$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
|
|
+ $(call if_changed_dep,dtc)
|
|
+
|
|
dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
|
|
|
|
# Bzip2
|