The root= parameter overrides the automatic rootfs detection by partition
name, so drop it. Fixes boot from flash after renumeration changes of
partitions due to parser changes.
Fixes FS#1350.
Fixes: a27d59bb42 ("brcm63xx: switch to new partition layout specification")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
		
	
			
		
			
				
	
	
		
			110 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			110 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
/dts-v1/;
 | 
						|
 | 
						|
#include "bcm6368.dtsi"
 | 
						|
 | 
						|
#include <dt-bindings/input/input.h>
 | 
						|
 | 
						|
/ {
 | 
						|
	model = "Actiontec R1000H";
 | 
						|
	compatible = "actiontec,r1000h", "brcm,bcm6368";
 | 
						|
 | 
						|
	chosen {
 | 
						|
		bootargs = "rootfstype=squashfs noinitrd console=ttyS0,115200";
 | 
						|
		stdout-path = "serial0:115200n8";
 | 
						|
	};
 | 
						|
 | 
						|
	gpio-keys-polled {
 | 
						|
		compatible = "gpio-keys-polled";
 | 
						|
		#address-cells = <1>;
 | 
						|
		#size-cells = <0>;
 | 
						|
		poll-interval = <20>;
 | 
						|
		debounce-interval = <60>;
 | 
						|
 | 
						|
		reset {
 | 
						|
			label = "reset";
 | 
						|
			gpios = <&pinctrl 34 1>;
 | 
						|
			linux,code = <KEY_RESTART>;
 | 
						|
		};
 | 
						|
 | 
						|
		wps {
 | 
						|
			label = "wps";
 | 
						|
			gpios = <&pinctrl 35 1>;
 | 
						|
			linux,code = <KEY_WPS_BUTTON>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
 | 
						|
	gpio-leds {
 | 
						|
		compatible = "gpio-leds";
 | 
						|
 | 
						|
		inet_green {
 | 
						|
			label = "R1000H:green:inet";
 | 
						|
			gpios = <&pinctrl 5 0>;
 | 
						|
		};
 | 
						|
 | 
						|
		usb_green {
 | 
						|
			label = "R1000H:green:usb";
 | 
						|
			gpios = <&pinctrl 21 1>;
 | 
						|
		};
 | 
						|
 | 
						|
		power_green {
 | 
						|
			label = "R1000H:green:power";
 | 
						|
			gpios = <&pinctrl 22 0>;
 | 
						|
			default-state = "on";
 | 
						|
		};
 | 
						|
 | 
						|
		wps_green {
 | 
						|
			label = "R1000H:green:wps";
 | 
						|
			gpios = <&pinctrl 23 1>;
 | 
						|
		};
 | 
						|
 | 
						|
		power_red {
 | 
						|
			label = "R1000H:red:power";
 | 
						|
			gpios = <&pinctrl 24 0>;
 | 
						|
		};
 | 
						|
 | 
						|
		wps_red {
 | 
						|
			label = "R1000H:red:wps";
 | 
						|
			gpios = <&pinctrl 30 1>;
 | 
						|
		};
 | 
						|
 | 
						|
		inet_red {
 | 
						|
			label = "R1000H:red:inet";
 | 
						|
			gpios = <&pinctrl 31 0>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 | 
						|
 | 
						|
&pflash {
 | 
						|
	status = "ok";
 | 
						|
 | 
						|
	linux,part-probe = "bcm63xxpart";
 | 
						|
 | 
						|
	partitions {
 | 
						|
		compatible = "fixed-partitions";
 | 
						|
		#address-cells = <1>;
 | 
						|
		#size-cells = <1>;
 | 
						|
 | 
						|
		CFE@0 {
 | 
						|
			reg = <0x000000 0x020000>;
 | 
						|
			read-only;
 | 
						|
		};
 | 
						|
 | 
						|
		linux@20000 {
 | 
						|
			reg = <0x020000 0x1fc0000>;
 | 
						|
			compatible = "brcm,bcm963xx-imagetag";
 | 
						|
		};
 | 
						|
 | 
						|
		nvram@1fe0000 {
 | 
						|
			reg = <0x1fe0000 0x20000>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 | 
						|
 | 
						|
&uart0 {
 | 
						|
	status = "ok";
 | 
						|
};
 | 
						|
 | 
						|
&uart1 {
 | 
						|
	status = "ok";
 | 
						|
};
 |