Skip to contentSkip to conversation

mtd: bcm47xxpart: allow enabling on ARCH_BCM_5301X

PATCH Superseded Rafał Miłecki 2 participants 4 messages Feb 26, 2014 – Mar 7, 2014 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: bcm47xxpart: allow enabling on ARCH_BCM_5301X

Home routers based on SoCs like BCM53010 (AKA BCM4708) use flashes which can be nicely partitioned with bcm47xxpart.

---
 drivers/mtd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/Kconfig +1 -1
index 5ebcda3..5d49a21 100644
@@ -150,7 +150,7 @@ config MTD_BCM63XX_PARTS
 
 config MTD_BCM47XX_PARTS
 	tristate "BCM47XX partitioning support"
-	depends on BCM47XX
+	depends on BCM47XX || ARCH_BCM_5301X
 	help
 	  This provides partitions parser for devices based on BCM47xx
 	  boards.
Signature · 1 line
1.8.4.5
#1 lore raw

2014-02-26 14:55 GMT+01:00 Rafał Miłecki <[email protected]>:

Quoted 2 lines

Home routers based on SoCs like BCM53010 (AKA BCM4708) use flashes which can be nicely partitioned with bcm47xxpart.

This one is wrong (I forgot I have more local changes), drop it please.

#2 lore raw

PATCH v2 1/1 mtd: bcm47xxpart: allow enabling on ARCH_BCM_5301X

In reply to Rafał Miłecki

Home routers based on SoCs like BCM53010 (AKA BCM4708) use flashes which can be nicely partitioned with bcm47xxpart. Header bcm47xx_nvram.h is not available on bcm53xx, so don't include it.

---
 drivers/mtd/Kconfig       | 2 +-
 drivers/mtd/bcm47xxpart.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/Kconfig +1 -1
index 5ebcda3..5d49a21 100644
@@ -150,7 +150,7 @@ config MTD_BCM63XX_PARTS
 
 config MTD_BCM47XX_PARTS
 	tristate "BCM47XX partitioning support"
-	depends on BCM47XX
+	depends on BCM47XX || ARCH_BCM_5301X
 	help
 	  This provides partitions parser for devices based on BCM47xx
 	  boards.
drivers/mtd/bcm47xxpart.c +1 -1
index 23d7122..adfa74c 100644
@@ -14,7 +14,6 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <bcm47xx_nvram.h>
 
 /* 10 parts were found on sflash on Netgear WNDR4500 */
 #define BCM47XXPART_MAX_PARTS		12
@@ -30,6 +29,7 @@
 #define BOARD_DATA_MAGIC2		0xBD0D0BBD
 #define CFE_MAGIC			0x43464531	/* 1EFC */
 #define FACTORY_MAGIC			0x59544346	/* FCTY */
+#define NVRAM_HEADER			0x48534C46	/* FLSH */
 #define POT_MAGIC1			0x54544f50	/* POTT */
 #define POT_MAGIC2			0x504f		/* OP */
 #define ML_MAGIC1			0x39685a42
Signature · 1 line
1.8.4.5
Applied
#3 lore raw
Quoted 5 lines · Rafał Miłecki

Home routers based on SoCs like BCM53010 (AKA BCM4708) use flashes which can be nicely partitioned with bcm47xxpart. Header bcm47xx_nvram.h is not available on bcm53xx, so don't include it.

Pushed to l2-mtd.git. Thanks!

Brian