mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-24 07:41:53 +00:00
112 lines
3.2 KiB
Diff
112 lines
3.2 KiB
Diff
diff --git a/.gitignore b/.gitignore
|
|
index 705e099..c85ba43 100644
|
|
--- a/.gitignore
|
|
+++ b/.gitignore
|
|
@@ -14,7 +14,8 @@
|
|
*.bin
|
|
*.bz2
|
|
*.c.[012]*.*
|
|
-*.dtb
|
|
+*.dtb*
|
|
+*.scr
|
|
*.dtb.S
|
|
*.dwo
|
|
*.elf
|
|
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
|
|
index e83f516..89f7630 100644
|
|
--- a/arch/arm/Makefile
|
|
+++ b/arch/arm/Makefile
|
|
@@ -345,6 +345,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/arm64/Makefile b/arch/arm64/Makefile
|
|
index b481b4a..f1b42f5 100644
|
|
--- a/arch/arm64/Makefile
|
|
+++ b/arch/arm64/Makefile
|
|
@@ -134,6 +134,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 7301ab5..a08f9be 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
|
|
@@ -31,10 +34,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 ba0643e..26e6af4 100644
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -320,6 +320,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 \
|
|
+ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(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
|