dslinux/linux-2.6.x/arch/arm/mach-nds head.S
amadeus
dslinux_amadeus at user.in-berlin.de
Sun Sep 3 22:21:38 CEST 2006
Update of /cvsroot/dslinux/dslinux/linux-2.6.x/arch/arm/mach-nds
In directory antilope:/tmp/cvs-serv6587/linux-2.6.x/arch/arm/mach-nds
Modified Files:
head.S
Log Message:
Use 32 MByte RAM on Supercard CF
Index: head.S
===================================================================
RCS file: /cvsroot/dslinux/dslinux/linux-2.6.x/arch/arm/mach-nds/head.S,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- head.S 30 Aug 2006 12:05:26 -0000 1.20
+++ head.S 3 Sep 2006 20:21:36 -0000 1.21
@@ -248,10 +248,6 @@
@ Region 7 - GBA SLOT ROM for Program+Data, overriding Region 6
@-------------------------------------------------------------------------
ldr r0,=( PAGE_32M | 0x08000000 | 1)
-#ifdef CONFIG_IDE_NDS_SUPERCARD
- @ Supercard CF uses upper 16M for card I/O
- ldr r0,=( PAGE_16M | 0x08000000 | 1)
-#endif
mcr p15, 0, r0, c6, c7, 0
@-------------------------------------------------------------------------
@@ -368,14 +364,9 @@
* use this RAM. */
unlock_ram:
#ifdef CONFIG_NDS_ROM8BIT
-#ifdef CONFIG_MMC_SCSD
+#if defined(CONFIG_MMC_SCSD) || defined(CONFIG_IDE_NDS_SUPERCARD)
sc_set_ram @ swith to RAM mode, restore @SC_LOCK from R2
#endif
-#ifdef CONFIG_IDE_NDS_SUPERCARD
- @ supercard CF driver is not 32 MByte clean, so use only lower
- @ 16 MBytes
- sc_setmode SC_MODE_IORAM
-#endif
#ifdef CONFIG_MMC_M3SD
m3_set_rw
#endif
More information about the dslinux-commit
mailing list