qi-commandline-remove-all-sd-rootfstype.patch

Signed-off-by: Andy Green <andy@openmoko.com>

qiboot/src/cpu/s3c2410/gta01.c

@@ -240,7 +240,6 @@ const struct board_api board_api_gta01 = {
 					 "0x00200000(kernel)," \
 					 "0x000a0000(splash)," \
 					 "0x03d1c000(rootfs) " \
-				       "rootfstype=ext3 " \
 				       "root=/dev/mmcblk0p2 " \
 				       "console=ttySAC0,115200 " \
 				       "loglevel=4 " \
@@ -261,7 +260,6 @@ const struct board_api board_api_gta01 = {
 					 "0x00200000(kernel)," \
 					 "0x000a0000(splash)," \
 					 "0x03d1c000(rootfs) " \
-				       "rootfstype=ext3 " \
 				       "root=/dev/mmcblk0p2 " \
 				       "console=ttySAC0,115200 " \
 				       "loglevel=4 " \
@@ -269,6 +267,26 @@ const struct board_api board_api_gta01 = {
 				       "ro"
 		},
 		[2] = {
+			.name = "SD Card EXT2 Kernel p3",
+			.block_init = sd_card_init_gta01,
+			.block_read = sd_card_block_read_gta01,
+			.partition_index = 3,
+			.filesystem = FS_EXT2,
+			.filepath = "boot/uImage-GTA01.bin",
+			.commandline = "mtdparts=" \
+					"neo1973-nand:" \
+					 "0x00040000(qi)," \
+					 "0x00004000(u-boot_env)," \
+					 "0x00200000(kernel)," \
+					 "0x000a0000(splash)," \
+					 "0x03d1c000(rootfs) " \
+				       "root=/dev/mmcblk0p2 " \
+				       "console=ttySAC0,115200 " \
+				       "loglevel=4 " \
+				       "init=/sbin/init "\
+				       "ro"
+		},
+		[3] = {
 			.name = "NAND Kernel",
 			.block_read = nand_read_ll,
 			.offset_blocks512_if_no_partition = 0x44000 / 512,

qiboot/src/cpu/s3c2442/gta02.c

@@ -400,10 +400,9 @@ const struct board_api board_api_gta02 = {
 					 "0x000a0000(extra)," \
 					 "0x00040000(identity)," \
 					 "0x0f6a0000(backuprootfs) " \
-				       "rootfstype=ext3 " \
 				       "root=/dev/mmcblk0p1 " \
 				       "console=ttySAC2,115200 " \
-				       "loglevel=4 " \
+				       "loglevel=8 console=tty0 " \
 				       "init=/sbin/init "\
 				       "ro"
 		},
@@ -422,10 +421,9 @@ const struct board_api board_api_gta02 = {
 					 "0x000a0000(extra)," \
 					 "0x00040000(identity)," \
 					 "0x0f6a0000(backuprootfs) " \
-				       "rootfstype=ext3 " \
 				       "root=/dev/mmcblk0p2 " \
 				       "console=ttySAC2,115200 " \
-				       "loglevel=4 " \
+				       "loglevel=8 console=tty0 " \
 				       "init=/sbin/init "\
 				       "ro"
 		},
@@ -444,10 +442,9 @@ const struct board_api board_api_gta02 = {
 					 "0x000a0000(extra)," \
 					 "0x00040000(identity)," \
 					 "0x0f6a0000(backuprootfs) " \
-				       "rootfstype=ext3 " \
 				       "root=/dev/mmcblk0p3 " \
 				       "console=ttySAC2,115200 " \
-				       "loglevel=4 " \
+				       "loglevel=8 console=tty0 " \
 				       "init=/sbin/init "\
 				       "ro"
 		},
@@ -467,7 +464,7 @@ const struct board_api board_api_gta02 = {
 				       "rootfstype=jffs2 " \
 				       "root=/dev/mtdblock6 " \
 				       "console=ttySAC2,115200 " \
-				       "loglevel=8 " \
+				       "loglevel=8 console=tty0 " \
 				       "init=/sbin/init "\
 				       "ro"
 		},

qiboot/src/cpu/s3c6410/gta03-steppingstone.c

@@ -66,7 +66,7 @@ const struct board_api board_api_gta03 = {
 			.filepath = "boot/uImage-GTA03.bin",
 			.commandline = "console=ttySAC3,115200 " \
 				       "loglevel=8 init=/bin/sh " \
-				       "root=/dev/mmcblk0p2 rootfstype=ext3"
+				       "root=/dev/mmcblk0p2"
 		},
 		[1] = {
 			.name = "SD Card backup rootfs",
@@ -76,7 +76,7 @@ const struct board_api board_api_gta03 = {
 			.filepath = "boot/uImage-GTA03.bin",
 			.commandline = "console=ttySAC3,115200 " \
 				       "loglevel=8 init=/bin/sh " \
-				       "root=/dev/mmcblk0p3 rootfstype=ext3"
+				       "root=/dev/mmcblk0p3"
 		},
 	},
 };

qiboot/src/cpu/s3c6410/smdk6410-steppingstone.c

@@ -54,7 +54,7 @@ const struct board_api board_api_smdk6410 = {
 			.filepath = "boot/uImage.bin",
 			.commandline = "console=ttySAC0,115200 " \
 				       "loglevel=3 init=/bin/sh " \
-				       "root=/dev/mmcblk0p2 rootfstype=ext3"
+				       "root=/dev/mmcblk0p2"
 		},
 		[1] = {
 			.name = "SD Card backup rootfs",
@@ -64,7 +64,7 @@ const struct board_api board_api_smdk6410 = {
 			.filepath = "boot/uImage.bin",
 			.commandline = "console=ttySAC0,115200 " \
 				       "loglevel=8 init=/bin/sh " \
-				       "root=/dev/mmcblk0p3 rootfstype=ext3"
+				       "root=/dev/mmcblk0p3"
 		},	},
 };