diff options
| author | Teresa Remmet <t.remmet@phytec.de> | 2016-06-29 12:01:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-30 08:37:24 +0200 |
| commit | 7bfb94f978e01321444c0c9f9a17b1e901f920e4 (patch) | |
| tree | bc2e62cc798a004f59d18ded9cf1667b2491411f /arch/arm/mach-omap | |
| parent | 3280bc633135ca899979ab747563b0fa20fde067 (diff) | |
| download | barebox-7bfb94f978e01321444c0c9f9a17b1e901f920e4.tar.gz barebox-7bfb94f978e01321444c0c9f9a17b1e901f920e4.tar.xz | |
OMAP: xload: nand: Check for redundant barebox partition
Add a support for a redundant barebox backup partition if loading
barebox image from first barebox partitions fails.
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-omap')
| -rw-r--r-- | arch/arm/mach-omap/include/mach/generic.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap/xload.c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/mach-omap/include/mach/generic.h b/arch/arm/mach-omap/include/mach/generic.h index a2a48cc6af..fe194b3921 100644 --- a/arch/arm/mach-omap/include/mach/generic.h +++ b/arch/arm/mach-omap/include/mach/generic.h @@ -55,6 +55,8 @@ extern unsigned int __omap_cpu_type; struct omap_barebox_part { unsigned int nand_offset; unsigned int nand_size; + unsigned int nand_bkup_offset; + unsigned int nand_bkup_size; unsigned int nor_offset; unsigned int nor_size; }; diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c index 91890b250d..14a631ebfc 100644 --- a/arch/arm/mach-omap/xload.c +++ b/arch/arm/mach-omap/xload.c @@ -24,6 +24,8 @@ struct omap_barebox_part *barebox_part; static struct omap_barebox_part default_part = { .nand_offset = SZ_128K, .nand_size = SZ_1M, + .nand_bkup_offset = 0, + .nand_bkup_size = 0, .nor_offset = SZ_128K, .nor_size = SZ_1M, }; @@ -99,11 +101,24 @@ static void *read_mtd_barebox(const char *partition) static void *omap_xload_boot_nand(struct omap_barebox_part *part) { + void *to; + devfs_add_partition("nand0", part->nand_offset, part->nand_size, DEVFS_PARTITION_FIXED, "x"); dev_add_bb_dev("x", "bbx"); - return read_mtd_barebox("bbx"); + to = read_mtd_barebox("bbx"); + if (to == NULL && part->nand_bkup_size != 0) { + printf("trying to load image from backup partition.\n"); + devfs_add_partition("nand0", part->nand_bkup_offset, + part->nand_bkup_size, + DEVFS_PARTITION_FIXED, "x_bkup"); + dev_add_bb_dev("x_bkup", "bbx_bkup"); + + to = read_mtd_barebox("bbx_bkup"); + } + + return to; } static void *omap_xload_boot_mmc(void) |