diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-04-01 16:05:28 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-04-08 08:24:40 +0200 |
| commit | 8484ecb7b244ad5eb168b69e6d352cf717f7801f (patch) | |
| tree | 734eb4a52a92316ca36f0d84a06a4bf546339bf5 | |
| parent | e86947bf333ff1f5c6524fff63dadceab2f6f882 (diff) | |
| download | ptxdist-8484ecb7b244ad5eb168b69e6d352cf717f7801f.tar.gz ptxdist-8484ecb7b244ad5eb168b69e6d352cf717f7801f.tar.xz | |
kernel: use kernel-opts as well
More code sharing between kernel and kernel template.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/kernel.make | 10 | ||||
| -rw-r--r-- | rules/pre/kernel.make | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/rules/kernel.make b/rules/kernel.make index 2b564612b..4be393c4d 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -55,15 +55,7 @@ KERNEL_MAKEVARS = $(call kernel/deprecated, KERNEL_MAKEVARS) # like kernel-opts but with different CROSS_COMPILE= KERNEL_BASE_OPT := \ - V=$(PTXDIST_VERBOSE) \ - HOSTCC=$(HOSTCC) \ - ARCH=$(GENERIC_KERNEL_ARCH) \ - CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) \ - DEPMOD=$(PTXDIST_SYSROOT_HOST)/sbin/depmod \ - \ - INSTALL_MOD_STRIP=1 \ - INSTALL_MOD_PATH=$(KERNEL_PKGDIR) \ - PTX_KERNEL_DIR=$(KERNEL_DIR) \ + $(call kernel-opts, KERNEL,$(KERNEL_CROSS_COMPILE)) \ $(call remove_quotes,$(PTXCONF_KERNEL_EXTRA_MAKEVARS)) # Intermediate option. This will be used by kernel module packages. diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index 984b4d5ed..242b48c0c 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -63,7 +63,7 @@ kernel/opts = \ V=$(PTXDIST_VERBOSE) \ HOSTCC=$(HOSTCC) \ ARCH=$(GENERIC_KERNEL_ARCH) \ - CROSS_COMPILE=$(COMPILER_PREFIX) \ + CROSS_COMPILE=$(if $(2),$(2),$(COMPILER_PREFIX)) \ DEPMOD=$(PTXDIST_SYSROOT_HOST)/sbin/depmod \ \ INSTALL_MOD_STRIP=1 \ @@ -71,7 +71,7 @@ kernel/opts = \ PTX_KERNEL_DIR=$($(1)_DIR) kernel-opts = \ - $(call kernel/opts,$(strip $(1))) + $(call kernel/opts,$(strip $(1)),$(strip $(2))) # # Blacklist for all low-level code, e.g. kernel and bootloaders |