--- celinuxtry1/init/do_mounts.c 2009-04-11 15:51:01.000000000 +0200 +++ celinuxdevelop/init/do_mounts.c 2009-05-19 23:57:26.000000000 +0200 @@ -16,11 +16,11 @@ #include #include -//extern int sd_flags_czj; int flags_key_F2=0; +int flags_exec_F2=0; //RV int flags_key_F3=0;//edwin int flags_exec_F3=0; //czj -//int flags_key_F3=1;//czj -- xiu gai edwin's code + #define BUILD_CRAMDISK @@ -840,32 +840,38 @@ static void __init mount_root(void) if(flags_key_F2==1) { + //F2_key means mount boot from second sd, type is ext3 memset(line_czj,0,sizeof line_czj); - strcpy(line_czj,"/dev/csda1"); + strcpy(line_czj,"/dev/csda2"); line = &line_czj[0]; ret = root_dev_setup(line); - flags_key_F2 =0; + old_root_fs_name = root_fs_names; + fs_names_setup("ext3"); + flags_exec_F2 = 1; + // flags_key_F2 =0; } + else { + //wjx boot from nfs flags_key_F3=1;//default mount minifs for install the rootfs.edwin //flags_key_F3=1;//default mount minifs for install the rootfs.edwin if(flags_key_F3==1) { - //F3_key means mount the mini-fs, type is jffs2 + //F3_key means mount boot from minifs = trendtac minifs memset(line_czj,0,sizeof line_czj); strcpy(line_czj,"/dev/mtdblock3"); line = &line_czj[0]; ret = root_dev_setup(line); old_root_fs_name = root_fs_names; - fs_names_setup("jffs2"); + fs_names_setup("yaffs2"); flags_exec_F3 = 1; //flags_key_F3 =0; } - /***/ } + devfs_make_root(root_device_name); create_dev("/dev/root", ROOT_DEV, root_device_name); #ifdef CONFIG_BLK_DEV_FD