From 5def4fc0f402ef5ea6a76e196b41e8fc2d80c48e Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 18 Oct 2006 13:16:44 +0000
Subject: fix uml-2.6 build, move KERNELNAME to kernel-build.mk

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5204 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/kernel-build.mk | 16 ++++++++++++++--
 include/kernel.mk       |  9 ---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 06f4ce772..a3c714c68 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -18,13 +18,25 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS
 TARGETS += $(KERNEL_IPKG)
 INSTALL_TARGETS += $(KERNEL_IPKG)
 
-LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
+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/' \
 	-e 's/powerpc/ppc/' \
 	-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)
diff --git a/include/kernel.mk b/include/kernel.mk
index 7c0ba6d7d..7a36cee1a 100644
--- 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
-- 
cgit v1.2.3