mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
MIPS: bcm963xx: Move extended flash address to bcm_tag header file
The extended flash address needs to be subtracted from bcm_tag flash image offsets. Move this value to the bcm_tag header file. Renamed define name to consistently use bcm963xx for flash layout which should be considered a property of the board and not the SoC (i.e. bcm63xx could theoretically be used on a board without CFE or any flash). Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Jonas Gorski <jogo@openwrt.org> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Cc: MIPS Mailing List <linux-mips@linux-mips.org> Cc: MTD Maling List <linux-mtd@lists.infradead.org> Patchwork: https://patchwork.linux-mips.org/patch/11833/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
8fce60b8d0
commit
1f29cb19cb
2 changed files with 7 additions and 4 deletions
|
@ -37,8 +37,6 @@
|
||||||
#include <asm/mach-bcm63xx/bcm63xx_nvram.h>
|
#include <asm/mach-bcm63xx/bcm63xx_nvram.h>
|
||||||
#include <asm/mach-bcm63xx/board_bcm963xx.h>
|
#include <asm/mach-bcm63xx/board_bcm963xx.h>
|
||||||
|
|
||||||
#define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
|
|
||||||
|
|
||||||
#define BCM63XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */
|
#define BCM63XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */
|
||||||
|
|
||||||
#define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
|
#define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
|
||||||
|
@ -123,8 +121,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
|
||||||
pr_info("CFE boot tag found with version %s and board type %s\n",
|
pr_info("CFE boot tag found with version %s and board type %s\n",
|
||||||
tagversion, boardid);
|
tagversion, boardid);
|
||||||
|
|
||||||
kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
|
kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE;
|
||||||
rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
|
rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE;
|
||||||
spareaddr = roundup(totallen, master->erasesize) + cfelen;
|
spareaddr = roundup(totallen, master->erasesize) + cfelen;
|
||||||
|
|
||||||
if (rootfsaddr < kerneladdr) {
|
if (rootfsaddr < kerneladdr) {
|
||||||
|
|
|
@ -28,6 +28,11 @@
|
||||||
"DWV-S0", \
|
"DWV-S0", \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Extended flash address, needs to be subtracted
|
||||||
|
* from bcm_tag flash image offsets.
|
||||||
|
*/
|
||||||
|
#define BCM963XX_EXTENDED_SIZE 0xBFC00000
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The broadcom firmware assumes the rootfs starts the image,
|
* The broadcom firmware assumes the rootfs starts the image,
|
||||||
* therefore uses the rootfs start (flash_image_address)
|
* therefore uses the rootfs start (flash_image_address)
|
||||||
|
|
Loading…
Reference in a new issue