ChangeSet 1.2231.1.20, 2005/03/28 19:21:42-08:00, [EMAIL PROTECTED]
[PATCH] ppc32: Fix mv64x60 internal SRAM size
ppc32: Fix wrong size for mv64[34]60's internal SRAM.
- Fix incorrect SRAM size
- Minor Kconfig cleanups for mv64x60 platforms
Signed-off-by: Mark A. Greer <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/ppc/Kconfig | 10 ++--------
arch/ppc/platforms/chestnut.h | 4 ++--
arch/ppc/platforms/katana.h | 2 +-
include/asm-ppc/mv64x60_defs.h | 2 +-
4 files changed, 6 insertions(+), 12 deletions(-)
diff -Nru a/arch/ppc/Kconfig b/arch/ppc/Kconfig
--- a/arch/ppc/Kconfig 2005-03-28 21:10:48 -08:00
+++ b/arch/ppc/Kconfig 2005-03-28 21:10:48 -08:00
@@ -581,7 +581,6 @@
config RADSTONE_PPC7D
bool "Radstone Technology PPC7D board"
- select MV64360
config ADIR
bool "SBS-Adirondack"
@@ -757,15 +756,10 @@
depends on EV64260 || CPCI690
default y
-config MV64360
+config MV64360 # Really MV64360 & MV64460
bool
- depends on KATANA || RADSTONE_PPC7D || HDPU
+ depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU
default y
-
-config MV64360
- bool
- depends on CHESTNUT
- default y
config MV64X60
bool
diff -Nru a/arch/ppc/platforms/chestnut.h b/arch/ppc/platforms/chestnut.h
--- a/arch/ppc/platforms/chestnut.h 2005-03-28 21:10:48 -08:00
+++ b/arch/ppc/platforms/chestnut.h 2005-03-28 21:10:48 -08:00
@@ -28,8 +28,8 @@
* 0xffd00000-0xffd00004 - CPLD
* 0xffc00000-0xffc0000f - UART
* 0xffb00000-0xffb07fff - FRAM
- * 0xffa00000-0xffafffff - *** HOLE ***
- * 0xff800000-0xff9fffff - MV64460 Integrated SRAM
+ * 0xff840000-0xffafffff - *** HOLE ***
+ * 0xff800000-0xff83ffff - MV64460 Integrated SRAM
* 0xfe000000-0xff8fffff - *** HOLE ***
* 0xfc000000-0xfdffffff - 32bit Flash
* 0xf1010000-0xfbffffff - *** HOLE ***
diff -Nru a/arch/ppc/platforms/katana.h b/arch/ppc/platforms/katana.h
--- a/arch/ppc/platforms/katana.h 2005-03-28 21:10:48 -08:00
+++ b/arch/ppc/platforms/katana.h 2005-03-28 21:10:48 -08:00
@@ -24,7 +24,7 @@
* on a boundary that is a multiple of the window size):
*
* 0xff800000-0xffffffff - Boot window
- * 0xf8400000-0xf85fffff - Internal SRAM
+ * 0xf8400000-0xf843ffff - Internal SRAM
* 0xf8200000-0xf83fffff - CPLD
* 0xf8100000-0xf810ffff - MV64360 Registers (CONFIG_MV64X60_NEW_BASE)
* 0xf8000000-0xf80fffff - Socketed FLASH
diff -Nru a/include/asm-ppc/mv64x60_defs.h b/include/asm-ppc/mv64x60_defs.h
--- a/include/asm-ppc/mv64x60_defs.h 2005-03-28 21:10:48 -08:00
+++ b/include/asm-ppc/mv64x60_defs.h 2005-03-28 21:10:48 -08:00
@@ -347,7 +347,7 @@
#define MV64360_SRAM_ERR_DATA_HI 0x03a0
#define MV64360_SRAM_ERR_PARITY 0x03a8
-#define MV64360_SRAM_SIZE 0x00200000 /* 2 MB of
SRAM */
+#define MV64360_SRAM_SIZE 0x00040000 /* 2Mb/256KB
SRAM */
/*
*****************************************************************************
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
