X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4134d3b68a6053d2923b175c51f38a771a295403..12c49b6a6adbbcb0c7a19119c8a8c94b5f025f79:/toolchain/kernel-headers/Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 05ee49be3..68fa1bc4e 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -5,32 +5,58 @@
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME=kernel-headers
-PKG_VERSION=$(LINUX_VERSION)
+PKG_NAME:=linux
+PKG_VERSION:=$(LINUX_VERSION)
+PKG_SOURCE:=$(LINUX_SOURCE)
+PKG_SOURCE_URL:=$(LINUX_SITE)
 
-PKG_SOURCE=$(LINUX_SOURCE)
-PKG_SOURCE_URL=$(LINUX_SITE)
+KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
+PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_DIR := $(PKG_BUILD_DIR)
+BUILD_DIR := $(KERNEL_BUILD_DIR)
 
-PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+override QUILT:=
 
+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Build/Prepare/cris
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)
+	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 arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
+	ln -sf arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
+endef
+
+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/Prepare
-	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
+	$(if $(Build/Prepare/$(ARCH)),$(Build/Prepare/$(ARCH)),$(call Kernel/Prepare/Default))
 	$(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-	ln -sf $(PKG_BUILD_DIR) $(LINUX_HEADERS_DIR)
+	ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
+	yes '' | $(KMAKE) oldconfig
+	$(KMAKE) include/linux/version.h include/asm
+	$(call Build/Configure/$(ARCH))
 endef
 
 define Build/Configure
-	-$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=$(LINUX_KARCH) \
-		CONFIG_SHELL=$(BASH) \
-		defconfig include/linux/version.h
 endef
 
 define Build/Compile