diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-06-01 15:59:07 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-06-01 15:59:07 +0300 |
| commit | 9fd096364296791b3d1fc8827f2694d8eec54e21 (patch) | |
| tree | 0dd6f7aa953fe0dfc502541fdbe8c79a7258ecef /scripts | |
| parent | fb12e0df3039896778718ec0224f5f8c0ac604f9 (diff) | |
| parent | fc0481efeede37c1ccdb2f16bfdc3fe4d9f4c815 (diff) | |
Merge branch 'tracking-linaro-android-llct' into merge-linux-linaro-core-tracking
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 24 | ||||
| -rw-r--r-- | scripts/Makefile.modinst | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 79e86613712f..06b39fcbeecd 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -294,6 +294,30 @@ $(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) + +# Helper targets for Installing DTBs into the boot directory +quiet_cmd_dtb_install = INSTALL $< + cmd_dtb_install = cp $< $(2) + +_dtbinst_pre_: + $(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi + $(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi + $(Q)mkdir -p $(INSTALL_DTBS_PATH) + +%.dtb_dtbinst_: $(obj)/%.dtb _dtbinst_pre_ + $(call cmd,dtb_install,$(INSTALL_DTBS_PATH)) + +# cat +# --------------------------------------------------------------------------- +# Concatentate multiple files together +quiet_cmd_cat = CAT $@ +cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false) + # Bzip2 # --------------------------------------------------------------------------- diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index e48a4e9d8868..9b7b2804e50d 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -29,7 +29,7 @@ quiet_cmd_modules_install = INSTALL $@ INSTALL_MOD_DIR ?= extra ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D)) -modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) +modinst_dir ?= $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) $(modules): $(call cmd,modules_install,$(MODLIB)/$(modinst_dir)) |