diff options
| author | Colin Cross <ccross@android.com> | 2013-04-17 16:58:36 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-06-11 17:47:07 -0700 |
| commit | 3cfc9ae3d524a6ad68e09714d886f364b425b752 (patch) | |
| tree | 453594d87a3d013698b139aeb6d1cc825078f91a /scripts | |
| parent | 6dd4016959962fa2a4b602ac286d753d8a1506b5 (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 8337663aa29..f9a25990f56 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) +# cat +# --------------------------------------------------------------------------- +# Concatentate multiple files together +quiet_cmd_cat = CAT $@ +cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false) + # Bzip2 # --------------------------------------------------------------------------- |