diff options
| author | Colin Cross <ccross@android.com> | 2013-04-17 16:58:36 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 14:16:24 -0700 |
| commit | 930d53b7c0b8b9a8d0181864673148df9b1dc1ef (patch) | |
| tree | c469d95d2fc57196f7006304f43b15f39e9c9291 /scripts | |
| parent | 34e159dd120ce57b9dbfdaecb5904c2be3000a26 (diff) | |
ARM: convert build of appended dtb zImage to list of dtbs
Allow CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES to specify
a space separated list of dtbs to append to the zImage,
and name the resulting file zImage-dtb
Change-Id: I36d9108a2349bdbb373e95076dcb1417d8c7dce6
Signed-off-by: Colin Cross <ccross@android.com>
Conflicts:
arch/arm/boot/Makefile
scripts/Makefile.lib
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f97869f1f09b..ef2142a61593 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -273,6 +273,12 @@ $(obj)/%.dtb: $(src)/%.dts FORCE dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) +# cat +# --------------------------------------------------------------------------- +# Concatentate multiple files together +quiet_cmd_cat = CAT $@ +cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false) + # Bzip2 # --------------------------------------------------------------------------- |