diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-06 00:05:19 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-06 01:13:31 +0100 |
| commit | 35908cfef941d53719a15d96a28e1b54ccc325e7 (patch) | |
| tree | 688a8a012d01b9c41eae864996adaf7848bbd147 | |
| parent | 8c34d50bcf414d90f737026477e4cfaa0918f6b0 (diff) | |
| download | ptxdist-35908cfef941d53719a15d96a28e1b54ccc325e7.tar.gz ptxdist-35908cfef941d53719a15d96a28e1b54ccc325e7.tar.xz | |
[kernel] new "special" compiler handling following the bootloader
In commit "1c402fa0d9aeafe7aabc1f0386928287a09f34ec" the special
compiler handling for the bootloader has been updated to match the
scheme of "selected_*" links.
This patch renames the link to the special kernel compiler from
".ktoolchain" to "selected_toolchain_kernel".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/kernel-checks.make | 9 | ||||
| -rw-r--r-- | rules/kernel.make | 11 | ||||
| -rw-r--r-- | rules/pre/kernel.make | 19 |
3 files changed, 19 insertions, 20 deletions
diff --git a/rules/kernel-checks.make b/rules/kernel-checks.make index 1bed23da0..d810e2ea3 100644 --- a/rules/kernel-checks.make +++ b/rules/kernel-checks.make @@ -31,15 +31,6 @@ endif endif -ifneq ($(PTXCONF_COMPILER_PREFIX),$(PTXCONF_COMPILER_PREFIX_KERNEL)) -ifeq ($(wildcard .ktoolchain/$(PTXCONF_COMPILER_PREFIX_KERNEL)gcc),) - $(warning *** no .ktoolchain link found. Please create a link) - $(warning *** .ktoolchain to the bin directory of your $(PTXCONF_COMPILER_PREFIX_KERNEL) toolchain) - $(error ) -endif -endif - - ifeq ($(PTXCONF_KERNEL_VERSION),) $(warning *** PTXCONF_KERNEL_VERSION is empty) $(warning *** please run 'ptxdist platformconfig' and activate the kernel) diff --git a/rules/kernel.make b/rules/kernel.make index 322dba8aa..c7184a3d7 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -15,15 +15,6 @@ PACKAGES-$(PTXCONF_KERNEL) += kernel # -# handle special compiler -# -ifdef PTXCONF_KERNEL -ifneq ($(PTXCONF_COMPILER_PREFIX),$(PTXCONF_COMPILER_PREFIX_KERNEL)) - KERNEL_TOOLCHAIN_LINK := $(PTXDIST_WORKSPACE)/.ktoolchain/ -endif -endif - -# # when using a production release, # we use the precompiled kernel from /opt # @@ -81,7 +72,7 @@ KERNEL_MAKEVARS := \ $(PARALLELMFLAGS) \ HOSTCC=$(HOSTCC) \ ARCH=$(PTXCONF_KERNEL_ARCH_STRING) \ - CROSS_COMPILE=$(KERNEL_TOOLCHAIN_LINK)$(PTXCONF_COMPILER_PREFIX_KERNEL) \ + CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) \ \ INSTALL_MOD_PATH=$(KERNEL_PKGDIR) \ PTX_KERNEL_DIR=$(KERNEL_DIR) \ diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index 0400bf14b..6e15a70d5 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -1,6 +1,6 @@ # -*-makefile-*- # -# Copyright (C) 2003, 2009 by Marc Kleine-Budde <kleine-budde@gmx.de> +# Copyright (C) 2003, 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # (C) 2008 by Wolfram Sang <w.sang@pengutronix.de> # # See CREDITS for details about who has contributed to this project. @@ -20,4 +20,21 @@ _version_temp := KERNEL_HEADERS_DIR := $(PTXDIST_SYSROOT_TARGET)/kernel-headers KERNEL_HEADERS_INCLUDE_DIR := $(KERNEL_HEADERS_DIR)/include +# +# handle special compiler +# +ifdef PTXCONF_KERNEL + ifneq ($(PTXCONF_COMPILER_PREFIX),$(PTXCONF_COMPILER_PREFIX_KERNEL)) + ifeq ($(wildcard selected_toolchain_kernel/$(PTXCONF_COMPILER_PREFIX_KERNEL)gcc),) + $(warning *** no 'selected_toolchain_kernel' link found. Please create a link) + $(warning *** 'selected_toolchain_kernel' to the bin directory of your) + $(warning '$(PTXCONF_COMPILER_PREFIX_KERNEL)' toolchain) + $(error ) + endif + KERNEL_TOOLCHAIN_LINK := $(PTXDIST_WORKSPACE)/selected_toolchain_kernel/ + endif +endif + +KERNEL_CROSS_COMPILE := $(KERNEL_TOOLCHAIN_LINK)$(PTXCONF_COMPILER_PREFIX_KERNEL) + # vim: syntax=make |