X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fimage.mk;h=90ab88dd1325f69ad43aa98ca01c0a765ca32437;hp=42aa3f02848060d098134a46dd01a991057a9e02;hb=e351f7c695760b50ef9ab8a08907d443dc5ea585;hpb=76341cfc5f71fb3658535bc21b001399a84f8816 diff --git a/include/image.mk b/include/image.mk index 42aa3f0284..90ab88dd13 100644 --- a/include/image.mk +++ b/include/image.mk @@ -29,6 +29,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) target_params = $(subst +,$(space),$*) param_get = $(patsubst $(1)=%,%,$(filter $(1)=%,$(2))) +param_get_default = $(firstword $(call param_get,$(1),$(2)) $(3)) param_mangle = $(subst $(space),_,$(strip $(1))) param_unmangle = $(subst _,$(space),$(1)) @@ -354,7 +355,7 @@ endef DEFAULT_DEVICE_VARS := \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ - DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME \ + DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \ UBOOTENV_IN_UBI KERNEL_IN_UBI \ BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \ UBINIZE_OPTS @@ -422,7 +423,6 @@ define Device/Build/compile endef define Device/Build/kernel - _KERNEL_IMAGES += $$(KDIR_KERNEL_NAME) $(KDIR)/$$(KERNEL_NAME):: image_prepare $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE)) $(call Device/Export,$$(KDIR_KERNEL_IMAGE),$(1))