Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 2f76d8f3a7
Branches Tags
openwrt-archive
/
target
/
linux
/
brcm63xx
/
patches-4.4
/
400-bcm963xx_flashmap.patch

400-bcm963xx_flashmap.patch 1.9 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 
  1. From a4d005c91d403d9f3d0272db6cc46202c06ec774 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Axel Gembe <ago@bastart.eu.org>
    3. 

  3. Date: Mon, 12 May 2008 18:54:09 +0200
    4. 

  4. Subject: [PATCH] bcm963xx: flashmap support
    5. 

  5. 

  6. Signed-off-by: Axel Gembe <ago@bastart.eu.org>
    7. 

  7. ---
    8. 

  8.  arch/mips/bcm63xx/boards/board_bcm963xx.c |   19 +----------------
    9. 

  9.  drivers/mtd/maps/bcm963xx-flash.c         |   32 ++++++++++++++++++++++++----
    10. 

  10.  drivers/mtd/redboot.c                     |   13 +++++++++--
    11. 

  11.  3 files changed, 38 insertions(+), 26 deletions(-)
    12. 

  12. 

  13. --- a/arch/mips/bcm63xx/dev-flash.c
    14. 

  14. +++ b/arch/mips/bcm63xx/dev-flash.c
    15. 

  15. @@ -35,7 +35,7 @@ static struct mtd_partition mtd_partitio
    16. 

  16.  	}
    17. 

  17.  };
    18. 

  18.  
    19. 

  19. -static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };
    20. 

  20. +static const char *bcm63xx_part_types[] = { "bcm63xxpart", "RedBoot", NULL };
    21. 

  21.  
    22. 

  22.  static struct physmap_flash_data flash_data = {
    23. 

  23.  	.width			= 2,
    24. 

  24. --- a/drivers/mtd/redboot.c
    25. 

  25. +++ b/drivers/mtd/redboot.c
    26. 

  26. @@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru
    27. 

  27.  	int nulllen = 0;
    28. 

  28.  	int numslots;
    29. 

  29.  	unsigned long offset;
    30. 

  30. +	unsigned long fis_origin = 0;
    31. 

  31.  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
    32. 

  32.  	static char nullstring[] = "unallocated";
    33. 

  33.  #endif
    34. 

  34. @@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru
    35. 

  35.  		goto out;
    36. 

  36.  	}
    37. 

  37.  
    38. 

  38. +	if (data && data->origin) {
    39. 

  39. +		fis_origin = data->origin;
    40. 

  40. +	} else {
    41. 

  41. +		for (i = 0; i < numslots; i++) {
    42. 

  42. +			if (!strncmp(buf[i].name, "RedBoot", 8)) {
    43. 

  43. +				fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
    44. 

  44. +			}
    45. 

  45. +		}
    46. 

  46. +	}
    47. 

  47. +
    48. 

  48.  	for (i = 0; i < numslots; i++) {
    49. 

  49.  		struct fis_list *new_fl, **prev;
    50. 

  50.  
    51. 

  51. @@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru
    52. 

  52.  			goto out;
    53. 

  53.  		}
    54. 

  54.  		new_fl->img = &buf[i];
    55. 

  55. -		if (data && data->origin)
    56. 

  56. -			buf[i].flash_base -= data->origin;
    57. 

  57. -		else
    58. 

  58. -			buf[i].flash_base &= master->size-1;
    59. 

  59. +		if (fis_origin)
    60. 

  60. +			buf[i].flash_base -= fis_origin;
    61. 

  61. +
    62. 

  62. +		buf[i].flash_base &= (master->size << 1) - 1;
    63. 

  63.  
    64. 

  64.  		/* I'm sure the JFFS2 code has done me permanent damage.
    65. 

  65.  		 * I now think the following is _normal_
    66.