| Message ID | 1393606921-9488-1-git-send-email-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Commit | 9e3afa5f5c7db81f5ff44d877dda6f5ffce0da19 |
| Headers | show |
On Fri, Feb 28, 2014 at 06:02:01PM +0100, Rafał Miłecki wrote: > 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. > > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Pushed to l2-mtd.git. Thanks! Brian
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 5ebcda3..5d49a21 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -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. diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 23d7122..adfa74c 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -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
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. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- drivers/mtd/Kconfig | 2 +- drivers/mtd/bcm47xxpart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)