-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add overlay-compilation-support to rockchgip64-dev
- Loading branch information
1 parent
ed89eaf
commit 6e51bd8
Showing
1 changed file
with
119 additions
and
0 deletions.
There are no files selected for viewing
119 changes: 119 additions & 0 deletions
119
patch/kernel/rockchip64-dev/general-add-overlay-compilation-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
diff --git a/arch/arm/Makefile b/arch/arm/Makefile | ||
index 65f4e2a4..9eb2043c 100644 | ||
--- a/arch/arm/Makefile | ||
+++ b/arch/arm/Makefile | ||
@@ -339,6 +339,12 @@ $(INSTALL_TARGETS): | ||
%.dtb: | scripts | ||
$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ | ||
|
||
+%.dtbo: | scripts | ||
+ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ | ||
+ | ||
+%.scr: | scripts | ||
+ $(Q)$(MAKE) $(build)=$(boot)/dts ARCH=$(ARCH) $(boot)/dts/$@ | ||
+ | ||
PHONY += dtbs dtbs_install | ||
|
||
dtbs: prepare scripts | ||
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore | ||
index 3c79f859..4e5c1d59 100644 | ||
--- a/arch/arm/boot/.gitignore | ||
+++ b/arch/arm/boot/.gitignore | ||
@@ -3,3 +3,5 @@ zImage | ||
xipImage | ||
bootpImage | ||
uImage | ||
+*.dtb* | ||
+*.scr | ||
\ No newline at end of file | ||
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile | ||
index f839ecd9..9788f16d 100644 | ||
--- a/arch/arm64/Makefile | ||
+++ b/arch/arm64/Makefile | ||
@@ -121,6 +121,12 @@ zinstall install: | ||
%.dtb: scripts | ||
$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ | ||
|
||
+%.dtbo: | scripts | ||
+ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ | ||
+ | ||
+%.scr: | scripts | ||
+ $(Q)$(MAKE) $(build)=$(boot)/dts ARCH=$(ARCH) $(boot)/dts/$@ | ||
+ | ||
PHONY += dtbs dtbs_install | ||
|
||
dtbs: prepare scripts | ||
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst | ||
index 34614a48..8a8313d6 100644 | ||
--- a/scripts/Makefile.dtbinst | ||
+++ b/scripts/Makefile.dtbinst | ||
@@ -20,6 +20,9 @@ include scripts/Kbuild.include | ||
include $(src)/Makefile | ||
|
||
dtbinst-files := $(sort $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS), $(dtb-))) | ||
+dtboinst-files := $(dtbo-y) | ||
+script-files := $(scr-y) | ||
+readme-files := $(dtbotxt-y) | ||
dtbinst-dirs := $(subdir-y) $(subdir-m) | ||
|
||
# Helper targets for Installing DTBs into the boot directory | ||
@@ -32,10 +35,19 @@ install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj)) | ||
$(dtbinst-files): %.dtb: $(obj)/%.dtb | ||
$(call cmd,dtb_install,$(install-dir)) | ||
|
||
+$(dtboinst-files): %.dtbo: $(obj)/%.dtbo | ||
+ $(call cmd,dtb_install,$(install-dir)) | ||
+ | ||
+$(script-files): %.scr: $(obj)/%.scr | ||
+ $(call cmd,dtb_install,$(install-dir)) | ||
+ | ||
+$(readme-files): %: $(src)/% | ||
+ $(call cmd,dtb_install,$(install-dir)) | ||
+ | ||
$(dtbinst-dirs): | ||
$(Q)$(MAKE) $(dtbinst)=$(obj)/$@ | ||
|
||
-PHONY += $(dtbinst-files) $(dtbinst-dirs) | ||
-__dtbs_install: $(dtbinst-files) $(dtbinst-dirs) | ||
+PHONY += $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs) | ||
+__dtbs_install: $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs) | ||
|
||
.PHONY: $(PHONY) | ||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib | ||
index 58c05e5d..2b95dda9 100644 | ||
--- a/scripts/Makefile.lib | ||
+++ b/scripts/Makefile.lib | ||
@@ -278,6 +278,9 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ | ||
# --------------------------------------------------------------------------- | ||
DTC ?= $(objtree)/scripts/dtc/dtc | ||
|
||
+# Overlay support | ||
+DTC_FLAGS += -@ -Wno-unit_address_format -Wno-simple_bus_reg | ||
+ | ||
# Disable noisy checks by default | ||
ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),) | ||
DTC_FLAGS += -Wno-unit_address_vs_reg \ | ||
@@ -324,6 +327,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ | ||
$(obj)/%.dtb: $(src)/%.dts FORCE | ||
$(call if_changed_dep,dtc) | ||
|
||
+quiet_cmd_dtco = DTCO $@ | ||
+cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ | ||
+ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ | ||
+ $(DTC) -O dtb -o $@ -b 0 \ | ||
+ -i $(dir $<) $(DTC_FLAGS) \ | ||
+ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ | ||
+ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) | ||
+ | ||
+$(obj)/%.dtbo: $(src)/%.dts FORCE | ||
+ $(call if_changed_dep,dtco) | ||
+ | ||
+quiet_cmd_scr = MKIMAGE $@ | ||
+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@ | ||
+ | ||
+$(obj)/%.scr: $(src)/%.scr-cmd FORCE | ||
+ $(call if_changed,scr) | ||
+ | ||
dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) | ||
|
||
# Bzip2 |