From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T6cFO-0003Bv-Ru for barebox@lists.infradead.org; Wed, 29 Aug 2012 06:59:31 +0000 Date: Wed, 29 Aug 2012 08:59:29 +0200 From: Sascha Hauer Message-ID: <20120829065929.GO26594@pengutronix.de> References: <20120828090828.GE26594@pengutronix.de> <1346157381-16420-1-git-send-email-j.weitzel@phytec.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1346157381-16420-1-git-send-email-j.weitzel@phytec.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v2] xload: get barebox size from barebox_arm_head To: Jan Weitzel Cc: barebox@lists.infradead.org On Tue, Aug 28, 2012 at 02:36:21PM +0200, Jan Weitzel wrote: > Add functions to read the barebox_arm_head, check barebox magicword > and read out the barebox image size. > Create a inital partion of 1Mb to access the barebox image on nand. The patch neither applies on next or on master. On which branch did you apply this? Sascha > > Signed-off-by: Jan Weitzel > --- > v2: remove fall back if header read fail > > arch/arm/include/asm/barebox-arm-head.h | 4 ++ > arch/arm/mach-omap/include/mach/xload.h | 2 +- > arch/arm/mach-omap/xload.c | 58 ++++++++++++++++++++++++++++-- > 3 files changed, 59 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h > index 0dc3074..521bcf6 100644 > --- a/arch/arm/include/asm/barebox-arm-head.h > +++ b/arch/arm/include/asm/barebox-arm-head.h > @@ -1,6 +1,10 @@ > #ifndef __ASM_ARM_HEAD_H > #define __ASM_ARM_HEAD_H > > +#define ARM_HEAD_SIZE 0x30 > +#define HEAD_MAGICWORD_OFFSET 0x20 > +#define HEAD_SIZE_OFFSET 0x2C > + > static inline void barebox_arm_head(void) > { > __asm__ __volatile__ ( > diff --git a/arch/arm/mach-omap/include/mach/xload.h b/arch/arm/mach-omap/include/mach/xload.h > index 844b57f..26f1b68 100644 > --- a/arch/arm/mach-omap/include/mach/xload.h > +++ b/arch/arm/mach-omap/include/mach/xload.h > @@ -1,7 +1,7 @@ > #ifndef _MACH_XLOAD_H > #define _MACH_XLOAD_H > > -void *omap_xload_boot_nand(int offset, int size); > +void *omap_xload_boot_nand(int offset); > void *omap_xload_boot_mmc(void); > > enum omap_boot_src { > diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c > index 9a6b0b4..0be0c50 100644 > --- a/arch/arm/mach-omap/xload.c > +++ b/arch/arm/mach-omap/xload.c > @@ -7,16 +7,66 @@ > #include > #include > #include > +#include > > -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; > - void *to = xmalloc(size); > + > + 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 (!strcmp(pmagic, "barebox")) > + ret = *psize; > + debug("Detected barebox image size %u\n", ret); > + > + return ret; > +} > + > +void *omap_xload_boot_nand(int offset) > +{ > + int ret; > + int size; > + void *to, *header; > 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"); > > + header = get_image_size(read_image_head("bbx")); > + if (header == NULL) > + return NULL; > + > + size = get_image_size(header); > + if (!size) { > + printf("failed to get image size\n"); > + return NULL; > + } > + > + to = xmalloc(size); > + > cdev = cdev_open("bbx", O_RDONLY); > if (!cdev) { > printf("failed to open nand\n"); > @@ -80,7 +130,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@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox