blob-cvs-commit

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

[Tim R. <tim...@us...>]

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;

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;
> 
> 

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

[Tim R. <Ti...@Ri...>]

are you sure you do not have jffs2, cramfs or zimage turned on?

"load kernel" should still load a kernel from your flash partition no?
This is exactly what the boot is doing.

if you define --enable-{jffs2|cramfs|zImage} then "load kernel" will try
to find a kernel in your ramdisk.

If you are not using those, then turn them off.

Christopher Hoover wrote:
>
> 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;
> >
> >

-- 
Tim Riker - http://rikers.org/ - short SIGs! <g>
All I need to know I could have learned in Kindergarten
... if I'd just been paying attention.

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

[Russ D. <Rus...@as...>]

On Wed, 2002-05-01 at 16:39, Tim Riker wrote:
> are you sure you do not have jffs2, cramfs or zimage turned on?
> 
> "load kernel" should still load a kernel from your flash partition no?
> This is exactly what the boot is doing.
> 
> if you define --enable-{jffs2|cramfs|zImage} then "load kernel" will try
> to find a kernel in your ramdisk.
> 

random semirelated ramblings...instead of all this hardcoded stuff, why
not have a pointer for blob, kernel, paramater block, and root (pointer
to partitions). if two pointers point to the same partition, its assumed
that there is an fs involved, otherwise, its (likely) raw flash.
Somehow, CF, ide, netboot, and paramater block needs to get thrown in
here too.

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

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

It seems to me we need a concept above and beyond a partition (= a chunk
of flash).

I'll call this an "image" for lack of a better word.  

-- We have a list of "images" to be loaded on boot.
-- No reason for "kernel" or "ramdisk" image to be special.
-- Any image can:
	-- either "execute" in place or copied/loaded into ram from
somewhere
	-- somewhere == raw partition, download, file on a filesystem in
a partition
-- Certain commands should require certain images to be present (i.e.
exist for xip else loaded  from somewhere)

-- Image loading would have a post-success hook so that loading certain
flavor images could update the param table(ugh) -- we would need this
for initrd's, maybe root fs images.

I'd like something along these lines so that I can stuff two kernels and
two jffs roots into flash and chose which one to boot.

-ch


> -----Original Message-----
> From: Russ Dill [mailto:Rus...@as...] 
> Sent: Wednesday, May 01, 2002 4:52 PM
> To: Tim Riker
> Cc: Christopher Hoover; blo...@li...
> Subject: Re: blob/src/blob main.c,1.46,1.47
> 
> 
> On Wed, 2002-05-01 at 16:39, Tim Riker wrote:
> > are you sure you do not have jffs2, cramfs or zimage turned on?
> > 
> > "load kernel" should still load a kernel from your flash 
> partition no?
> > This is exactly what the boot is doing.
> > 
> > if you define --enable-{jffs2|cramfs|zImage} then "load 
> kernel" will try
> > to find a kernel in your ramdisk.
> > 
> 
> random semirelated ramblings...instead of all this hardcoded 
> stuff, why
> not have a pointer for blob, kernel, paramater block, and 
> root (pointer
> to partitions). if two pointers point to the same partition, 
> its assumed
> that there is an fs involved, otherwise, its (likely) raw flash.
> Somehow, CF, ide, netboot, and paramater block needs to get thrown in
> here too.
> 

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

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

> are you sure you do not have jffs2, cramfs or zimage turned on?

I'm sure.
 
> "load kernel" should still load a kernel from your flash partition no?

Nope.

blob> load kernel
*** invalid command
blob>

-ch

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

[Tim R. <Ti...@Ri...>]

ugh. my bad. I needed that second set of eyes. I was thinking the my
"load kernel" was the same as "reload kernel" not a truncated version of
my test "loadkernel" command.

Very sorry, but thanx for the info!

I fixed it up. Tell me if you still ahve issues.

Christopher Hoover wrote:
> 
> > are you sure you do not have jffs2, cramfs or zimage turned on?
> 
> I'm sure.
> 
> > "load kernel" should still load a kernel from your flash partition no?
> 
> Nope.
> 
> blob> load kernel
> *** invalid command
> blob>
> 
> -ch
> 
> _______________________________________________________________
> 
> Have big pipes? SourceForge.net is looking for download mirrors. We supply
> the hardware. You get the recognition. Email Us: ban...@so...
> _______________________________________________
> blob-cvs-commit mailing list
> blo...@li...
> https://lists.sourceforge.net/lists/listinfo/blob-cvs-commit

-- 
Tim Riker - http://rikers.org/ - short SIGs! <g>
All I need to know I could have learned in Kindergarten
... if I'd just been paying attention.