2010-01-16 23:11:52 +08:00
|
|
|
--- a/arch/mips/bcm947xx/Makefile
|
|
|
|
+++ b/arch/mips/bcm947xx/Makefile
|
|
|
|
@@ -11,6 +11,7 @@
|
|
|
|
obj-y := prom.o setup.o time.o sbmips.o gpio.o
|
|
|
|
obj-y += nvram.o nvram_linux.o cfe_env.o hndpmu.o
|
|
|
|
obj-y += sbutils.o utils.o bcmsrom.o hndchipc.o
|
|
|
|
+obj-y += sflash.o
|
|
|
|
obj-$(CONFIG_PCI) += sbpci.o pcibios.o
|
|
|
|
obj-y += export.o
|
|
|
|
|
2009-05-28 23:55:54 +08:00
|
|
|
--- a/drivers/mtd/devices/Config.in
|
|
|
|
+++ b/drivers/mtd/devices/Config.in
|
2006-03-28 02:16:20 +08:00
|
|
|
@@ -5,6 +5,7 @@
|
|
|
|
mainmenu_option next_comment
|
|
|
|
|
|
|
|
comment 'Self-contained MTD device drivers'
|
|
|
|
+bool ' Broadcom Chipcommon Serial Flash support' CONFIG_MTD_SFLASH
|
|
|
|
dep_tristate ' Ramix PMC551 PCI Mezzanine RAM card support' CONFIG_MTD_PMC551 $CONFIG_MTD $CONFIG_PCI
|
|
|
|
if [ "$CONFIG_MTD_PMC551" = "y" -o "$CONFIG_MTD_PMC551" = "m" ]; then
|
|
|
|
bool ' PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
|
2009-05-28 23:55:54 +08:00
|
|
|
--- a/drivers/mtd/devices/Makefile
|
|
|
|
+++ b/drivers/mtd/devices/Makefile
|
2006-03-28 02:16:20 +08:00
|
|
|
@@ -3,6 +3,8 @@
|
|
|
|
#
|
|
|
|
# $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
|
|
|
|
|
|
|
|
+EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
|
|
|
|
+
|
|
|
|
O_TARGET := devlink.o
|
|
|
|
|
|
|
|
# *** BIG UGLY NOTE ***
|
2008-05-19 21:45:06 +08:00
|
|
|
@@ -12,6 +14,7 @@ O_TARGET := devlink.o
|
2006-03-28 02:16:20 +08:00
|
|
|
# here where previously there was none. We now have to ensure that
|
|
|
|
# doc200[01].o are linked before docprobe.o
|
|
|
|
|
|
|
|
+obj-$(CONFIG_MTD_SFLASH) += sflash.o
|
|
|
|
obj-$(CONFIG_MTD_DOC1000) += doc1000.o
|
|
|
|
obj-$(CONFIG_MTD_DOC2000) += doc2000.o
|
|
|
|
obj-$(CONFIG_MTD_DOC2001) += doc2001.o
|
2009-05-28 23:55:54 +08:00
|
|
|
--- a/drivers/mtd/maps/Config.in
|
|
|
|
+++ b/drivers/mtd/maps/Config.in
|
2008-05-19 21:45:06 +08:00
|
|
|
@@ -48,6 +48,7 @@ if [ "$CONFIG_PPC" = "y" ]; then
|
2006-03-28 02:16:20 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "$CONFIG_MIPS" = "y" ]; then
|
|
|
|
+ dep_tristate ' CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
|
|
|
|
dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
|
|
|
|
dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
|
|
|
|
dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
|
2009-05-28 23:55:54 +08:00
|
|
|
--- a/drivers/mtd/maps/Makefile
|
|
|
|
+++ b/drivers/mtd/maps/Makefile
|
2006-03-28 02:16:20 +08:00
|
|
|
@@ -3,6 +3,8 @@
|
|
|
|
#
|
|
|
|
# $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
|
|
|
|
|
|
|
|
+EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
|
|
|
|
+
|
|
|
|
BELOW25 := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
|
|
|
|
|
|
|
|
ifeq ($(BELOW25),y)
|
2008-05-19 21:45:06 +08:00
|
|
|
@@ -10,6 +12,7 @@ O_TARGET := mapslink.o
|
2006-03-28 02:16:20 +08:00
|
|
|
endif
|
|
|
|
|
|
|
|
# Chip mappings
|
|
|
|
+obj-$(CONFIG_MTD_BCM947XX) += bcm947xx-flash.o
|
|
|
|
obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
|
|
|
|
obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
|
|
|
|
obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
|