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

SVN-Revision: 5204

include/kernel-build.mk

@@ -18,6 +18,9 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS
 TARGETS += $(KERNEL_IPKG)
 INSTALL_TARGETS += $(KERNEL_IPKG)
 
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=um
+else
   LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
 	-e 's/mipsel/mips/' \
 	-e 's/mipseb/mips/' \
@@ -25,6 +28,15 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
 	-e 's/sh[234]/sh/' \
 	-e 's/armeb/arm/' \
   )
+endif
+
+KERNELNAME=
+ifneq (,$(findstring x86,$(BOARD)))
+  KERNELNAME="bzImage"
+endif
+ifneq (,$(findstring ppc,$(BOARD)))
+  KERNELNAME="uImage"
+endif
 
 
 $(TARGETS): $(PACKAGE_DIR)

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