summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-22 09:19:06 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-24 19:15:31 +0200
commitc203e928106075434b41bd5b0d69204df63bd0a1 (patch)
tree5c7f2dd58141631d52d5965109068b54a0f3d0be
parent53a2de3f150a146a731841f3b378ce6e2fe98414 (diff)
downloadptxdist-c203e928106075434b41bd5b0d69204df63bd0a1.tar.gz
ptxdist-c203e928106075434b41bd5b0d69204df63bd0a1.tar.xz
canutils: use kernel-header package
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/canutils.in9
-rw-r--r--rules/canutils.make8
2 files changed, 4 insertions, 13 deletions
diff --git a/rules/canutils.in b/rules/canutils.in
index 2bf655cbe..b42053292 100644
--- a/rules/canutils.in
+++ b/rules/canutils.in
@@ -3,7 +3,7 @@
menuconfig CANUTILS
tristate
prompt "canutils "
- select KERNEL if CANUTILS_BSP_KERNEL
+ select KERNEL_HEADER
select LIBSOCKETCAN if CANUTILS_4
help
The canutils package contains tools to configure
@@ -27,13 +27,6 @@ config CANUTILS_4
This will enable extra an extra dependency to libsocketcan.
-config CANUTILS_BSP_KERNEL
- bool "use BSP's kernel headers instead of toolchain's"
- help
- Select this if you're using a toolchain based on a
- kernel < 2.6.25. This kernel doesn't provide the
- necessary headers.
-
config CANUTILS_CANCONFIG
bool
prompt "canconfig"
diff --git a/rules/canutils.make b/rules/canutils.make
index e857e4dd8..a2f8094b2 100644
--- a/rules/canutils.make
+++ b/rules/canutils.make
@@ -37,11 +37,9 @@ $(CANUTILS_SOURCE):
# Prepare
# ----------------------------------------------------------------------------
-CANUTILS_CONF_ENV := $(CROSS_ENV)
-
-ifdef PTXCONF_CANUTILS_BSP_KERNEL
-CANUTILS_CONF_ENV += CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
-endif
+CANUTILS_CONF_ENV := \
+ $(CROSS_ENV) \
+ CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
#
# autoconf