X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=104b44c1977a1a3b6ac5b42da55c21e8abf15aff;hp=394e1d109b06ebaf0ba0ccae6fdc9ea21e8cbdde;hb=7ca97b03d9e3f8128b0f62680d10a25798076ee9;hpb=25d3c0fcd0e35e6db7a725db82408e89a77d2317

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 394e1d109b..104b44c197 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -22,6 +22,7 @@ HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)
 FILES_DIR := 
+PATCH_DIR := ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
@@ -34,36 +35,29 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
   LINUX_HAS_HEADERS_INSTALL:=y
 endif
 
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
-  LINUX_ASM_INCLUDES:=arch/$(LINUX_KARCH)/include/asm
-else
-  LINUX_ASM_INCLUDES:=include/asm
-endif
-
 KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
+	CC="$(KERNEL_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS_COMPILE=$(TARGET_CROSS) \
 	KBUILD_HAVE_NLS=no \
 	CONFIG_SHELL=$(BASH)
 
-define Host/Prepare/pre/powerpc
-	if [ -d $(HOST_BUILD_DIR)/include/asm-ppc ]; then \
-		mkdir -p $(PKG_BUILD_DIR)/include/asm-powerpc/; \
-		$(CP) $(HOST_BUILD_DIR)/include/asm-ppc/* $(HOST_BUILD_DIR)/include/asm-powerpc/; \
-		rm -rf $(HOST_BUILD_DIR)/include/asm-ppc; \
-		ln -s $(HOST_BUILD_DIR)/include/asm-powerpc $(HOST_BUILD_DIR)/include/asm-ppc; \
-	fi
-endef
-
 ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
   define Host/Prepare/all
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
 	$(KMAKE) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
 		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \
 		headers_install
+	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
+		$(CP) \
+			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
+			$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
+	fi
   endef
 else
   define Host/Prepare/all
+	$(KMAKE) include/linux/version.h include/asm
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
 	cp -pLR $(HOST_BUILD_DIR)/include/asm $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
 	cp -pLR $(HOST_BUILD_DIR)/include/asm-generic $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
@@ -83,7 +77,6 @@ endef
 define Host/Prepare/post/cris
 	$(CP) \
 		$(HOST_BUILD_DIR)/include/linux/user.h \
-		$(HOST_BUILD_DIR)/include/linux/autoconf.h \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
 	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch
@@ -112,13 +105,6 @@ define Host/Prepare
 	ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
 	$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
 	yes '' | $(KMAKE) oldconfig
-	$(KMAKE) include/linux/version.h $(LINUX_ASM_INCLUDES)
-	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
-		$(CP) \
-			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-			$(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
-	fi
-	$(call Host/Prepare/pre/$(ARCH))
 	$(call Host/Prepare/all)
 	$(call Host/Prepare/post/$(ARCH))
 endef