fix uml-2.6 build, move KERNELNAME to kernel-build.mk

SVN-Revision: 5204
This commit is contained in:
Nicolas Thill 2006-10-18 13:16:44 +00:00
parent 454f20488d
commit ee11bee390
2 changed files with 14 additions and 11 deletions

View File

@ -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)

View File

@ -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