add preliminary support for the successor of the storm port

[openwrt.git] / toolchain / kernel-headers / Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 2274ee2..47737b0 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,11 +9,8 @@ include $(TOPDIR)/rules.mk
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 
 KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
 BUILD_DIR := $(KERNEL_BUILD_DIR)
 

-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-

 override QUILT:=
 override QUILT:=

-override CONFIG_AUTOREBUILD=
+override HOST_QUILT:=

 
 include $(INCLUDE_DIR)/kernel.mk
 
 
 include $(INCLUDE_DIR)/kernel.mk
 


@@ -21,37 +18,37 @@ PKG_NAME:=linux
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_SOURCE:=$(LINUX_SOURCE)
 PKG_SOURCE_URL:=$(LINUX_SITE)
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_SOURCE:=$(LINUX_SOURCE)
 PKG_SOURCE_URL:=$(LINUX_SITE)

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)

 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)

-LINUX_DIR := $(PKG_BUILD_DIR)
+LINUX_DIR := $(HOST_BUILD_DIR)

 
 

-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk

 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)
   LINUX_KARCH:=$(ARCH)
 endif
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 ifeq ($(strip $(BOARD)),uml)
   LINUX_KARCH:=$(ARCH)
 endif
 

-KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
+  LINUX_HAS_HEADERS_INSTALL:=y
+endif
+
+KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \

        ARCH=$(LINUX_KARCH) \
        KBUILD_HAVE_NLS=no \
        CONFIG_SHELL=$(BASH)
 
        ARCH=$(LINUX_KARCH) \
        KBUILD_HAVE_NLS=no \
        CONFIG_SHELL=$(BASH)
 

-define Build/Prepare/pre/cris
-       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch
-       ln -sf $(PKG_BUILD_DIR)/include/asm-cris/arch-v10 $(PKG_BUILD_DIR)/arch/cris/arch
-endef
-
-define Build/Prepare/pre/powerpc
-       if [ -d $(PKG_BUILD_DIR)/include/asm-ppc ]; then \
-               $(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/; \
-               rm -rf $(PKG_BUILD_DIR)/include/asm-ppc; \
-               ln -s $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc; \
+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
 
        fi
 endef
 

-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
-  define Build/Prepare/all
+ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
+  define Host/Prepare/all

        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
        $(KMAKE) \
                CROSS_COMPILE=$(TARGET_CROSS) \
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
        $(KMAKE) \
                CROSS_COMPILE=$(TARGET_CROSS) \


@@ -59,69 +56,103 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
                headers_install
   endef
 else
                headers_install
   endef
 else

-  define Build/Prepare/all
+  define Host/Prepare/all

        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include
        mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include

-       cp -pLR \
-               $(BUILD_DIR_TOOLCHAIN)/linux/include/asm \
-               $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-generic \
-               $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-$(LINUX_KARCH) \
-               $(BUILD_DIR_TOOLCHAIN)/linux/include/linux \
-               $(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/
+       cp -pLR $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH) $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/
+       cp -pLR $(HOST_BUILD_DIR)/include/linux $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/

   endef
 endif
 
   endef
 endif
 

-define Build/Prepare
-       $(call Kernel/Prepare/Default)
-       $(SED) 's/@expr length/@-expr length/' $(PKG_BUILD_DIR)/Makefile
-       ln -sf linux-$(LINUX_VERSION) $(LINUX_HEADERS_DIR)
-       yes '' | $(KMAKE) oldconfig
-       $(KMAKE) include/linux/version.h include/asm
-       if [ -d $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \
-               $(CP) \
-                       $(PKG_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm/. \
-                       $(PKG_BUILD_DIR)/include/asm-$(LINUX_KARCH)/; \
-       fi
-       $(call Build/Prepare/pre/$(ARCH))
-       $(call Build/Prepare/all)
+# XXX: the following is needed to build lzma-loader
+define Host/Prepare/lzma
+       $(CP) \
+               $(HOST_BUILD_DIR)/include/asm-mips/asm.h \
+               $(HOST_BUILD_DIR)/include/asm-mips/regdef.h \
+               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/

 endef
 
 endef
 

-define Build/Configure
-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 Build/Compile
-endef
+  define Host/Prepare/post/cris
+       $(CP) \
+               $(HOST_BUILD_DIR)/include/linux/user.h \
+               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
+       $(CP) \
+               $(HOST_BUILD_DIR)/include/linux/user.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/

 
 

-define Build/Install/all
-       mkdir -p $(TOOLCHAIN_DIR)/usr/include
+       mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch

        $(CP) \
        $(CP) \

-               $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/* \
-               $(TOOLCHAIN_DIR)/usr/include/
+               $(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
+       $(CP) \
+               $(HOST_BUILD_DIR)/include/linux/user.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
+       $(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/user.h
+  endef
+endif
+
+define Host/Prepare/post/mips
+       $(call Host/Prepare/lzma)

 endef
 
 endef
 

-# XXX: the following is needed to build lzma-loader
-define Build/Install/post/lzma
-       $(CP) \
-               $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-mips/asm.h \
-               $(BUILD_DIR_TOOLCHAIN)/linux/include/asm-mips/regdef.h \
-               $(TOOLCHAIN_DIR)/usr/include/asm/
+define Host/Prepare/post/mipsel
+       $(call Host/Prepare/lzma)
+endef
+
+define Host/Prepare
+       $(call Kernel/Prepare/Default)
+       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 include/asm
+       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
 
 endef
 

-define Build/Install/post/mips
-       $(call Build/Install/post/lzma)
+define Host/Configure

 endef
 
 endef
 

-define Build/Install/post/mipsel
-       $(call Build/Install/post/lzma)
+define Host/Compile

 endef
 
 endef
 

-define Build/Install
-       $(call Build/Install/all)
-       $(call Build/Install/post/$(ARCH))
+define Host/Install
+       $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/

 endef
 
 endef
 

-define Build/Clean
+define Host/Clean

        rm -rf \
        rm -rf \

-               $(PKG_BUILD_DIR) \
+               $(HOST_BUILD_DIR) \

                $(BUILD_DIR_TOOLCHAIN)/linux \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev
 endef
                $(BUILD_DIR_TOOLCHAIN)/linux \
                $(BUILD_DIR_TOOLCHAIN)/linux-dev
 endef