mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 03:13:20 +02:00
[ar71xx] use MyLoader partition parser on the WP543 board
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13265 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
e6e8c65ab1
commit
0cdd52ad75
@ -31,39 +31,12 @@
|
||||
|
||||
#define WP543_BUTTONS_POLL_INTERVAL 20
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
static struct mtd_partition wp543_partitions[] = {
|
||||
{
|
||||
.name = "myloader",
|
||||
.offset = 0,
|
||||
.size = 0x20000,
|
||||
.mask_flags = MTD_WRITEABLE,
|
||||
} , {
|
||||
.name = "kernel",
|
||||
.offset = 0x30000,
|
||||
.size = 0xd0000,
|
||||
} , {
|
||||
.name = "rootfs",
|
||||
.offset = 0x100000,
|
||||
.size = 0x100000,
|
||||
}
|
||||
};
|
||||
#endif /* CONFIG_MTD_PARTITIONS */
|
||||
|
||||
static struct flash_platform_data wp543_flash_data = {
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
.parts = wp543_partitions,
|
||||
.nr_parts = ARRAY_SIZE(wp543_partitions),
|
||||
#endif
|
||||
};
|
||||
|
||||
static struct spi_board_info wp543_spi_info[] = {
|
||||
{
|
||||
.bus_num = 0,
|
||||
.chip_select = 0,
|
||||
.max_speed_hz = 25000000,
|
||||
.modalias = "m25p80",
|
||||
.platform_data = &wp543_flash_data,
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -35,10 +35,8 @@ endef
|
||||
|
||||
define Image/Build/MyLoader
|
||||
-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \
|
||||
-p0x30000:0xd0000:ahl:0x80060000 \
|
||||
-p0x100000:0 \
|
||||
-b0x30000:0xd0000:h:$(KDIR)/vmlinux.lzma \
|
||||
-b0x100000:0::$(KDIR)/root.$(1) \
|
||||
-p0x30000:0xc0000:ahl:0x80060000:kernel:$(KDIR)/vmlinux.lzma \
|
||||
-p0xf0000:0:::rootfs:$(KDIR)/root.$(1) \
|
||||
$(call imgname,$(1),$(2)).img
|
||||
endef
|
||||
|
||||
|
@ -0,0 +1,22 @@
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -645,12 +645,17 @@ static int __devinit m25p_probe(struct s
|
||||
struct mtd_partition *parts = NULL;
|
||||
int nr_parts = 0;
|
||||
|
||||
+ static const char *part_probes[] = {
|
||||
#ifdef CONFIG_MTD_CMDLINE_PARTS
|
||||
- static const char *part_probes[] = { "cmdlinepart", NULL, };
|
||||
+ "cmdlinepart",
|
||||
+#endif
|
||||
+#ifdef CONFIG_MTD_MYLOADER_PARTS
|
||||
+ "MyLoader",
|
||||
+#endif
|
||||
+ NULL, };
|
||||
|
||||
nr_parts = parse_mtd_partitions(&flash->mtd,
|
||||
part_probes, &parts, 0);
|
||||
-#endif
|
||||
|
||||
if (nr_parts <= 0 && data && data->parts) {
|
||||
parts = data->parts;
|
Loading…
Reference in New Issue
Block a user