diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-05 02:09:43 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:50 -0400 |
| commit | 50169ca7bab4276c2bf6f945cb452eb7fc52745d (patch) | |
| tree | f6ebbeb4495ddc4170acd6ab0c242eeed61a94ad | |
| parent | 3fdebe7c651cfffc4beaac3cb3244a3b9debf9b1 (diff) | |
mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only
[ Upstream commit 2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5 ]
We allowed using bcm47xxpart on BCM5301X arch with commit:
9e3afa5f5c7 ("mtd: bcm47xxpart: allow enabling on ARCH_BCM_5301X")
BCM5301X devices may contain some partitions in higher memory, e.g.
Netgear R8000 has board_data at 0x2600000. To detect them we should
use size limit on MIPS only.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/mtd/bcm47xxpart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 5abab8800891..546170a77466 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -118,8 +118,8 @@ static int bcm47xxpart_parse(struct mtd_info *master, /* Parse block by block looking for magics */ for (offset = 0; offset <= master->size - blocksize; offset += blocksize) { - /* Nothing more in higher memory */ - if (offset >= 0x2000000) + /* Nothing more in higher memory on BCM47XX (MIPS) */ + if (config_enabled(CONFIG_BCM47XX) && offset >= 0x2000000) break; if (curr_part >= BCM47XXPART_MAX_PARTS) { |