r1701

Sun Apr 1 23:59:23 CEST 2007

Author: stsp
Date: 2007-04-01 23:59:18 +0200 (Sun, 01 Apr 2007)
New Revision: 1701

Log:
Revert my ext2 changes for now, they were a bit premature.
I still need to work out the best way to deal with ext2
support. Maybe a seperate build with an ext2 root partition
is better? We'll see.


Modified: trunk/vendors/Nintendo/RAM/Makefile
===================================================================

--- trunk/vendors/Nintendo/RAM/Makefile	2007-04-01 17:02:54 UTC (rev 1700)
+++ trunk/vendors/Nintendo/RAM/Makefile	2007-04-01 21:59:18 UTC (rev 1701)
@@ -7,10 +7,11 @@
 ROMFSIMG = $(IMAGEDIR)/romfs.img
 ELFIMAGE = $(IMAGEDIR)/image.elf
 
-MEDIAFS	 = media
+FATFS	 = media
 
-ROMFS_DIRS = boot dev proc sbin $(MEDIAFS)/linux
 
+ROMFS_DIRS = boot dev proc sbin $(FATFS)/linux
+
 FS_DIRS = etc/rc.d home lib usr/bin usr/games usr/lib usr/share/udhcpc var/tmp var/run
 
 DEVICES = \
@@ -19,9 +20,8 @@
 	mem,c,1,1      kmem,c,1,2         null,c,1,3       ram0,b,1,0 \
 	ram1,b,1,1 \
 	\
-	mmc,b,254,0 \
-	mmc1,b,254,1 \
-	mmc2,b,254,2 \
+	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 \
@@ -69,22 +69,22 @@
 	# on non-ptmx ptys
 	chmod 620 $(ROMFSDIR)/dev/@[pt]ty[pqrsPQRS][0-9a-f],*
 	for i in $(FS_DIRS); do \
-		[ -d $(ROMFSDIR)/$(MEDIAFS)/linux/$$i ] || mkdir -p $(ROMFSDIR)/$(MEDIAFS)/linux/$$i; \
+		[ -d $(ROMFSDIR)/$(FATFS)/linux/$$i ] || mkdir -p $(ROMFSDIR)/$(FATFS)/linux/$$i; \
 	done
-	$(ROMFSINST) -s $(MEDIAFS)/linux/var /var
-	$(ROMFSINST) -s $(MEDIAFS)/linux/lib /lib
-	$(ROMFSINST) -s $(MEDIAFS)/linux/usr /usr
-	$(ROMFSINST) -s $(MEDIAFS)/linux/usr/bin /bin
-	$(ROMFSINST) -s $(MEDIAFS)/linux/home /home
-	$(ROMFSINST) -s $(MEDIAFS)/linux/etc /etc
+	$(ROMFSINST) -s $(FATFS)/linux/var /var
+	$(ROMFSINST) -s $(FATFS)/linux/lib /lib
+	$(ROMFSINST) -s $(FATFS)/linux/usr /usr
+	$(ROMFSINST) -s $(FATFS)/linux/usr/bin /bin
+	$(ROMFSINST) -s $(FATFS)/linux/home /home
+	$(ROMFSINST) -s $(FATFS)/linux/etc /etc
 	$(ROMFSINST) -s /var/tmp /tmp
 	$(ROMFSINST) /boot/rc
 	$(ROMFSINST) /boot/inittab
-	$(ROMFSINST) /$(MEDIAFS)/linux/etc/issue
-	$(ROMFSINST) $(NDS_COMMON)/rc.common /$(MEDIAFS)/linux/etc/rc.common
-	$(ROMFSINST) $(NDS_COMMON)/rc.defaults /$(MEDIAFS)/linux/etc/rc.defaults
+	$(ROMFSINST) /$(FATFS)/linux/etc/issue
+	$(ROMFSINST) $(NDS_COMMON)/rc.common /$(FATFS)/linux/etc/rc.common
+	$(ROMFSINST) $(NDS_COMMON)/rc.defaults /$(FATFS)/linux/etc/rc.defaults
 	for f in $(NDS_COMMON)/rc.d/*; do \
-		[ -d $$f ] || $(ROMFSINST) $$f /$(MEDIAFS)/linux/etc/rc.d/ ; \
+		[ -d $$f ] || $(ROMFSINST) $$f /$(FATFS)/linux/etc/rc.d/ ; \
 	done
 
 	$(ROMFSINST) -p +x $(NDS_COMMON)/default.script /usr/share/udhcpc/default.script
@@ -98,21 +98,21 @@
 	mkdir $(ROMFSDIR)/bin
 	-for i in `sort $(ROOTDIR)/user/busybox/busybox.links` ; do\
 		j=`basename $$i` ; \
-		mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/$$j $(ROMFSDIR)/bin ; \
+		mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/$$j $(ROMFSDIR)/bin ; \
 	done
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/busybox $(ROMFSDIR)/bin
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/mount $(ROMFSDIR)/bin
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/sh $(ROMFSDIR)/bin
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/login $(ROMFSDIR)/bin
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/init $(ROMFSDIR)/bin
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/autologin $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/busybox $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/mount $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/sh $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/login $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/init $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/autologin $(ROMFSDIR)/bin
 	# move MADPLAY into internal RAM and make it XIP, to gain the processing power
 	# for undisturbed audio.
-	-mv $(ROMFSDIR)/$(MEDIAFS)/linux/usr/bin/madplay $(ROMFSDIR)/bin
+	-mv $(ROMFSDIR)/$(FATFS)/linux/usr/bin/madplay $(ROMFSDIR)/bin
 	$(CROSS)flthdr -R $(ROMFSDIR)/bin/madplay
 	$(CROSS_COMPILE)flthdr -Z $(ROMFSDIR)/bin/*
 	-rm -r $(IMAGEDIR)/linux
-	mv $(ROMFSDIR)/$(MEDIAFS)/linux $(IMAGEDIR)
+	mv $(ROMFSDIR)/$(FATFS)/linux $(IMAGEDIR)
 	genromfs -v -V "ROMdisk" -f $(ROMFSIMG) -d $(ROMFSDIR)
 	BSS=`$(CROSS_COMPILE)objdump --headers $(ROOTDIR)/$(LINUXDIR)/linux | \
 	grep .bss` && \
@@ -131,4 +131,4 @@
 		-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); fakeroot tar -cvzf dslinux-ram.tgz linux dslinux.nds ) ; 
+	( cd $(IMAGEDIR); tar -cvzf dslinux-ram.tgz linux dslinux.nds ) ; 

Modified: trunk/vendors/Nintendo/RAM/config.linux-2.6.x
===================================================================
--- trunk/vendors/Nintendo/RAM/config.linux-2.6.x	2007-04-01 17:02:54 UTC (rev 1700)
+++ trunk/vendors/Nintendo/RAM/config.linux-2.6.x	2007-04-01 21:59:18 UTC (rev 1701)
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.14-hsc0
-# Sat Mar 31 23:56:00 2007
 #
 CONFIG_ARM=y
 # CONFIG_MMU is not set
@@ -339,13 +338,13 @@
 #
 # Block devices
 #
-# CONFIG_NDS_DLDI is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
 # CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_NDS_DLDI is not set
 
 #
 # IO Schedulers
@@ -673,9 +672,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 # CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set

Modified: trunk/vendors/Nintendo/RAM/config.vendor
===================================================================
--- trunk/vendors/Nintendo/RAM/config.vendor	2007-04-01 17:02:54 UTC (rev 1700)
+++ trunk/vendors/Nintendo/RAM/config.vendor	2007-04-01 21:59:18 UTC (rev 1701)
@@ -652,8 +652,7 @@
 # CONFIG_USER_BUSYBOX_UDHCPD is not set
 # CONFIG_USER_BUSYBOX_UDHCP_DEBUG is not set
 # CONFIG_USER_BUSYBOX_UDHCP_SYSLOG is not set
-CONFIG_USER_BUSYBOX_UMOUNT=y
-# CONFIG_USER_BUSYBOX_MOUNT_FORCE is not set
+# CONFIG_USER_BUSYBOX_UMOUNT is not set
 CONFIG_USER_BUSYBOX_UNAME=y
 # CONFIG_USER_BUSYBOX_UNCOMPRESS is not set
 # CONFIG_USER_BUSYBOX_UNIQ is not set

Modified: trunk/vendors/Nintendo/RAM/rc
===================================================================
--- trunk/vendors/Nintendo/RAM/rc	2007-04-01 17:02:54 UTC (rev 1700)
+++ trunk/vendors/Nintendo/RAM/rc	2007-04-01 21:59:18 UTC (rev 1701)
@@ -1,47 +1,22 @@
 #!/bin/sh
 
 mount -t proc none /proc
-
-echo "Trying to mount a filesystem on CF/SD card."
-
-# Try mounting SD cards first, then try CF
-fs_found=notyet
-for dev in hda mmc
-do
-	# Do we have an ext2 filesystem in the second partition?
-	mount -t ext2 -o noatime /dev/${dev}2 /media
-	if [ $? = 0 ]
+mount -t vfat -o noatime /dev/mmcblk1 /media
+if [ "$?" != "0" ]
+then
+	mount -t vfat -o noatime /dev/hda1 /media
+	if [ "$?" != "0" ]
 	then
-		echo "Mounted /dev/${dev}2 on /media (ext2)"
-		fs_found=yes
-		break
+		# some CF cards do not have a partition table
+		# try mounting /dev/hda
+		mount -t vfat -o noatime /dev/hda /media
+		if [ "$?" != "0" ]
+		then
+			# some SD cards do not have a partition table
+			# try mounting /dev/mmcblk0
+			mount -t vfat -o noatime /dev/mmcblk0 /media
+			[ "$?" = "0" ] || echo "Sorry, failed to mount your CF/SD card."
+		fi
 	fi
-
-	# No ext2, fallback to vfat on first partition
-	mount -t vfat -o noatime /dev/${dev}1 /media
-	if [ $? = 0 ]
-	then
-		echo "Mounted /dev/${dev}1 on /media (vfat)"
-		fs_found=yes
-		break
-	fi
-
-	# Mmmh. Maybe we have a card without a partition table?
-	mount -t vfat -o noatime /dev/${dev} /media
-	if [ $? = 0 ]
-	then
-		echo "Mounted /dev/${dev} on /media (vfat)"
-		fs_found=yes
-		break
-	fi
-
-done
-
-if [ "${fs_found}" != "yes" ]
-then
-	echo "Sorry, failed to mount your CF/SD card."
-	echo "Dropping you into a shell..."
-	exec /bin/sh
 fi
-
 . /etc/rc.common


