mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
e44e60b290
Resolved merge conflict in the following patches: layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch Refreshed patches, removed upstreamed patch: bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch Run tested: qemu-x86-64 Build tested: x86/64 Signed-off-by: Petr Štetiar <ynezz@true.cz>
27 lines
890 B
Diff
27 lines
890 B
Diff
From 61113c5463166d734dc6560574f5fb1536bae795 Mon Sep 17 00:00:00 2001
|
|
From: Nataliya Korovkina <malus.brandywine@gmail.com>
|
|
Date: Thu, 12 Mar 2020 17:22:53 -0400
|
|
Subject: [PATCH] Kbuild: Allow .dtbo overlays to be built, adjust.
|
|
|
|
This is adjustment to commit
|
|
d368ceaacdccd7732dc97d1d7987bdf7149d62e3 "kbuild: Allow .dtbo overlays to be built piecemeal"
|
|
|
|
prepare3 target has gone from mainline tree in branch 5.4.y
|
|
|
|
Signed-off-by: Nataliya Korovkina <malus.brandywine@gmail.com>
|
|
---
|
|
Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1242,7 +1242,7 @@ ifneq ($(dtstree),)
|
|
%.dtb: include/config/kernel.release scripts_dtc
|
|
$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
|
|
|
|
-%.dtbo: prepare3 scripts_dtc
|
|
+%.dtbo: include/config/kernel.release scripts_dtc
|
|
$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
|
|
|
|
PHONY += dtbs dtbs_install dtbs_check
|