X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fkernel.mk;h=580e3951d12d89af63605f8734920fcaaae4dcff;hb=f6777ece942ebd64b3ae43c3c939654577bfc6bd;hp=7c23aaca8eeb5faeceb5224bc91a215dab026c33;hpb=6ba80de972c5394222649b7fd01bd604ac7bfdd5;p=openwrt-10.03%2F.git

diff --git a/include/kernel.mk b/include/kernel.mk
index 7c23aaca8..580e3951d 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -16,7 +16,8 @@ else
   # check to see if .kernel.mk matches target.mk
   ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL))
      LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
-     RELEASE:=$(CONFIG_RELEASE)
+     LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE)
+     LINUX_KARCH:=$(CONFIG_LINUX_KARCH)
   else
   # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
     $(warning rebuilding .kernel.mk)
@@ -30,18 +31,13 @@ else
     LINUX_KMOD_SUFFIX=o
   endif
 
-  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/' \
-  )
-
   KERNELNAME=
   ifneq (,$(findstring x86,$(BOARD)))
     KERNELNAME="bzImage"
   endif
+  ifneq (,$(findstring ppc,$(BOARD)))
+    KERNELNAME="uImage"
+  endif
 
   ifneq (,$(findstring uml,$(BOARD)))
     LINUX_KARCH:=um