dslinux/vendors/Nintendo/SCSD-RAM Makefile config.linux-2.6.x issue motd rc t
amadeus
dslinux_amadeus at user.in-berlin.de
Tue Aug 22 17:10:04 CEST 2006
Update of /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM
In directory antilope:/tmp/cvs-serv509/vendors/Nintendo/SCSD-RAM
Modified Files:
Makefile config.linux-2.6.x issue motd rc t
Log Message:
build SD and CF version together, mounted at /media
Index: motd
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/motd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- motd 16 Aug 2006 10:27:27 -0000 1.1
+++ motd 22 Aug 2006 15:10:02 -0000 1.2
@@ -9,5 +9,5 @@
For further information check:
[36mhttp://www.dslinux.org/[0m
-This is the Supercard SD RAM version.
+This is the Supercard RAM version.
[1;31mYou must type "poweroff" before turning off the DS.[0m
Index: t
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t 22 Aug 2006 10:52:51 -0000 1.2
+++ t 22 Aug 2006 15:10:02 -0000 1.3
@@ -1,3 +1,3 @@
#!/bin/sh
-cd /supercard/musik
+cd /media/musik
madplay -m -z *
Index: rc
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rc 16 Aug 2006 10:27:27 -0000 1.1
+++ rc 22 Aug 2006 15:10:02 -0000 1.2
@@ -1,6 +1,16 @@
#!/bin/sh
mount -t proc none /proc
-mount -t vfat /dev/mmcblk1 /supercard
-
+mount -t vfat -o noatime /dev/mmcblk1 /media
+if [ "$?" != "0" ]
+then
+ mount -t vfat -o noatime /dev/hda1 /media
+ # some CF cards do not have a partition table
+ # try mounting /dev/hda if mounting /dev/hda1 fails
+ if [ "$?" != "0" ]
+ then
+ mount -t vfat -o noatime /dev/hda /media
+ [ "$?" = "0" ] || echo "Sorry, failed to mount your CF card."
+ fi
+fi
. /etc/rc.common
Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile 22 Aug 2006 10:52:44 -0000 1.8
+++ Makefile 22 Aug 2006 15:10:02 -0000 1.9
@@ -1,17 +1,13 @@
#
-# Makefile -- Build instructions for Supercard SD RAM
+# Makefile -- Build instructions for Supercard SD/CF RAM
#
include $(LINUX_CONFIG)
ROMFSIMG = $(IMAGEDIR)/romfs.img
ELFIMAGE = $(IMAGEDIR)/image.elf
-ifdef CONFIG_XIP_KERNEL
-IMAGE = $(IMAGEDIR)/dslinux.ds.nds
-else
-IMAGE = $(IMAGEDIR)/dslinux.nds.gba
-endif
-FATFS = supercard
+
+FATFS = media
ROMFS_DIRS = dev etc proc sbin $(FATFS)/linux
@@ -27,6 +23,9 @@
mmcblk0,b,254,0 \
mmcblk1,b,254,1 \
\
+ hda,b,3,0 hda1,b,3,1 hda2,b,3,2 hda3,b,3,3 \
+ hda4,b,3,4 \
+ \
ptyp0,c,2,0 ptyp1,c,2,1 ptyp2,c,2,2 ptyp3,c,2,3 \
ptyp4,c,2,4 ptyp5,c,2,5 ptyp6,c,2,6 ptyp7,c,2,7 \
ptyp8,c,2,8 ptyp9,c,2,9 ptypa,c,2,10 ptypb,c,2,11 \
@@ -120,33 +119,21 @@
-rm -r $(IMAGEDIR)/linux
mv $(ROMFSDIR)/$(FATFS)/linux $(IMAGEDIR)
genromfs -v -V "ROMdisk" -f $(ROMFSIMG) -d $(ROMFSDIR)
- if [ "$(CONFIG_XIP_KERNEL)" != "y" ]; then \
- BSS=`$(CROSS_COMPILE)objdump --headers $(ROOTDIR)/$(LINUXDIR)/linux | \
- grep .bss` && \
- BSSADDR=`set -- $${BSS} ; echo 0x$${4}` && \
- BSSSIZE=`set -- $${BSS} ; echo 0x$${3}` && \
- ADDR=`echo $${BSSADDR} $${BSSSIZE} | \
- perl -ane 'printf "0x%x\n",hex($$F[0]) + hex($$F[1])' ` && \
- echo "BSS=$${BSSADDR},$${BSSSIZE} ADDR=$${ADDR}" && \
- $(CROSS_COMPILE)objcopy --add-section=.romfs=$(ROMFSIMG) \
- --adjust-section-vma=.romfs=$${ADDR} --no-adjust-warnings \
- --set-section-flags=.romfs=alloc,load,data \
- $(ROOTDIR)/$(LINUXDIR)/linux $(ELFIMAGE) 2> /dev/null && \
- $(CROSS_COMPILE)objcopy -O binary $(ELFIMAGE) $(IMAGEDIR)/arm9.bin && \
- ndstool -c $(IMAGEDIR)/dslinux.nds -9 $(IMAGEDIR)/arm9.bin \
- -r9 0x02000000 -e9 0x02000000 \
- -7 $(ROOTDIR)/$(LINUXDIR)/arch/arm/mach-nds/arm7.bin \
- -r7 0x03800000 -e7 0x03800000 \
- -b $(NDS_COMMON)/tux.bmp "DSLinux;Port of Linux;to the DS!" && \
- ( cd $(IMAGEDIR); tar -cvzf dslinux-$(FATFS)sd-ram.tgz linux dslinux.nds ) ; \
- else \
- $(CROSS_COMPILE)objcopy -O binary \
- --remove-section=.text --remove-section=.init \
- $(ROOTDIR)/$(LINUXDIR)/linux $(IMAGEDIR)/linux.data && \
- $(CROSS_COMPILE)objcopy -O binary \
- -j .init -j .text \
- $(ROOTDIR)/$(LINUXDIR)/linux $(IMAGEDIR)/linux.text && \
- cat $(IMAGEDIR)/linux.text $(IMAGEDIR)/linux.data $(ROMFSIMG) > $(IMAGE) && \
- ( cd $(IMAGEDIR); tar -cvzf dslinux-$(FATFS)sd-ram.tgz linux dslinux.ds.nds ) ; \
- fi
-
+ BSS=`$(CROSS_COMPILE)objdump --headers $(ROOTDIR)/$(LINUXDIR)/linux | \
+ grep .bss` && \
+ BSSADDR=`set -- $${BSS} ; echo 0x$${4}` && \
+ BSSSIZE=`set -- $${BSS} ; echo 0x$${3}` && \
+ ADDR=`echo $${BSSADDR} $${BSSSIZE} | \
+ perl -ane 'printf "0x%x\n",hex($$F[0]) + hex($$F[1])' ` && \
+ echo "BSS=$${BSSADDR},$${BSSSIZE} ADDR=$${ADDR}" && \
+ $(CROSS_COMPILE)objcopy --add-section=.romfs=$(ROMFSIMG) \
+ --adjust-section-vma=.romfs=$${ADDR} --no-adjust-warnings \
+ --set-section-flags=.romfs=alloc,load,data \
+ $(ROOTDIR)/$(LINUXDIR)/linux $(ELFIMAGE) 2> /dev/null && \
+ $(CROSS_COMPILE)objcopy -O binary $(ELFIMAGE) $(IMAGEDIR)/arm9.bin && \
+ ndstool -c $(IMAGEDIR)/dslinux.nds -9 $(IMAGEDIR)/arm9.bin \
+ -r9 0x02000000 -e9 0x02000000 \
+ -7 $(ROOTDIR)/$(LINUXDIR)/arch/arm/mach-nds/arm7.bin \
+ -r7 0x03800000 -e7 0x03800000 \
+ -b $(NDS_COMMON)/tux.bmp "DSLinux;Port of Linux;to the DS!" && \
+ ( cd $(IMAGEDIR); tar -cvzf dslinux-supercard-ram.tgz linux dslinux.nds ) ;
Index: issue
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/issue,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- issue 16 Aug 2006 10:27:27 -0000 1.1
+++ issue 22 Aug 2006 15:10:02 -0000 1.2
@@ -9,5 +9,5 @@
For further information check:
[36mhttp://www.dslinux.org/[0m
-This is the Supercard SD RAM version.
+This is the Supercard SD/CF RAM version.
[1;31mYou must type "poweroff" before turning off the DS.[0m
Index: config.linux-2.6.x
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/config.linux-2.6.x,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config.linux-2.6.x 19 Aug 2006 20:22:56 -0000 1.8
+++ config.linux-2.6.x 22 Aug 2006 15:10:02 -0000 1.9
@@ -356,7 +356,32 @@
#
# ATA/ATAPI/MFM/RLL support
#
-# CONFIG_IDE is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_IDE_ARM=y
+# CONFIG_IDE_NDS_GBAMP is not set
+# CONFIG_IDE_NDS_M3 is not set
+CONFIG_IDE_NDS_SUPERCARD=y
+# CONFIG_IDE_NDS_MAX_MEDIA_PLAYER is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
#
# SCSI device support
More information about the dslinux-commit
mailing list