diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-02-28 12:02:01 -0500 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2014-03-11 01:42:29 -0400 |
commit | 9e3afa5f5c7db81f5ff44d877dda6f5ffce0da19 (patch) | |
tree | 1edb6bc23a1c154721c5349b1da3b70a7dbf07c7 | |
parent | 108ebcd81907cd4818feb3bc1eabcc4a5373da32 (diff) |
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. Header bcm47xx_nvram.h
is not available on bcm53xx, so don't include it.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r-- | drivers/mtd/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/bcm47xxpart.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 5ebcda39f554..5d49a2129618 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
@@ -150,7 +150,7 @@ config MTD_BCM63XX_PARTS | |||
150 | 150 | ||
151 | config MTD_BCM47XX_PARTS | 151 | config MTD_BCM47XX_PARTS |
152 | tristate "BCM47XX partitioning support" | 152 | tristate "BCM47XX partitioning support" |
153 | depends on BCM47XX | 153 | depends on BCM47XX || ARCH_BCM_5301X |
154 | help | 154 | help |
155 | This provides partitions parser for devices based on BCM47xx | 155 | This provides partitions parser for devices based on BCM47xx |
156 | boards. | 156 | boards. |
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 23d712209b98..adfa74c1bc45 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/mtd/mtd.h> | 15 | #include <linux/mtd/mtd.h> |
16 | #include <linux/mtd/partitions.h> | 16 | #include <linux/mtd/partitions.h> |
17 | #include <bcm47xx_nvram.h> | ||
18 | 17 | ||
19 | /* 10 parts were found on sflash on Netgear WNDR4500 */ | 18 | /* 10 parts were found on sflash on Netgear WNDR4500 */ |
20 | #define BCM47XXPART_MAX_PARTS 12 | 19 | #define BCM47XXPART_MAX_PARTS 12 |
@@ -30,6 +29,7 @@ | |||
30 | #define BOARD_DATA_MAGIC2 0xBD0D0BBD | 29 | #define BOARD_DATA_MAGIC2 0xBD0D0BBD |
31 | #define CFE_MAGIC 0x43464531 /* 1EFC */ | 30 | #define CFE_MAGIC 0x43464531 /* 1EFC */ |
32 | #define FACTORY_MAGIC 0x59544346 /* FCTY */ | 31 | #define FACTORY_MAGIC 0x59544346 /* FCTY */ |
32 | #define NVRAM_HEADER 0x48534C46 /* FLSH */ | ||
33 | #define POT_MAGIC1 0x54544f50 /* POTT */ | 33 | #define POT_MAGIC1 0x54544f50 /* POTT */ |
34 | #define POT_MAGIC2 0x504f /* OP */ | 34 | #define POT_MAGIC2 0x504f /* OP */ |
35 | #define ML_MAGIC1 0x39685a42 | 35 | #define ML_MAGIC1 0x39685a42 |