RE: blob/src/blob main.c,1.46,1.47

[Christopher H. <ch...@mu...>]

This change breaks booting from a flash partition containg the kernel.
It is an ugly regression because it causes autoboot to jump into junk
(because no kernel has been loaded into dram).  The "boot" command does
the same, unless preceeded by an explicit "reload kernel".

-ch


> -----Original Message-----
> From: blo...@li... 
> [mailto:blo...@li...] On 
> Behalf Of Tim Riker
> Sent: Tuesday, April 30, 2002 4:53 PM
> To: blo...@li...
> Subject: CVS: blob/src/blob main.c,1.46,1.47
> 
> 
> Update of /cvsroot/blob/blob/src/blob
> In directory usw-pr-cvs1:/tmp/cvs-serv23964/src/blob
> 
> Modified Files:
> 	main.c 
> Log Message:
> wierd work around, comments welcome
> 
> Index: main.c
> ===================================================================
> RCS file: /cvsroot/blob/blob/src/blob/main.c,v
> retrieving revision 1.46
> retrieving revision 1.47
> diff -u -d -r1.46 -r1.47
> --- main.c	30 Apr 2002 23:30:54 -0000	1.46
> +++ main.c	30 Apr 2002 23:53:24 -0000	1.47
> @@ -129,7 +129,8 @@
>  
>  	/* Load kernel and ramdisk from flash to RAM */
>  	do_reload("blob");
> -	do_reload("kernel");
> +	/* do_reload("kernel"); does not work for jffs2 but the 
> next line does?!? TimRiker */
> +	parse_command("load kernel");
>  	if(blob_status.load_ramdisk)
>  		do_reload("ramdisk");
>  
> @@ -435,7 +436,7 @@
>  	} else if(strncmp(argv[1], "kernel", 7) == 0) {
>  #if	KERNEL_FLASH_BASE == RAMDISK_FLASH_BASE
>  		printerrprefix();
> -		printf("configured for kernel in ramdisk\n", argv[1]);
> +		printf("configured for kernel in ramdisk\n");
>  		return -EINVAL;
>  #else
>  		src = (u32 *)KERNEL_RAM_BASE;
> 
>