109 lines
3.4 KiB
Diff
109 lines
3.4 KiB
Diff
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
|
|
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
|
|
index 50d580d77..94bd15617 100644
|
|
--- a/scripts/Makefile.dtbinst
|
|
+++ b/scripts/Makefile.dtbinst
|
|
@@ -18,9 +18,12 @@ include scripts/Kbuild.include
|
|
include $(src)/Makefile
|
|
|
|
dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
|
|
+dtbos := $(addprefix $(dst)/, $(dtbo-y))
|
|
+scrs := $(addprefix $(dst)/, $(scr-y))
|
|
+readmes := $(addprefix $(dst)/, $(dtbotxt-y))
|
|
subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
|
|
|
|
-__dtbs_install: $(dtbs) $(subdirs)
|
|
+__dtbs_install: $(dtbs) $(dtbos) $(scrs) $(readmes) $(subdirs)
|
|
@:
|
|
|
|
quiet_cmd_dtb_install = INSTALL $@
|
|
@@ -29,6 +32,15 @@ quiet_cmd_dtb_install = INSTALL $@
|
|
$(dst)/%.dtb: $(obj)/%.dtb
|
|
$(call cmd,dtb_install)
|
|
|
|
+$(dst)/%.dtbo: $(obj)/%.dtbo
|
|
+ $(call cmd,dtb_install)
|
|
+
|
|
+$(dst)/%.scr: $(obj)/%.scr
|
|
+ $(call cmd,dtb_install)
|
|
+
|
|
+$(dst)/README.rockchip-overlays: $(src)/README.rockchip-overlays
|
|
+ $(call cmd,dtb_install)
|
|
+
|
|
PHONY += $(subdirs)
|
|
$(subdirs):
|
|
$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)
|
|
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
|
|
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
|
index 41c50f9461e5..387659d5b252 100644
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -79,6 +79,9 @@ header-test-y += $(filter-out $(header-test-), \
|
|
|
|
extra-$(CONFIG_HEADER_TEST) += $(addsuffix .s, $(header-test-y) $(header-test-m))
|
|
|
|
+# Overlay targets
|
|
+extra-y += $(dtbo-y) $(scr-y) $(dtbotxt-y)
|
|
+
|
|
# Add subdir path
|
|
|
|
extra-y := $(addprefix $(obj)/,$(extra-y))
|
|
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
|
index e8dd99201..1e45adf97 100644
|
|
--- a/arch/arm/boot/dts/Makefile
|
|
+++ b/arch/arm/boot/dts/Makefile
|
|
@@ -977,6 +984,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
rk3288-veyron-speedy.dtb \
|
|
rk3288-veyron-tiger.dtb \
|
|
rk3288-vyasa.dtb
|
|
+subdir-y := $(dts-dirs) overlay
|
|
dtb-$(CONFIG_ARCH_S3C24XX) += \
|
|
s3c2416-smdk2416.dtb
|
|
dtb-$(CONFIG_ARCH_S3C64XX) += \
|