convert brcm-2.4 to the new target structure
[openwrt/svn-archive/archive.git] / target / linux / brcm-2.4 / patches / 004-flash.patch
1 diff -urN linux.old/drivers/mtd/devices/Config.in linux.dev/drivers/mtd/devices/Config.in
2 --- linux.old/drivers/mtd/devices/Config.in 2006-06-22 17:35:39.000000000 +0200
3 +++ linux.dev/drivers/mtd/devices/Config.in 2006-06-21 21:41:24.000000000 +0200
4 @@ -5,6 +5,7 @@
5 mainmenu_option next_comment
6
7 comment 'Self-contained MTD device drivers'
8 +bool ' Broadcom Chipcommon Serial Flash support' CONFIG_MTD_SFLASH
9 dep_tristate ' Ramix PMC551 PCI Mezzanine RAM card support' CONFIG_MTD_PMC551 $CONFIG_MTD $CONFIG_PCI
10 if [ "$CONFIG_MTD_PMC551" = "y" -o "$CONFIG_MTD_PMC551" = "m" ]; then
11 bool ' PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
12 diff -urN linux.old/drivers/mtd/devices/Makefile linux.dev/drivers/mtd/devices/Makefile
13 --- linux.old/drivers/mtd/devices/Makefile 2006-06-22 17:35:39.000000000 +0200
14 +++ linux.dev/drivers/mtd/devices/Makefile 2006-06-21 21:41:24.000000000 +0200
15 @@ -3,6 +3,8 @@
16 #
17 # $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
18
19 +EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
20 +
21 O_TARGET := devlink.o
22
23 # *** BIG UGLY NOTE ***
24 @@ -12,6 +14,7 @@
25 # here where previously there was none. We now have to ensure that
26 # doc200[01].o are linked before docprobe.o
27
28 +obj-$(CONFIG_MTD_SFLASH) += sflash.o
29 obj-$(CONFIG_MTD_DOC1000) += doc1000.o
30 obj-$(CONFIG_MTD_DOC2000) += doc2000.o
31 obj-$(CONFIG_MTD_DOC2001) += doc2001.o
32 diff -urN linux.old/drivers/mtd/maps/Config.in linux.dev/drivers/mtd/maps/Config.in
33 --- linux.old/drivers/mtd/maps/Config.in 2006-06-22 17:35:39.000000000 +0200
34 +++ linux.dev/drivers/mtd/maps/Config.in 2006-06-21 21:41:24.000000000 +0200
35 @@ -48,6 +48,7 @@
36 fi
37
38 if [ "$CONFIG_MIPS" = "y" ]; then
39 + dep_tristate ' CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
40 dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
41 dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
42 dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
43 diff -urN linux.old/drivers/mtd/maps/Makefile linux.dev/drivers/mtd/maps/Makefile
44 --- linux.old/drivers/mtd/maps/Makefile 2006-06-22 17:35:39.000000000 +0200
45 +++ linux.dev/drivers/mtd/maps/Makefile 2006-06-21 21:41:24.000000000 +0200
46 @@ -3,6 +3,8 @@
47 #
48 # $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
49
50 +EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
51 +
52 BELOW25 := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
53
54 ifeq ($(BELOW25),y)
55 @@ -10,6 +12,7 @@
56 endif
57
58 # Chip mappings
59 +obj-$(CONFIG_MTD_BCM947XX) += bcm947xx-flash.o
60 obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
61 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
62 obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o