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>
		
	
			
		
			
				
	
	
		
			120 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			120 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
/dts-v1/;
 | 
						|
 | 
						|
#include "bcm6318.dtsi"
 | 
						|
 | 
						|
#include <dt-bindings/input/input.h>
 | 
						|
 | 
						|
/ {
 | 
						|
	model = "Comtrend AR-5315u";
 | 
						|
	compatible = "comtrend,ar-5315u", "brcm,bcm6318";
 | 
						|
 | 
						|
	chosen {
 | 
						|
		bootargs = "rootfstype=squashfs,jffs2 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>;
 | 
						|
 | 
						|
		wps {
 | 
						|
			label = "wps";
 | 
						|
			gpios = <&pinctrl 3 1>;
 | 
						|
			linux,code = <KEY_WPS_BUTTON>;
 | 
						|
		};
 | 
						|
		reset {
 | 
						|
			label = "reset";
 | 
						|
			gpios = <&pinctrl 33 1>;
 | 
						|
			linux,code = <KEY_RESTART>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
 | 
						|
	gpio-leds {
 | 
						|
		compatible = "gpio-leds";
 | 
						|
 | 
						|
		wps_green {
 | 
						|
			label = "AR-5315u:green:wps";
 | 
						|
			gpios = <&pinctrl 0 1>;
 | 
						|
		};
 | 
						|
		power_green {
 | 
						|
			label = "AR-5315u:green:power";
 | 
						|
			gpios = <&pinctrl 1 1>;
 | 
						|
			default-state = "on";
 | 
						|
		};
 | 
						|
		usb_green {
 | 
						|
			label = "AR-5315u:green:usb";
 | 
						|
			gpios = <&pinctrl 2 1>;
 | 
						|
		};
 | 
						|
		inet_green {
 | 
						|
			label = "AR-5315u:green:inet";
 | 
						|
			gpios = <&pinctrl 8 1>;
 | 
						|
		};
 | 
						|
		inet_red {
 | 
						|
			label = "AR-5315u:red:inet";
 | 
						|
			gpios = <&pinctrl 9 1>;
 | 
						|
		};
 | 
						|
		dsl_green {
 | 
						|
			label = "AR-5315u:green:dsl";
 | 
						|
			gpios = <&pinctrl 10 1>;
 | 
						|
		};
 | 
						|
		power_red {
 | 
						|
			label = "AR-5315u:red:power";
 | 
						|
			gpios = <&pinctrl 11 1>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 | 
						|
 | 
						|
&hsspi {
 | 
						|
	status = "ok";
 | 
						|
 | 
						|
	flash@0 {
 | 
						|
		compatible = "jedec,spi-nor";
 | 
						|
		spi-max-frequency = <62500000>;
 | 
						|
		spi-tx-bus-width = <2>;
 | 
						|
		spi-rx-bus-width = <2>;
 | 
						|
		reg = <0>;
 | 
						|
 | 
						|
		#address-cells = <1>;
 | 
						|
		#size-cells = <1>;
 | 
						|
 | 
						|
		linux,part-probe = "bcm63xxpart";
 | 
						|
 | 
						|
 | 
						|
		partitions {
 | 
						|
			compatible = "fixed-partitions";
 | 
						|
			#address-cells = <1>;
 | 
						|
			#size-cells = <1>;
 | 
						|
 | 
						|
			cfe@0 {
 | 
						|
				reg = <0x000000 0x010000>;
 | 
						|
				label = "cfe";
 | 
						|
				read-only;
 | 
						|
			};
 | 
						|
 | 
						|
			linux@10000 {
 | 
						|
				reg = <0x010000 0xfe0000>;
 | 
						|
				label = "linux";
 | 
						|
				compatible = "brcm,bcm963xx-imagetag";
 | 
						|
			};
 | 
						|
 | 
						|
			nvram@ff0000 {
 | 
						|
				reg = <0xff0000 0x010000>;
 | 
						|
				label = "nvram";
 | 
						|
			};
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 | 
						|
 | 
						|
&pinctrl {
 | 
						|
	pinctrl-names = "default";
 | 
						|
	pinctrl-0 = <&pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
 | 
						|
		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
 | 
						|
};
 | 
						|
 | 
						|
&uart0 {
 | 
						|
	status = "ok";
 | 
						|
};
 |