ramips: fix RBM11G partitioning
This patch improvesfaf64056ddby correcting the partition scheme for the "RouterBoot" section of the flash. The partition scheme initially submitted is incorrect and does not reflect the actual flash structure. The "RouterBoot" section (name matching OEM) is subdivided in several static segments, as they are on ar71xx RB devices albeit with different offsets and sizes. The naming convention from ar71xx has been preserved, except for the bootloaders which are named "bootloader1" and "bootloader2" to avoid confusion with the master "RouterBoot" partition. The preferred 'fixed-partitions' DTS node syntax is used, with nesting support as introduced in2a598bbaa3. "partition" is used for node names, with associated "label" to match policy set by6dd94c2781. Leave a note in DTS to explain how the original author selected the SPI speed. Tested-by: Tobias Schramm <tobleminer@gmail.com> Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> Reviewed-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
		 Thibaut VARÈNE
					Thibaut VARÈNE
				
			
				
					committed by
					
						 Rafał Miłecki
						Rafał Miłecki
					
				
			
			
				
	
			
			
			 Rafał Miłecki
						Rafał Miłecki
					
				
			
						parent
						
							b90cad2c2e
						
					
				
				
					commit
					bbe2cf657c
				
			| @@ -86,6 +86,7 @@ | ||||
| 	w25q128@0 { | ||||
| 		compatible = "jedec,spi-nor"; | ||||
| 		reg = <0>; | ||||
| 		// XXX empiric value to obtain actual 10MHz SCK at the chip | ||||
| 		spi-max-frequency = <3125000>; | ||||
|  | ||||
| 		partitions { | ||||
| @@ -94,15 +95,41 @@ | ||||
| 			#size-cells = <1>; | ||||
|  | ||||
| 			partition@0 { | ||||
| 				label = "routerboot"; | ||||
| 				reg = <0x000000 0x00F000>; | ||||
| 				label = "RouterBoot"; | ||||
| 				reg = <0x0 0x40000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
| 				compatible = "fixed-partitions"; | ||||
| 				#address-cells = <1>; | ||||
| 				#size-cells = <1>; | ||||
|  | ||||
| 			factory: partition@f000 { | ||||
| 				label = "factory"; | ||||
| 				reg = <0x00F000 0x031000>; | ||||
| 				read-only; | ||||
| 				partition@0 { | ||||
| 					label = "bootloader1"; | ||||
| 					reg = <0x0 0xf000>; | ||||
| 					read-only; | ||||
| 				}; | ||||
|  | ||||
| 				hard_config: partition@f000 { | ||||
| 					label = "hard_config"; | ||||
| 					reg = <0xf000 0x1000>; | ||||
| 					read-only; | ||||
| 				}; | ||||
|  | ||||
| 				partition@10000 { | ||||
| 					label = "bootloader2"; | ||||
| 					reg = <0x10000 0xf000>; | ||||
| 					read-only; | ||||
| 				}; | ||||
|  | ||||
| 				partition@20000 { | ||||
| 					label = "soft_config"; | ||||
| 					reg = <0x20000 0x1000>; | ||||
| 				}; | ||||
|  | ||||
| 				partition@30000 { | ||||
| 					label = "bios"; | ||||
| 					reg = <0x30000 0x1000>; | ||||
| 					read-only; | ||||
| 				}; | ||||
| 			}; | ||||
|  | ||||
| 			partition@40000 { | ||||
| @@ -114,7 +141,7 @@ | ||||
| }; | ||||
|  | ||||
| ðernet { | ||||
| 	mtd-mac-address = <&factory 0x0010>; | ||||
| 	mtd-mac-address = <&hard_config 0x0010>; | ||||
| 	mtd-mac-address-increment = <1>; | ||||
| }; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user