add generic ide support for x86-2.6

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 4b5fe72..580e395 100644 (file)
--- 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)
   # 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)
   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_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=""
+  KERNELNAME=

   ifneq (,$(findstring x86,$(BOARD)))
     KERNELNAME="bzImage"
   endif
   ifneq (,$(findstring x86,$(BOARD)))
     KERNELNAME="bzImage"
   endif

+  ifneq (,$(findstring ppc,$(BOARD)))
+    KERNELNAME="uImage"
+  endif

 
   ifneq (,$(findstring uml,$(BOARD)))
     LINUX_KARCH:=um
 
   ifneq (,$(findstring uml,$(BOARD)))
     LINUX_KARCH:=um