diff options
| author | Rob Herring <robh@kernel.org> | 2022-10-26 09:11:54 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2022-10-26 09:11:54 -0500 |
| commit | 26c9134a370ace32cda7a3f9efaf4ca85e57ca8d (patch) | |
| tree | 6a9960061f0ae7b4f65d0cceaa506723ad52a0a4 /scripts | |
| parent | ae5a16c8da92f511fe633d0872043cd317966092 (diff) | |
| parent | fa9665ef77f5d8e861e2ed7563ebdbddddc6f82b (diff) | |
| download | linux-26c9134a370ace32cda7a3f9efaf4ca85e57ca8d.tar.gz linux-26c9134a370ace32cda7a3f9efaf4ca85e57ca8d.tar.bz2 linux-26c9134a370ace32cda7a3f9efaf4ca85e57ca8d.zip | |
Merge branch 'dt/dtbo-rename' into dt/next
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 969de3b7bb30..5f8e6a97bdf7 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -362,7 +362,7 @@ DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@) # Generate an assembly file to wrap the output of the device tree compiler -quiet_cmd_dt_S_dtb= DTB $@ +quiet_cmd_dt_S_dtb= DTBS $@ cmd_dt_S_dtb= \ { \ echo '\#include <asm-generic/vmlinux.lds.h>'; \ @@ -379,6 +379,24 @@ cmd_dt_S_dtb= \ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE $(call if_changed,dt_S_dtb) +# Generate an assembly file to wrap the output of the device tree compiler +quiet_cmd_dt_S_dtbo= DTBOS $@ +cmd_dt_S_dtbo= \ +{ \ + echo '\#include <asm-generic/vmlinux.lds.h>'; \ + echo '.section .dtb.init.rodata,"a"'; \ + echo '.balign STRUCT_ALIGNMENT'; \ + echo '.global __dtbo_$(subst -,_,$(*F))_begin'; \ + echo '__dtbo_$(subst -,_,$(*F))_begin:'; \ + echo '.incbin "$<" '; \ + echo '__dtbo_$(subst -,_,$(*F))_end:'; \ + echo '.global __dtbo_$(subst -,_,$(*F))_end'; \ + echo '.balign STRUCT_ALIGNMENT'; \ +} > $@ + +$(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE + $(call if_changed,dt_S_dtbo) + quiet_cmd_dtc = DTC $@ cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ $(DTC) -o $@ -b 0 \ @@ -412,6 +430,9 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE $(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 |