at91: add bootstrap support

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 arch/arm/mach-at91/Kconfig         |    6 +++
 arch/arm/mach-at91/Makefile        |    1 +
 arch/arm/mach-at91/boot_test_cmd.c |   95
++++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 arch/arm/mach-at91/boot_test_cmd.c

arch/arm/mach-at91/Kconfig +6 -0

index 0fd9122..2815d5f 100644
@@ -485,6 +485,12 @@ config CMD_AT91MUX
        bool "at91mux dump command"
        default y
 
+config CMD_AT91_BOOT_TEST
+       bool "at91_boot_test"
+       help
+         allow to upload a boot binary to sram and execute it
+         usefull to test bootstrap or barebox lowlevel init
+
 endif
 
 endif

arch/arm/mach-at91/Makefile +1 -0

index 53b4dd8..4404d23 100644
@@ -1,4 +1,5 @@
 obj-y += setup.o clock.o gpio.o
+obj-$(CONFIG_CMD_AT91_BOOT_TEST) += boot_test_cmd.o
 
 lowlevel_init-y = at91sam926x_lowlevel_init.o
 lowlevel_init-$(CONFIG_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o

arch/arm/mach-at91/boot_test_cmd.c new file +2 -0

new file mode 100644
index 0000000..90093d8
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <

[email protected]>
+ *
+ * Under GPLv2 only
+ */

arch/arm/mach-at91/boot_test_cmd.c new file +49 -0

+
+#include <common.h>
+#include <command.h>
+#include <libbb.h>
+#include <getopt.h>
+#include <fs.h>
+#include <fcntl.h>
+#include <malloc.h>
+#include <errno.h>
+
+static int do_at91_boot_test(int argc, char *argv[])
+{
+       int opt;
+       u32 *buf32;
+       void *buf;
+       void (*jump)(void) = NULL;
+       int fd;
+       int ret = 1;
+       char *sram = "/dev/sram0";
+       u32 read_size, write_size;
+       u32 tmp = 0;
+
+       while ((opt = getopt(argc, argv, "j:s:")) > 0) {
+               switch (opt) {
+               case 'j':
+                       jump = (void*)simple_strtoul(optarg, NULL, 0);
+                       break;
+               case 's':
+                       sram = optarg;
+                       break;
+               default:
+                       return COMMAND_ERROR_USAGE;
+               }
+       }
+
+       if (argc < optind + 1)
+               return COMMAND_ERROR_USAGE;
+
+       buf32 = buf = read_file(argv[optind], &read_size);
+       if (!buf)
+               return -EINVAL;
+
+       write_size = buf32[5];
+
+       printf("size of the size %d\n", read_size);
+       printf("size to load in sram %d\n", write_size);
+
+       if (write_size > read_size) {
+               printf("file smaller than requested sram loading size (%d

< %d)\n", write_size, read_size);

arch/arm/mach-at91/boot_test_cmd.c new file +1 -0

+               goto err;

arch/arm/mach-at91/boot_test_cmd.c new file +22 -0

+               tmp = write(fd, buf, write_size);
+               if (tmp < 0) {
+                       perror("write");
+                       goto err_open;
+               }
+               buf += tmp;
+               write_size -= tmp;
+       }
+
+       shutdown_barebox();
+
+       jump();
+
+err_open:
+       close(fd);
+err:
+       free(buf);
+       return ret;
+}
+
+BAREBOX_CMD_HELP_START(at91_boot_test)
+BAREBOX_CMD_HELP_USAGE("at91_boot_test [-j <jump addr>] [-s <sram>]

file\n")
+BAREBOX_CMD_HELP_SHORT("upload the binary to sram and jump as will do the romcode\n")

arch/arm/mach-at91/boot_test_cmd.c new file +5 -0

+BAREBOX_CMD_HELP_END
+
+BAREBOX_CMD_START(at91_boot_test)
+       .cmd            = do_at91_boot_test,
+       .usage          = "upload the binary to sram and jump as will do

the romcode",

arch/arm/mach-at91/boot_test_cmd.c new file +2 -1

+       BAREBOX_CMD_HELP(cmd_at91_boot_test_help)
+BAREBOX_CMD_END
--

1.7.10.4

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

This will allow to have a generic code to create different bootstrap

As example
Barebox as TI Xloader
Barebox as AT91 Bootstrap

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
 include/bootstrap.h    |   34 ++++++++++++++
 lib/Kconfig            |    2 +
 lib/Makefile           |    1 +
 lib/bootstrap/Kconfig  |   13 ++++++
 lib/bootstrap/Makefile |    3 ++
 lib/bootstrap/common.c |   21 +++++++++
 lib/bootstrap/devfs.c  |  118
++++++++++++++++++++++++++++++++++++++++++++++++
 lib/bootstrap/disk.c   |   37 +++++++++++++++
 8 files changed, 229 insertions(+)
 create mode 100644 include/bootstrap.h
 create mode 100644 lib/bootstrap/Kconfig
 create mode 100644 lib/bootstrap/Makefile
 create mode 100644 lib/bootstrap/common.c
 create mode 100644 lib/bootstrap/devfs.c
 create mode 100644 lib/bootstrap/disk.c

include/bootstrap.h new file +2 -0

new file mode 100644
index 0000000..26e9dbc
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <

[email protected]>
+ *
+ * Under GPLv2
+ */

include/bootstrap.h new file +13 -0

+
+#ifndef __BOOSTRAP_H__
+#define __BOOSTRAP_H__
+
+#define bootstrap_err(fmt, arg...) printf(fmt, ##arg)
+
+void bootstrap_boot(int (*func)(void), bool barebox);
+
+#ifdef CONFIG_BOOTSTRAP_DEVFS
+void* bootstrap_read_devfs(char *devname, bool use_bb, int offset,
+                          int default_size, int max_size);
+#else
+static inline void* bootstrap_read_devfs(char *devname, bool use_bb, int

offset,

include/bootstrap.h new file +16 -0

+                          int default_size, int max_size)
+{
+       return NULL;
+}
+#endif
+
+#ifdef CONFIG_BOOTSTRAP_DISK
+void* bootstrap_read_disk(char *devname);
+#else
+static inline void* bootstrap_read_disk(char *devname)
+{
+       return NULL;
+}
+#endif
+
+#endif /* __BOOSTRAP_H__ */

lib/Kconfig +2 -0

index db8a6ad..4578353 100644
@@ -52,4 +52,6 @@ config LIBMTD
 
 source lib/gui/Kconfig
 
+source lib/bootstrap/Kconfig
+
 endmenu

lib/Makefile +1 -0

index 85f4ec9..43f6ea3 100644
@@ -1,3 +1,4 @@
+obj-$(CONFIG_BOOTSTRAP)        += bootstrap/
 obj-y                  += ctype.o
 obj-y                  += rbtree.o
 obj-y                  += display_options.o

lib/bootstrap/Kconfig new file +13 -0

new file mode 100644
index 0000000..558da00
@@ -0,0 +1,13 @@
+menuconfig BOOTSTRAP
+       bool "Library bootstrap routines           "
+       depends on SHELL_NONE
+
+if BOOTSTRAP
+
+config BOOTSTRAP_DEVFS
+       bool "devfs support"
+
+config BOOTSTRAP_DISK
+       bool "disk support"
+
+endif

lib/bootstrap/Makefile new file +3 -0

new file mode 100644
index 0000000..cbaa49f
@@ -0,0 +1,3 @@
+obj-y                          += common.o
+obj-$(CONFIG_BOOTSTRAP_DEVFS)  += devfs.o
+obj-$(CONFIG_BOOTSTRAP_DISK)   += disk.o

lib/bootstrap/common.c new file +3 -0

new file mode 100644
index 0000000..3652698
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Sascha Hauer, Pengutronix
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <

[email protected]>
+ *
+ * Under GPLv2
+ */

lib/bootstrap/common.c new file +15 -0

+
+#include <common.h>
+#include <bootstrap.h>
+#include <filetype.h>
+
+void bootstrap_boot(int (*func)(void), bool barebox)
+{
+       if (barebox && !is_barebox_head((void*)func))
+               return;
+
+       shutdown_barebox();
+       func();
+
+       while (1);
+}

lib/bootstrap/devfs.c new file +3 -0

new file mode 100644
index 0000000..25d07c7
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2011 Sascha Hauer, Pengutronix
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <

[email protected]>
+ *
+ * Under GPLv2
+ */

lib/bootstrap/devfs.c new file +25 -0

+
+#include <common.h>
+#include <partition.h>
+#include <nand.h>
+#include <driver.h>
+#include <linux/mtd/mtd.h>
+#include <fcntl.h>
+#include <filetype.h>
+#include <sizes.h>
+#include <errno.h>
+#include <malloc.h>
+#include <bootstrap.h>
+
+#if defined(CONFIG_ARM) || defined(CONFIG_MIPS)
+#if defined(CONFIG_ARM)
+#define BAREBOX_HEAD_SIZE              ARM_HEAD_SIZE
+#define BAREBOX_HEAD_SIZE_OFFSET       ARM_HEAD_SIZE_OFFSET
+#elif defined(CONFIG_MIPS)
+#define BAREBOX_HEAD_SIZE              MIPS_HEAD_SIZE
+#define BAREBOX_HEAD_SIZE_OFFSET       MIPS_HEAD_SIZE_OFFSET
+#endif
+
+static void *read_image_head(const char *name)
+{
+       void *header = xmalloc(BAREBOX_HEAD_SIZE);

lib/bootstrap/devfs.c new file +43 -0

+       cdev_close(cdev);
+
+       if (ret != BAREBOX_HEAD_SIZE) {
+               bootstrap_err("failed to read from partition\n");
+               return NULL;
+       }
+
+       return header;
+}
+
+static unsigned int get_image_size(void *head)
+{
+       unsigned int ret = 0;
+       unsigned int *psize = head + BAREBOX_HEAD_SIZE_OFFSET;
+
+       if (is_barebox_head(head))
+               ret = *psize;
+       debug("Detected barebox image size %u\n", ret);
+
+       return ret;
+}
+#else
+static void *read_image_head(const char *name)
+{
+       return NULL;
+}
+
+static unsigned int get_image_size(void *head)
+{
+       return 0;
+}
+#endif
+
+void* bootstrap_read_devfs(char *devname, bool use_bb, int offset,
+                          int default_size, int max_size)
+{
+       int ret;
+       int size = 0;
+       void *to, *header;
+       struct cdev *cdev;
+       char *partname = "x";
+
+       devfs_add_partition(devname, offset, max_size,

DEVFS_PARTITION_FIXED, partname);

lib/bootstrap/devfs.c new file +10 -0

+       if (use_bb) {
+               dev_add_bb_dev(partname, "bbx");
+               partname = "bbx";
+       }
+
+       header = read_image_head(partname);
+       if (header) {
+               size = get_image_size(header);
+               if (!size)
+                       bootstrap_err("%s: failed to get image size\n",

devname);

lib/bootstrap/devfs.c new file +5 -0

+       }
+
+       if (!size) {
+               size = default_size;
+               bootstrap_err("%s: failed to detect barebox and it's image

size so use %d\n",

lib/bootstrap/devfs.c new file +4 -0

+
+       cdev = cdev_open(partname, O_RDONLY);
+       if (!cdev) {
+               bootstrap_err("%s: failed to open %s\n", devname,

partname);

lib/bootstrap/devfs.c new file +6 -0

+               return NULL;
+       }
+
+       ret = cdev_read(cdev, to, size, 0, 0);
+       if (ret != size) {
+               bootstrap_err("%s: failed to read from %s\n", devname,

partname);

lib/bootstrap/devfs.c new file +5 -0

+               return NULL;
+       }
+
+       return to;
+}

lib/bootstrap/disk.c new file +3 -0

new file mode 100644
index 0000000..fad8990
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2011 Sascha Hauer, Pengutronix
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <

[email protected]>
+ *
+ * Under GPLv2
+ */

lib/bootstrap/disk.c new file +13 -0

+
+#include <common.h>
+#include <fs.h>
+#include <fcntl.h>
+#include <sizes.h>
+#include <errno.h>
+#include <malloc.h>
+#include <bootstrap.h>
+
+void* bootstrap_read_disk(char *dev)
+{
+       int ret;
+       void *buf;

lib/bootstrap/disk.c new file +8 -1

+       if (!buf) {
+               bootstrap_err("could not read barebox.bin from %s\n", dev);
+               umount(path);
+               return NULL;
+       }
+
+       return buf;
+}
--

1.7.10.4

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

hi,

found a little 'things'. Maybe it's matter.

lib/bootstrap/devfs.c line 41

Quoted 9 lines

lib/bootstrap/devfs.c new file +8 -0

+
+       cdev = cdev_open(name, O_RDONLY);
+       if (!cdev) {
+               bootstrap_err("failed to open partition\n");
+               return NULL;
+       }
+
+       ret = cdev_read(cdev, header, BAREBOX_HEAD_SIZE, 0, 0);

check on error here?

Quoted 14 lines

lib/bootstrap/devfs.c new file +13 -0

+       cdev_close(cdev);
+
+       if (ret != BAREBOX_HEAD_SIZE) {
+               bootstrap_err("failed to read from partition\n");
+               return NULL;
+       }
+
+       return header;
+}
+
+
+       if (!size) {
+               size = default_size;

lib/bootstrap/devfs.c line 103

Quoted 7 lines

+ bootstrap_err("%s: failed to detect barebox and it's image
size so use %d\n",

lib/bootstrap/devfs.c new file +4 -0

+                        devname, size);
+       }
+
+       to = xmalloc(size);

check on null here?

Quoted 4 lines

hi,

found a little 'things'. Maybe it's matter.

Quoted 11 lines

lib/bootstrap/devfs.c line 41

Quoted 9 lines

lib/bootstrap/devfs.c new file +8 -0

+
+       cdev = cdev_open(name, O_RDONLY);
+       if (!cdev) {
+               bootstrap_err("failed to open partition\n");
+               return NULL;
+       }
+
+       ret = cdev_read(cdev, header, BAREBOX_HEAD_SIZE, 0, 0);

check on error here?

This is done, see below.

Quoted 15 lines

Quoted 5 lines

lib/bootstrap/devfs.c new file +4 -0

+       cdev_close(cdev);
+
+       if (ret != BAREBOX_HEAD_SIZE) {
+               bootstrap_err("failed to read from partition\n");

lib/bootstrap/devfs.c

Quoted 10 lines

lib/bootstrap/devfs.c new file +10 -0

+               return NULL;
+       }
+
+       return header;
+}
+
+
+       if (!size) {
+               size = default_size;
+               bootstrap_err("%s: failed to detect barebox and it's

image

Quoted 7 lines

lib/bootstrap/devfs.c line 103

Quoted 6 lines

size so use %d\n",

lib/bootstrap/devfs.c new file +4 -0

+                        devname, size);
+       }
+
+       to = xmalloc(size);

check on null here?

The x versions always return memory or else they panic.

Sascha

--

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 |

Quoted 4 lines · Alexander Aring

hi,

found a little 'things'. Maybe it's matter.

Quoted 11 lines

lib/bootstrap/devfs.c line 41

Quoted 9 lines

lib/bootstrap/devfs.c new file +8 -0

+
+       cdev = cdev_open(name, O_RDONLY);
+       if (!cdev) {
+               bootstrap_err("failed to open partition\n");
+               return NULL;
+       }
+
+       ret = cdev_read(cdev, header, BAREBOX_HEAD_SIZE, 0, 0);

check on error here?

This is done, see below.

Quoted 14 lines

Quoted 14 lines

lib/bootstrap/devfs.c new file +13 -0

+       cdev_close(cdev);
+
+       if (ret != BAREBOX_HEAD_SIZE) {
+               bootstrap_err("failed to read from partition\n");
+               return NULL;
+       }
+
+       return header;
+}
+
+
+       if (!size) {
+               size = default_size;

Quoted 8 lines

lib/bootstrap/devfs.c line 103

Quoted 7 lines

+ bootstrap_err("%s: failed to detect barebox and it's image
size so use %d\n",

lib/bootstrap/devfs.c new file +4 -0

+                        devname, size);
+       }
+
+       to = xmalloc(size);

check on null here?

The x versions always return memory or else they panic.

Quoted 42 lines · Sascha Hauer

Quoted 4 lines · Alexander Aring

hi,

found a little 'things'. Maybe it's matter.

Quoted 11 lines

lib/bootstrap/devfs.c line 41

Quoted 9 lines

lib/bootstrap/devfs.c new file +8 -0

+
+       cdev = cdev_open(name, O_RDONLY);
+       if (!cdev) {
+               bootstrap_err("failed to open partition\n");
+               return NULL;
+       }
+
+       ret = cdev_read(cdev, header, BAREBOX_HEAD_SIZE, 0, 0);

check on error here?

This is done, see below.

Quoted 22 lines

Quoted 17 lines

lib/bootstrap/devfs.c new file +14 -0

+       cdev_close(cdev);
+
+       if (ret != BAREBOX_HEAD_SIZE) {
+               bootstrap_err("failed to read from partition\n");
+               return NULL;
+       }
+
+       return header;
+}
+
+
+       if (!size) {
+               size = default_size;
+               bootstrap_err("%s: failed to detect barebox and it's image

size so use %d\n",

lib/bootstrap/devfs.c line 103

Quoted 4 lines

lib/bootstrap/devfs.c new file +4 -0

+                        devname, size);
+       }
+
+       to = xmalloc(size);

check on null here?

Quoted 1 line

The x versions always return memory or else they panic.

can we have this version merged