On 11:10 Wed 29 Aug , 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.
>
> Signed-off-by: Jan Weitzel <j.weitzel@xxxxxxxxx>
> ---
> v2: remove fall back if header read fail
> v3: fix header check, rebase master
>
> 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 2c250e9..1ddfc0f 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 13024ab..d9765b7 100644
> --- a/arch/arm/mach-omap/xload.c
> +++ b/arch/arm/mach-omap/xload.c
> @@ -7,16 +7,66 @@
> #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;
> - 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);
factorise the code with filetype
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
