[RFC] xload: get barebox size from barebox_arm_head

[Jan Weitzel]

Am Dienstag, den 28.08.2012, 08:54 +0200 schrieb Sascha Hauer:
> Hi Jan,
> 
> Looks mostly good.
Is there a better place than arch/arm/mach-omap/xload.c for the helper functions?
Didn't find one for common arm related code.

Jan

> On Mon, Aug 27, 2012 at 12:56:20PM +0200, Jan Weitzel wrote:
> >  #include <fcntl.h>
> >  #include <mach/xload.h>
> >  #include <sizes.h>
> > +#include <asm/barebox-arm-head.h>
> >  
> > -void *omap_xload_boot_nand(int offset, int size)
> > +void *read_image_head(const char *name)
> > +{
> > +	void *header = xmalloc(ARM_HEAD_SIZE);
> > +	struct cdev *cdev;
> > +	int ret;
> > +
> > +	cdev = cdev_open(name, O_RDONLY);
> > +	if (!cdev) {
> > +		printf("failed to open partition\n");
> > +		return NULL;
> > +	}
> > +
> > +	ret = cdev_read(cdev, header, ARM_HEAD_SIZE, 0, 0);
> > +	cdev_close(cdev);
> > +
> > +	if (ret != ARM_HEAD_SIZE) {
> > +		printf("failed to read from partition\n");
> > +		return NULL;
> > +	}
> > +
> > +	return header;
> > +}
> > +
> > +unsigned int get_image_size(void *head)
> > +{
> > +	unsigned int ret = 0;
> > +	unsigned int *psize = head + HEAD_SIZE_OFFSET;
> > +	const char *pmagic = head + HEAD_MAGICWORD_OFFSET;
> > +
> > +	if (!head)
> > +		return 0;
> 
> Please drop this check...
> 
> > +
> > +	if (!strcmp(pmagic, "barebox"))
> > +		ret = *psize;
> > +	debug("Detected barebox image size %u\n", ret);
> > +
> > +	return ret;
> > +}
> > +
> > +void *omap_xload_boot_nand(int offset)
> >  {
> >  	int ret;
> > -	void *to = xmalloc(size);
> > +	int size;
> > +	void *to;
> >  	struct cdev *cdev;
> >  
> > -	devfs_add_partition("nand0", offset, size, PARTITION_FIXED, "x");
> > +	devfs_add_partition("nand0", offset, SZ_1M, PARTITION_FIXED, "x");
> >  	dev_add_bb_dev("x", "bbx");
> >  
> > +	size = get_image_size(read_image_head("bbx"));
> 
> ...and instead bail out directly here if you are unable to read the
> image head. If you are unable to read even the head of the image there
> is no point in trying to continue.
> 
> Sascha
> 
> 
> > +	if (!size)
> > +		size = SZ_512K;
> > +
> > +	to = xmalloc(size);
> > +
> >  	cdev = cdev_open("bbx", O_RDONLY);
> >  	if (!cdev) {
> >  		printf("failed to open nand\n");
> > @@ -80,7 +127,7 @@ int run_shell(void)
> >  		printf("unknown boot source. Fall back to nand\n");
> >  	case OMAP_BOOTSRC_NAND:
> >  		printf("booting from NAND\n");
> > -		func = omap_xload_boot_nand(SZ_128K, SZ_512K);
> > +		func = omap_xload_boot_nand(SZ_128K);
> >  		break;
> >  	}
> >  
> > -- 
> > 1.7.0.4
> > 
> > 
> > _______________________________________________
> > barebox mailing list
> > barebox at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
> > 
>