Domovská stránka Prehľadávať Pomoc
Prihlásiť sa
oss
/
openadk
4
1
Fork 3
Súbory Issues 1 Pull requesty 0 Wiki
Strom: 4e6e1d3251
Branche Tagy
openadk
/
target
/
linux
/
patches
/
2.6.33
/
mtd-root.patch

mtd-root.patch 2.0 KB
História Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 
  1. diff -Nur linux-2.6.31.4.orig/drivers/mtd/Kconfig linux-2.6.31.4/drivers/mtd/Kconfig
    2. 

  2. --- linux-2.6.31.4.orig/drivers/mtd/Kconfig	2009-10-12 22:15:40.000000000 +0200
    3. 

  3. +++ linux-2.6.31.4/drivers/mtd/Kconfig	2009-10-21 11:45:10.557679089 +0200
    4. 

  4. @@ -53,6 +53,11 @@
    5. 

  5.  	  should normally be compiled as kernel modules. The modules perform
    6. 

  6.  	  various checks and verifications when loaded.
    7. 

  7.  
    8. 

  8. +config MTD_ROOTFS_ROOT_DEV
    9. 

  9. +	bool "Automatically set 'rootfs' partition to be root filesystem"
    10. 

  10. +	depends on MTD_PARTITIONS
    11. 

  11. +	default y
    12. 

  12. +
    13. 

  13.  config MTD_REDBOOT_PARTS
    14. 

  14.  	tristate "RedBoot partition table parsing"
    15. 

  15.  	depends on MTD_PARTITIONS
    16. 

  16. diff -Nur linux-2.6.31.4.orig/drivers/mtd/mtdpart.c linux-2.6.31.4/drivers/mtd/mtdpart.c
    17. 

  17. --- linux-2.6.31.4.orig/drivers/mtd/mtdpart.c	2009-10-12 22:15:40.000000000 +0200
    18. 

  18. +++ linux-2.6.31.4/drivers/mtd/mtdpart.c	2009-10-21 11:46:39.593679219 +0200
    19. 

  19. @@ -18,6 +18,7 @@
    20. 

  20.  #include <linux/mtd/mtd.h>
    21. 

  21.  #include <linux/mtd/partitions.h>
    22. 

  22.  #include <linux/mtd/compatmac.h>
    23. 

  23. +#include <linux/root_dev.h>
    24. 

  24.  
    25. 

  25.  /* Our partition linked list */
    26. 

  26.  static LIST_HEAD(mtd_partitions);
    27. 

  27. @@ -35,7 +36,7 @@
    28. 

  28.   * the pointer to that structure with this macro.
    29. 

  29.   */
    30. 

  30.  #define PART(x)  ((struct mtd_part *)(x))
    31. 

  31. -
    32. 

  32. +#define IS_PART(mtd) (mtd->read == part_read)
    33. 

  33.  
    34. 

  34.  /*
    35. 

  35.   * MTD methods which simply translate the effective address and pass through
    36. 

  36. @@ -517,14 +518,23 @@
    37. 

  37.  {
    38. 

  38.  	struct mtd_part *slave;
    39. 

  39.  	uint64_t cur_offset = 0;
    40. 

  40. -	int i;
    41. 

  41. +	int i, j;
    42. 

  42.  
    43. 

  43.  	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
    44. 

  44.  
    45. 

  45. -	for (i = 0; i < nbparts; i++) {
    46. 

  46. -		slave = add_one_partition(master, parts + i, i, cur_offset);
    47. 

  47. + 	for (i = 0, j = 0; i < nbparts; i++) {
    48. 

  48. + 		slave = add_one_partition(master, parts + i, j++, cur_offset);
    49. 

  49.  		if (!slave)
    50. 

  50.  			return -ENOMEM;
    51. 

  51. + 		if (!strcmp(parts[i].name, "rootfs")) {
    52. 

  52. +#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
    53. 

  53. +			if (ROOT_DEV == 0) {
    54. 

  54. +				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
    55. 

  55. +					"set to be root filesystem\n");
    56. 

  56. +				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
    57. 

  57. +			}
    58. 

  58. +#endif
    59. 

  59. +		}
    60. 

  60.  		cur_offset = slave->offset + slave->mtd.size;
    61. 

  61.  	}
    62. 

  62.  
    63.