mirror of https://github.com/hak5/openwrt.git
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
|
From e734ace5baa04e0e8af1d4483475fbd6bd2b32a1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Axel Gembe <ago@bastart.eu.org>
|
||
|
|
Date: Mon, 12 May 2008 18:54:09 +0200
|
||
|
|
Subject: [PATCH] bcm963xx: flashmap support
|
||
|
|
|
||
|
|
|
||
|
|
Signed-off-by: Axel Gembe <ago@bastart.eu.org>
|
||
|
|
---
|
||
|
|
drivers/mtd/maps/Kconfig | 7 +++++++
|
||
|
|
drivers/mtd/maps/Makefile | 1 +
|
||
|
|
drivers/mtd/redboot.c | 13 ++++++++++---
|
||
|
|
3 files changed, 18 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/maps/Kconfig
|
||
|
|
+++ b/drivers/mtd/maps/Kconfig
|
||
|
|
@@ -257,6 +257,13 @@ config MTD_ALCHEMY
|
||
|
|
help
|
||
|
|
Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
|
||
|
|
|
||
|
|
+config MTD_BCM963XX
|
||
|
|
+ tristate "BCM963xx Flash device"
|
||
|
|
+ depends on MIPS && BCM63XX
|
||
|
|
+ help
|
||
|
|
+ Flash memory access on BCM963xx boards. Currently only works with
|
||
|
|
+ RedBoot and CFE.
|
||
|
|
+
|
||
|
|
config MTD_DILNETPC
|
||
|
|
tristate "CFI Flash device mapped on DIL/Net PC"
|
||
|
|
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
|
||
|
|
--- a/drivers/mtd/redboot.c
|
||
|
|
+++ b/drivers/mtd/redboot.c
|
||
|
|
@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int parse_redboot_partitions(struct mtd_info *master,
|
||
|
|
+int parse_redboot_partitions(struct mtd_info *master,
|
||
|
|
struct mtd_partition **pparts,
|
||
|
|
unsigned long fis_origin)
|
||
|
|
{
|
||
|
|
@@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (!fis_origin) {
|
||
|
|
+ for (i = 0; i < numslots; i++) {
|
||
|
|
+ if (!strncmp(buf[i].name, "RedBoot", 8)) {
|
||
|
|
+ fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
for (i = 0; i < numslots; i++) {
|
||
|
|
struct fis_list *new_fl, **prev;
|
||
|
|
|
||
|
|
@@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru
|
||
|
|
new_fl->img = &buf[i];
|
||
|
|
if (fis_origin) {
|
||
|
|
buf[i].flash_base -= fis_origin;
|
||
|
|
- } else {
|
||
|
|
- buf[i].flash_base &= master->size-1;
|
||
|
|
}
|
||
|
|
+ buf[i].flash_base &= (master->size << 1) - 1;
|
||
|
|
|
||
|
|
/* I'm sure the JFFS2 code has done me permanent damage.
|
||
|
|
* I now think the following is _normal_
|
||
|
|
--- a/drivers/mtd/maps/Makefile
|
||
|
|
+++ b/drivers/mtd/maps/Makefile
|
||
|
|
@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
|
||
|
|
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
|
||
|
|
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
|
||
|
|
obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o
|
||
|
|
+obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
|