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