Title: [3915] trunk/arch/blackfin: [#2424] fix type EBUI -> EBIU and use "
depends on" in Kconfig
- Revision
- 3915
- Author
- cooloney
- Date
- 2007-11-21 08:18:06 -0600 (Wed, 21 Nov 2007)
Log Message
[#2424] fix type EBUI -> EBIU and use "depends on" in Kconfig
Diffstat
Kconfig | 16 ++++++++--------
mach-bf548/head.S | 12 ++++++------
2 files changed, 14 insertions(+), 14 deletions(-)
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (3914 => 3915)
--- trunk/arch/blackfin/Kconfig 2007-11-21 14:12:57 UTC (rev 3914)
+++ trunk/arch/blackfin/Kconfig 2007-11-21 14:18:06 UTC (rev 3915)
@@ -726,7 +726,7 @@
choice
prompt "Uncached SDRAM region"
default DMA_UNCACHED_1M
- depends BFIN_DMA_5XX
+ depends on BFIN_DMA_5XX
config DMA_UNCACHED_2M
bool "Enable 2M DMA region"
config DMA_UNCACHED_1M
@@ -867,19 +867,19 @@
default 0x99B3
endmenu
-config EBUI_MBSCTLVAL
- hex "EBUI Bank Select Control Register"
- depends BF54x
+config EBIU_MBSCTLVAL
+ hex "EBIU Bank Select Control Register"
+ depends on BF54x
default 0
-config EBUI_MODEVAL
+config EBIU_MODEVAL
hex "Flash Memory Mode Control Register"
- depends BF54x
+ depends on BF54x
default 1
-config EBUI_FCTLVAL
+config EBIU_FCTLVAL
hex "Flash Memory Bank Control Register"
- depends BF54x
+ depends on BF54x
default 6
endmenu
Modified: trunk/arch/blackfin/mach-bf548/head.S (3914 => 3915)
--- trunk/arch/blackfin/mach-bf548/head.S 2007-11-21 14:12:57 UTC (rev 3914)
+++ trunk/arch/blackfin/mach-bf548/head.S 2007-11-21 14:18:06 UTC (rev 3915)
@@ -160,22 +160,22 @@
p2.h = hi(EBIU_MBSCTL);
p2.l = lo(EBIU_MBSCTL);
- r0.h = hi(CONFIG_EBUI_MBSCTLVAL);
- r0.l = lo(CONFIG_EBUI_MBSCTLVAL);
+ r0.h = hi(CONFIG_EBIU_MBSCTLVAL);
+ r0.l = lo(CONFIG_EBIU_MBSCTLVAL);
[p2] = r0;
ssync;
p2.h = hi(EBIU_MODE);
p2.l = lo(EBIU_MODE);
- r0.h = hi(CONFIG_EBUI_MODEVAL);
- r0.l = lo(CONFIG_EBUI_MODEVAL);
+ r0.h = hi(CONFIG_EBIU_MODEVAL);
+ r0.l = lo(CONFIG_EBIU_MODEVAL);
[p2] = r0;
ssync;
p2.h = hi(EBIU_FCTL);
p2.l = lo(EBIU_FCTL);
- r0.h = hi(CONFIG_EBUI_FCTLVAL);
- r0.l = lo(CONFIG_EBUI_FCTLVAL);
+ r0.h = hi(CONFIG_EBIU_FCTLVAL);
+ r0.l = lo(CONFIG_EBIU_FCTLVAL);
[p2] = r0;
ssync;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
