mtd partitioning for .21

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 32d686c..00a7882 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -26,11 +26,12 @@ else
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 

+  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
+  GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)

   KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
   LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
   KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
   LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)

-  MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR)

   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux


@@ -41,6 +42,8 @@ else
            http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
 
            http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
 

+  PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+

 endif
 
 
 endif
 
 


@@ -75,6 +78,7 @@ endef
 
 define KernelPackage
   NAME:=$(1)
 
 define KernelPackage
   NAME:=$(1)

+  $(eval $(call Package/Default))

   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))


@@ -86,7 +90,7 @@ define KernelPackage
     CATEGORY:=Kernel modules
     DEFAULT:=$(KMOD_DEFAULT)
     DESCRIPTION:=$(DESCRIPTION)
     CATEGORY:=Kernel modules
     DEFAULT:=$(KMOD_DEFAULT)
     DESCRIPTION:=$(DESCRIPTION)

-    EXTRA_DEPENDS:='kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))'
+    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))

     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))


@@ -96,13 +100,15 @@ define KernelPackage
     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install
                mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install
                mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)

-               $(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
+               $(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/

                $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
                $(call KernelPackage/$(1)/install,$$(1))
       endef
     endif
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
                $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
                $(call KernelPackage/$(1)/install,$$(1))
       endef
     endif
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))

+
+  $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))

 endef
 
 define AutoLoad
 endef
 
 define AutoLoad