X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fkernel-headers%2FMakefile;h=57887ad1821135e08cd1c4b034ade701f4e06ca7;hp=027d6a852f8f2821aab3f583e0f1e7e94150c39b;hb=163096b49ff65e540c7fb488805c4fa989cfc7f5;hpb=e637a00d579bbb96fca5f8afcaa8ee59c6d73b25

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 027d6a852f..57887ad182 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -15,21 +15,53 @@ PKG_SOURCE_URL=$(LINUX_SITE)
 
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
 
+LINUX_DIR:=$(PKG_BUILD_DIR)
+KERNEL_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Prepare
+
+define Build/Prepare/cris
 	mkdir -p $(TOOLCHAIN_BUILD_DIR)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
-	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/generic-$(KERNEL)/patches
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
+	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
+	ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
+	ln -sf $(PKG_BUILD_DIR)/arch/cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
 	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
 	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
 endef
 
+ifdef Build/Prepare/$(ARCH)
+define Build/Prepare
+	$(call Build/Prepare/$(ARCH))
+endef
+else
+define Build/Prepare
+	$(call Kernel/Prepare/Default)
+	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
+	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+endef
+endif
+
+define Build/Configure/powerpc
+	$(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
+	rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
+	mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
+endef
+
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=$(ARCH)
+endif
+
+KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+	ARCH=$(LINUX_KARCH) \
+	CONFIG_SHELL=$(BASH)
+
 define Build/Configure
-	yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=$(LINUX_KARCH) \
-		CONFIG_SHELL=$(BASH) \
-		oldconfig include/linux/version.h
+	yes '' | $(KMAKE) oldconfig
+	$(KMAKE) include/linux/version.h include/asm
+	$(call Build/Configure/$(ARCH))
 endef
 
 define Build/Compile