[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-arm-kernel
Subject:    Re: FASTFPE broken
From:       Holger Schurig <h.schurig () mn-logistik ! de>
Date:       2003-09-25 9:28:53
[Download RAW message or body]

> So, maybe changing the help text and stopping it from silently running
> over the error condition would be a compromise?

Something like this:
This fixes various arm-related bugs in the BitKeeper version

arch/arm/kernel/time.c: added sched_clock()
BitKeeper/etc/ignore: more files to ignore
arch/arm/Makefile: stop a defined FastFPE from silently generating a 
non-FPE kernel

#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#

--- linux-2.6/arch/arm/Makefile~arm-fixes
+++ linux-2.6/arch/arm/Makefile
@@ -104,19 +104,22 @@
   
 export	MACHINE PROCESSOR TEXTADDR GZFLAGS CFLAGS_BOOT
 
-# Do we have FASTFPE?
-FASTFPE		:=arch/arm/fastfpe
-ifeq ($(FASTFPE),$(wildcard $(FASTFPE)))
-FASTFPE_OBJ	:=$(FASTFPE)/
-endif
-
 # If we have a machine-specific directory, then include it in the build.
 core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
 ifneq ($(MACHINE),)
 core-y				+= arch/arm/mach-$(MACHINE)/
 endif
 core-$(CONFIG_FPE_NWFPE)	+= arch/arm/nwfpe/
-core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)
+
+# If we have fast FPE selected, then include it, otherwise complain
+ifneq ($(CONFIG_FPE_FASTFPE),)
+FASTFPE	:= arch/arm/fastfpe
+ifeq ($(FASTFPE),$(wildcard $(FASTFPE)))
+core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE)/
+else
+$(error CONFIG_FPE_FASTFPE defined, but no $(FASTFPE) directory)
+endif
+endif
 
 drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/
 drivers-$(CONFIG_ARCH_L7200)	+= drivers/acorn/char/



Maybe $(error) is too ugly (because it spit's out the line number of the 
makefile) and we should simply do run echo / exit 1. But the approach 
should be clear, the user will get some indication about the wrong 
condition.

-- 
Try Linux 2.6 from BitKeeper for PXA2x0 CPUs at
http://www.mn-logistik.de/unsupported/linux-2.6/


-------------------------------------------------------------------
Subscription options: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ/Etiquette:       http://www.arm.linux.org.uk/armlinux/mailinglists.php

[prev in list] [next in list] [prev in thread] [next in thread]