new (last?) attempt at standardizing Makefiles

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 7b959ea..bd558ce 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -16,7 +16,7 @@ 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)
   else
   # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
     $(warning rebuilding .kernel.mk)
@@ -38,6 +38,14 @@ else
        -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
     KERNEL_CC:=$(HOSTCC)