projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move $(MAKE) packages from .linux-compile: to compile:
[openwrt-10.03/.git]
/
include
/
kernel.mk
diff --git
a/include/kernel.mk
b/include/kernel.mk
index 7b959eaeaacf43935b304c0d93dac599c70aef37..bd558ceec731f4335940253ea59c05da5b126f77 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)
# 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)
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/' \
)
-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)
ifneq (,$(findstring uml,$(BOARD)))
LINUX_KARCH:=um
KERNEL_CC:=$(HOSTCC)