From: Jan Weitzel <j.weitzel@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCH v2] xload: get barebox size from barebox_arm_head
Date: Tue, 28 Aug 2012 14:36:21 +0200 [thread overview]
Message-ID: <1346157381-16420-1-git-send-email-j.weitzel@phytec.de> (raw)
In-Reply-To: <20120828090828.GE26594@pengutronix.de>
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@phytec.de>
---
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 <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);
+
+ 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
next prev parent reply other threads:[~2012-08-28 12:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 10:56 [RFC] " Jan Weitzel
2012-08-28 6:54 ` Sascha Hauer
2012-08-28 8:41 ` Jan Weitzel
2012-08-28 9:08 ` Sascha Hauer
2012-08-28 12:36 ` Jan Weitzel [this message]
2012-08-29 6:59 ` [PATCH v2] " Sascha Hauer
2012-08-29 8:01 ` Jan Weitzel
2012-08-29 9:10 ` [PATCH v3] " Jan Weitzel
2012-08-29 12:21 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 7:34 ` Jan Weitzel
2012-09-04 9:28 ` Sascha Hauer
2012-09-04 12:27 ` Jan Weitzel
2012-09-04 14:41 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-05 8:22 ` [PATCH v4] " Jan Weitzel
2012-09-05 10:34 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-05 11:37 ` Suspected ##SPAM## -:Re: " Jan Weitzel
2012-09-05 12:02 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346157381-16420-1-git-send-email-j.weitzel@phytec.de \
--to=j.weitzel@phytec.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox