mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-02-25 05:17:56 +02:00
don't try to create mtd partitions on bcm947xx when the trx header is not found - should fix #318
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4634 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
8c98ba0074
commit
45b733b754
@ -334,7 +334,7 @@ diff -urN linux.old/drivers/mtd/devices/sflash.c linux.dev/drivers/mtd/devices/s
|
|||||||
diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps/bcm947xx-flash.c
|
diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps/bcm947xx-flash.c
|
||||||
--- linux.old/drivers/mtd/maps/bcm947xx-flash.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/drivers/mtd/maps/bcm947xx-flash.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/drivers/mtd/maps/bcm947xx-flash.c 2006-06-23 18:08:46.000000000 +0200
|
+++ linux.dev/drivers/mtd/maps/bcm947xx-flash.c 2006-06-23 18:08:46.000000000 +0200
|
||||||
@@ -0,0 +1,547 @@
|
@@ -0,0 +1,548 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
|
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
|
||||||
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
||||||
@ -720,7 +720,8 @@ diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps
|
|||||||
+{
|
+{
|
||||||
+ int cfe_size;
|
+ int cfe_size;
|
||||||
+
|
+
|
||||||
+ cfe_size = find_cfe_size(mtd,size);
|
+ if ((cfe_size = find_cfe_size(mtd,size)) < 0)
|
||||||
|
+ return NULL;
|
||||||
+
|
+
|
||||||
+ /* boot loader */
|
+ /* boot loader */
|
||||||
+ bcm947xx_parts[0].offset = 0;
|
+ bcm947xx_parts[0].offset = 0;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -urN linux.old/drivers/mtd/maps/bcm47xx-flash.c linux.dev/drivers/mtd/maps/bcm47xx-flash.c
|
diff -urN linux.old/drivers/mtd/maps/bcm47xx-flash.c linux.dev/drivers/mtd/maps/bcm47xx-flash.c
|
||||||
--- linux.old/drivers/mtd/maps/bcm47xx-flash.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/drivers/mtd/maps/bcm47xx-flash.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/drivers/mtd/maps/bcm47xx-flash.c 2006-06-23 19:54:06.000000000 +0200
|
+++ linux.dev/drivers/mtd/maps/bcm47xx-flash.c 2006-06-23 19:54:06.000000000 +0200
|
||||||
@@ -0,0 +1,451 @@
|
@@ -0,0 +1,452 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
|
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
|
||||||
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
||||||
@ -326,7 +326,8 @@ diff -urN linux.old/drivers/mtd/maps/bcm47xx-flash.c linux.dev/drivers/mtd/maps/
|
|||||||
+{
|
+{
|
||||||
+ int cfe_size;
|
+ int cfe_size;
|
||||||
+
|
+
|
||||||
+ cfe_size = find_cfe_size(mtd,size);
|
+ if ((cfe_size = find_cfe_size(mtd,size)) < 0)
|
||||||
|
+ return NULL;
|
||||||
+
|
+
|
||||||
+ /* boot loader */
|
+ /* boot loader */
|
||||||
+ bcm947xx_parts[0].offset = 0;
|
+ bcm947xx_parts[0].offset = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user