Title: [4125] trunk:
remove options that are no longer used by the BF5xx-Flash driver as they have been moved to board resources
- Revision
- 4125
- Author
- vapier
- Date
- 2008-01-21 03:25:56 -0600 (Mon, 21 Jan 2008)
Log Message
remove options that are no longer used by the BF5xx-Flash driver as they have been moved to board resources
Diffstat
arch/blackfin/Kconfig | 5 -----
arch/blackfin/mach-bf533/boards/stamp.c | 6 +-----
drivers/mtd/maps/Kconfig | 30 ++++++++++--------------------
3 files changed, 11 insertions(+), 30 deletions(-)
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (4124 => 4125)
--- trunk/arch/blackfin/Kconfig 2008-01-21 09:25:11 UTC (rev 4124)
+++ trunk/arch/blackfin/Kconfig 2008-01-21 09:25:56 UTC (rev 4125)
@@ -264,11 +264,6 @@
depends on (BFIN527_EZKIT)
default y
-config BFIN_SHARED_FLASH_ENET
- bool
- depends on (BFIN533_STAMP)
- default y
-
source "arch/blackfin/mach-bf527/Kconfig"
source "arch/blackfin/mach-bf533/Kconfig"
source "arch/blackfin/mach-bf561/Kconfig"
Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (4124 => 4125)
--- trunk/arch/blackfin/mach-bf533/boards/stamp.c 2008-01-21 09:25:11 UTC (rev 4124)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c 2008-01-21 09:25:56 UTC (rev 4125)
@@ -515,12 +515,10 @@
return ret;
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
-# if defined(CONFIG_BFIN_SHARED_FLASH_ENET)
/* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */
bfin_write_FIO_DIR(bfin_read_FIO_DIR() | (1 << CONFIG_ENET_FLASH_PIN));
bfin_write_FIO_FLAG_S(1 << CONFIG_ENET_FLASH_PIN);
SSYNC();
-# endif
#endif
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
@@ -537,10 +535,8 @@
void native_machine_restart(char *cmd)
{
-#if defined(CONFIG_BFIN_SHARED_FLASH_ENET)
-# define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN)
+#define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN)
bfin_write_FIO_INEN(~BIT_TO_SET);
bfin_write_FIO_DIR(BIT_TO_SET);
bfin_write_FIO_FLAG_C(BIT_TO_SET);
-#endif
}
Modified: trunk/drivers/mtd/maps/Kconfig (4124 => 4125)
--- trunk/drivers/mtd/maps/Kconfig 2008-01-21 09:25:11 UTC (rev 4124)
+++ trunk/drivers/mtd/maps/Kconfig 2008-01-21 09:25:56 UTC (rev 4125)
@@ -560,27 +560,15 @@
config MTD_BF5xx
tristate "Blackfin BF533-STAMP Flash Chip Support"
- depends on BFIN533_STAMP
+ depends on BFIN533_STAMP && MTD_CFI
select MTD_PARTITIONS
help
Map driver which allows for simultaneous utilization of
- ethernet and ST parallel flash.
+ ethernet and CFI parallel flash.
-config BFIN_FLASH_SIZE
- depends on MTD_BF5xx
- hex "Size in bytes HEX"
- default 0x400000 if BFIN533_STAMP || BFIN537_STAMP
- default 0x200000 if BFIN533_EZKIT
-
-config EBIU_FLASH_BASE
- depends on MTD_BF5xx
- hex "Base Address in HEX"
- default 0x20000000
-
-menu "FLASH_EBIU_AMBCTL Control"
- depends on MTD_BF5xx && BFIN_SHARED_FLASH_ENET
config BFIN_FLASH_BANK_0
- hex "Bank 0"
+ hex "EBIU_AMBCTL For Flash (Bank 0)"
+ depends on MTD_BF5xx
default 0x7BB0
help
For boards that share the async memory bank with both Flash and
@@ -588,7 +576,8 @@
when the Flash is active. The other EBIU settings in the main
Blackfin menu will be utilized when the Flash is not active.
config BFIN_FLASH_BANK_1
- hex "Bank 1"
+ hex "EBIU_AMBCTL For Flash (Bank 1)"
+ depends on MTD_BF5xx
default 0x7BB0
help
For boards that share the async memory bank with both Flash and
@@ -596,7 +585,8 @@
when the Flash is active. The other EBIU settings in the main
Blackfin menu will be utilized when the Flash is not active.
config BFIN_FLASH_BANK_2
- hex "Bank 2"
+ hex "EBIU_AMBCTL For Flash (Bank 2)"
+ depends on MTD_BF5xx
default 0x7BB0
help
For boards that share the async memory bank with both Flash and
@@ -604,14 +594,14 @@
when the Flash is active. The other EBIU settings in the main
Blackfin menu will be utilized when the Flash is not active.
config BFIN_FLASH_BANK_3
- hex "Bank 3"
+ hex "EBIU_AMBCTL For Flash (Bank 3)"
+ depends on MTD_BF5xx
default 0x7BB0
help
For boards that share the async memory bank with both Flash and
the Ethernet, these settings allow you to have EBIU settings just
when the Flash is active. The other EBIU settings in the main
Blackfin menu will be utilized when the Flash is not active.
-endmenu
config MTD_UCLINUX
tristate "Generic uClinux RAM/ROM filesystem support"
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
