mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			60 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			60 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| The WRT1900AC among other Linksys routers uses a dual-firmware layout.
 | |
| Dynamically rename the active partition to "ubi".
 | |
| 
 | |
| Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 | |
| 
 | |
| --- a/drivers/mtd/ofpart.c
 | |
| +++ b/drivers/mtd/ofpart.c
 | |
| @@ -25,6 +25,8 @@
 | |
|  	return of_get_property(pp, "compatible", NULL);
 | |
|  }
 | |
|  
 | |
| +static int mangled_rootblock;
 | |
| +
 | |
|  static int parse_fixed_partitions(struct mtd_info *master,
 | |
|  				  const struct mtd_partition **pparts,
 | |
|  				  struct mtd_part_parser_data *data)
 | |
| @@ -33,6 +35,7 @@
 | |
|  	struct device_node *mtd_node;
 | |
|  	struct device_node *ofpart_node;
 | |
|  	const char *partname;
 | |
| +	const char *owrtpart = "ubi";
 | |
|  	struct device_node *pp;
 | |
|  	int nr_parts, i, ret = 0;
 | |
|  	bool dedicated = true;
 | |
| @@ -110,9 +113,13 @@
 | |
|  		parts[i].size = of_read_number(reg + a_cells, s_cells);
 | |
|  		parts[i].of_node = pp;
 | |
|  
 | |
| -		partname = of_get_property(pp, "label", &len);
 | |
| -		if (!partname)
 | |
| -			partname = of_get_property(pp, "name", &len);
 | |
| +		if (mangled_rootblock && (i == mangled_rootblock)) {
 | |
| +			partname = owrtpart;
 | |
| +		} else {
 | |
| +			partname = of_get_property(pp, "label", &len);
 | |
| +			if (!partname)
 | |
| +				partname = of_get_property(pp, "name", &len);
 | |
| +		}
 | |
|  		parts[i].name = partname;
 | |
|  
 | |
|  		if (of_get_property(pp, "read-only", &len))
 | |
| @@ -219,6 +226,18 @@
 | |
|  	return 0;
 | |
|  }
 | |
|  
 | |
| +static int __init active_root(char *str)
 | |
| +{
 | |
| +	get_option(&str, &mangled_rootblock);
 | |
| +
 | |
| +	if (!mangled_rootblock)
 | |
| +		return 1;
 | |
| +
 | |
| +	return 1;
 | |
| +}
 | |
| +
 | |
| +__setup("mangled_rootblock=", active_root);
 | |
| +
 | |
|  static void __exit ofpart_parser_exit(void)
 | |
|  {
 | |
|  	deregister_mtd_parser(&ofpart_parser);
 |