ar71xx: add sysupgrade support for the AP121 boards

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 63df959..5e8df44 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -16,11 +16,7 @@ ifeq ($(DUMP),1)
 else
   export GCC_HONOUR_COPTS=s
 
 else
   export GCC_HONOUR_COPTS=s
 

-  ifeq ($(KERNEL),2.6)
-    LINUX_KMOD_SUFFIX=ko
-  else
-    LINUX_KMOD_SUFFIX=o
-  endif
+  LINUX_KMOD_SUFFIX=ko

 
   ifneq (,$(findstring uml,$(BOARD)))
     KERNEL_CC?=$(HOSTCC)
 
   ifneq (,$(findstring uml,$(BOARD)))
     KERNEL_CC?=$(HOSTCC)


@@ -68,18 +64,23 @@ define KernelPackage/Defaults
 endef
 
 define ModuleAutoLoad
 endef
 
 define ModuleAutoLoad

+       $(SH_FUNC) \

        export modules=; \
        add_module() { \
        export modules=; \
        add_module() { \

+               priority="$$$$$$$$1"; \
+               mods="$$$$$$$$2"; \
+               boot="$$$$$$$$3"; \
+               shift 3; \

                mkdir -p $(2)/etc/modules.d; \
                ( \
                mkdir -p $(2)/etc/modules.d; \
                ( \

-                       [ "$$$$$$$$3" = "1" ] && { \
+                       [ "$$$$$$$$boot" = "1" ] && { \

                                echo '# May be required for rootfs' ; \
                        } ; \
                                echo '# May be required for rootfs' ; \
                        } ; \

-                       for mod in $$$$$$$$2; do \
-                               getvar mod; \
+                       for mod in $$$$$$$$mods; do \
+                               echo "$$$$$$$$mod"; \

                        done \
                        done \

-               ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
-               modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
+               ) > $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
+               modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \

        }; \
        $(3) \
        if [ -n "$$$$$$$$modules" ]; then \
        }; \
        $(3) \
        if [ -n "$$$$$$$$modules" ]; then \


@@ -108,7 +109,6 @@ define KernelPackage
   $(eval $(call Package/Default))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call Package/Default))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))

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

   $(eval $(call KernelPackage/$(1)/$(BOARD)))
 
   define Package/kmod-$(1)
   $(eval $(call KernelPackage/$(1)/$(BOARD)))
 
   define Package/kmod-$(1)


@@ -119,7 +119,6 @@ define KernelPackage
     EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE))
     VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
     $(call KernelPackage/$(1))
     EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE))
     VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
     $(call KernelPackage/$(1))

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

     $(call KernelPackage/$(1)/$(BOARD))
   endef
 
     $(call KernelPackage/$(1)/$(BOARD))
   endef
 


@@ -159,7 +158,7 @@ $(call KernelPackage/$(1)/config)
 endef
 
 define AutoLoad
 endef
 
 define AutoLoad

-  add_module $(1) "$(2)" $(3);
+  add_module "$(1)" "$(2)" "$(3)";

 endef
 
 ifdef DUMP
 endef
 
 ifdef DUMP