diff options
| -rw-r--r-- | drivers/mtd/bcm63xxpart.c | 6 | ||||
| -rw-r--r-- | include/linux/bcm963xx_tag.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c index 8b86ed69522e..0aa66c378c9f 100644 --- a/drivers/mtd/bcm63xxpart.c +++ b/drivers/mtd/bcm63xxpart.c | |||
| @@ -37,8 +37,6 @@ | |||
| 37 | #include <asm/mach-bcm63xx/bcm63xx_nvram.h> | 37 | #include <asm/mach-bcm63xx/bcm63xx_nvram.h> |
| 38 | #include <asm/mach-bcm63xx/board_bcm963xx.h> | 38 | #include <asm/mach-bcm63xx/board_bcm963xx.h> |
| 39 | 39 | ||
| 40 | #define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */ | ||
| 41 | |||
| 42 | #define BCM63XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ | 40 | #define BCM63XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ |
| 43 | 41 | ||
| 44 | #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0 | 42 | #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0 |
| @@ -123,8 +121,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, | |||
| 123 | pr_info("CFE boot tag found with version %s and board type %s\n", | 121 | pr_info("CFE boot tag found with version %s and board type %s\n", |
| 124 | tagversion, boardid); | 122 | tagversion, boardid); |
| 125 | 123 | ||
| 126 | kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; | 124 | kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE; |
| 127 | rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE; | 125 | rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE; |
| 128 | spareaddr = roundup(totallen, master->erasesize) + cfelen; | 126 | spareaddr = roundup(totallen, master->erasesize) + cfelen; |
| 129 | 127 | ||
| 130 | if (rootfsaddr < kerneladdr) { | 128 | if (rootfsaddr < kerneladdr) { |
diff --git a/include/linux/bcm963xx_tag.h b/include/linux/bcm963xx_tag.h index f389dace6d95..08e0133820ed 100644 --- a/include/linux/bcm963xx_tag.h +++ b/include/linux/bcm963xx_tag.h | |||
| @@ -28,6 +28,11 @@ | |||
| 28 | "DWV-S0", \ | 28 | "DWV-S0", \ |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | /* Extended flash address, needs to be subtracted | ||
| 32 | * from bcm_tag flash image offsets. | ||
| 33 | */ | ||
| 34 | #define BCM963XX_EXTENDED_SIZE 0xBFC00000 | ||
| 35 | |||
| 31 | /* | 36 | /* |
| 32 | * The broadcom firmware assumes the rootfs starts the image, | 37 | * The broadcom firmware assumes the rootfs starts the image, |
| 33 | * therefore uses the rootfs start (flash_image_address) | 38 | * therefore uses the rootfs start (flash_image_address) |
