fix uml-2.6 build, move KERNELNAME to kernel-build.mk

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 9273817..7a36cee 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -31,16 +31,7 @@ else
     LINUX_KMOD_SUFFIX=o
   endif
 
-  KERNELNAME=
-  ifneq (,$(findstring x86,$(BOARD)))
-    KERNELNAME="bzImage"
-  endif
-  ifneq (,$(findstring ppc,$(BOARD)))
-    KERNELNAME="uImage"
-  endif
-
   ifneq (,$(findstring uml,$(BOARD)))
-    LINUX_KARCH:=um
     KERNEL_CC:=$(HOSTCC)
     KERNEL_CROSS:=
   else
@@ -70,7 +61,11 @@ define ModuleAutoLoad
        export modules=; \
        add_module() { \
                mkdir -p $(2)/etc/modules.d; \
-               echo "$$$$$$$$2" > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
+               ( \
+                       for mod in $$$$$$$$2; do \
+                               getvar mod; \
+                       done \
+               ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
                modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
        }; \
        $(3) \