mtd/drivers/mtd Makefile.common,NONE,1.1 Makefile.inc,NONE,1.1 GNUmakefile,1.14,1.15 Makefile,1.73,1.74 defconfig,1.1,1.2

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv26380

Modified Files:
	GNUmakefile Makefile defconfig 
Added Files:
	Makefile.common Makefile.inc 
Log Message:
Make makefiles work for 2.5 too


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile.common'
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile.inc'
Index: GNUmakefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/GNUmakefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- GNUmakefile	21 May 2003 12:57:58 -0000	1.14
+++ GNUmakefile	21 May 2003 15:00:00 -0000	1.15
@@ -6,16 +6,14 @@
 
 # Someone just typed 'make'. Invoke the kernel makefiles properly...
 
-export CONFIG_MTD_COMPLEX_MAPPINGS EXTRA_CFLAGS
-
 modules:
-	make -C $(LINUXDIR) SUBDIRS=`pwd` modules
+	make -C $(LINUXDIR) SUBDIRS=`pwd` mtd=`pwd` modules
 
 simplemap:
-	make -C $(LINUXDIR) SUBDIRS=`pwd` SIMPLEMAP=1 modules
+	make -C $(LINUXDIR) SUBDIRS=`pwd` mtd=`pwd` SIMPLEMAP=1 modules
 
 dep:
-	make -C $(LINUXDIR) SUBDIRS=`pwd` dep
+	make -C $(LINUXDIR) SUBDIRS=`pwd` mtd=`pwd` dep
 
 clean:
 	rm -f `find . -name \*.ko` `find . -name \*.o`

Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/Makefile,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Makefile	21 May 2003 12:57:58 -0000	1.73
+++ Makefile	21 May 2003 15:00:00 -0000	1.74
@@ -1,25 +1,11 @@
+#
+# Out of tree drivers/mtd/Makefile
+#
 # $Id$
 
-# Munge the kernel build environment to suit our needs....
-
-include $(obj)/defconfig
-
-# This must be first in the include path, so it goes in $(CC) rather
-# then $(EXTRA_CFLAGS)
-
-CC += -I$(obj)/../../include
-EXTRA_CFLAGS := -g -DMTD_OUT_OF_TREE #-Werror
-
-ifdef SIMPLEMAP
-EXTRA_CFLAGS += -DSIMPLEMAP
-endif
-
 # We know, but not quite yet...
 CFLAGS_nftlcore.o := -Wno-error
 CFLAGS_nftlmount.o := -Wno-error
 
-ifeq ($(PATCHLEVEL),5)
-include $(obj)/Makefile-2.5
-else
-include $(obj)/Makefile-2.4
-endif
+# Munge the kernel build environment to suit our needs....
+include $(mtd)/Makefile.inc

Index: defconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/defconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- defconfig	21 May 2003 12:57:58 -0000	1.1
+++ defconfig	21 May 2003 15:00:00 -0000	1.2
@@ -1,6 +1,7 @@
 # $Id$
 
 CONFIG_MTD := m
+CONFIG_MTD_CONCAT := m
 CONFIG_MTD_PARTITIONS := m
 CONFIG_MTD_REDBOOT_PARTS := m
 CONFIG_MTD_AFS_PARTS := m
@@ -11,6 +12,7 @@
 CONFIG_MTD_CFI := m
 CONFIG_MTD_CFI_AMDSTD := m
 CONFIG_MTD_CFI_INTELEXT := m
+CONFIG_MTD_CFI_STAA := m
 CONFIG_MTD_GEN_PROBE := m
 CONFIG_MTD_JEDECPROBE := m
 CONFIG_MTD_INTELPROBE := m
@@ -39,7 +41,6 @@
  CONFIG_MTD_OCTAGON := m
  CONFIG_MTD_PCMCIA := m
  CONFIG_MTD_SBC_GXX := m
- CONFIG_MTD_SUN_UFLASH := m
  CONFIG_MTD_VMAX := m
 else
  CONFIG_MTD_COMPLEX_MAPPINGS := n
@@ -47,8 +48,8 @@
  CONFIG_MTD_OCTAGON := n
  CONFIG_MTD_PCMCIA := n
  CONFIG_MTD_SBC_GXX := n
- CONFIG_MTD_SUN_UFLASH := n
  CONFIG_MTD_VMAX := n
 endif
 CONFIG_MTD_NAND := m
 CONFIG_MTD_NAND_ECC := m
+CONFIG_MTD_NAND_IDS := m