X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/64958baf0e72e9c111733449ef1967b4522a3e70..b935c3432780e283f95dbbfb1b37e278833e70d2:/toolchain/kernel-headers/Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index e82a4c810..4c4d4273f 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -73,38 +73,7 @@ define Host/Prepare/lzma
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
 endef
 
-# XXX: the following are needed to build a cris toolchain
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)),1)
-  define Host/Prepare/pre/cris
-	ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/include/asm-cris/arch
-	ln -sf $(HOST_BUILD_DIR)/include/asm-cris/arch-v10 $(HOST_BUILD_DIR)/arch/cris/arch
-  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/
-	$(CP) \
-		$(HOST_BUILD_DIR)/include/asm-cris/elf.h \
-		$(HOST_BUILD_DIR)/include/asm-cris/page.h \
-		$(HOST_BUILD_DIR)/include/asm-cris/user.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
-	$(CP) \
-		$(HOST_BUILD_DIR)/include/asm-generic/memory_model.h \
-		$(HOST_BUILD_DIR)/include/asm-generic/page.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm-generic/
-
-	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch
-	$(CP) \
-		$(HOST_BUILD_DIR)/include/asm-cris/arch/elf.h \
-		$(HOST_BUILD_DIR)/include/asm-cris/arch/page.h \
-		$(HOST_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
-		$(HOST_BUILD_DIR)/include/asm-cris/arch/user.h \
-		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch/
-  endef
-else
-  define Host/Prepare/post/cris
+define Host/Prepare/post/cris
 	$(CP) \
 		$(HOST_BUILD_DIR)/include/linux/user.h \
 		$(HOST_BUILD_DIR)/include/linux/autoconf.h \
@@ -112,8 +81,7 @@ else
 	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch
 	$(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/user.h
-  endef
-endif
+endef
 
 define Host/Prepare/post/ubicom32
 	$(CP) \
@@ -137,7 +105,11 @@ 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
+ifeq ($(CONFIG_LINUX_2_6_33),y)
+	$(KMAKE) include/linux/version.h arch/$(LINUX_KARCH)/include/asm
+else
 	$(KMAKE) include/linux/version.h include/asm
+endif
 	if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
 		$(CP) \
 			$(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \