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>
		
	
		
			
				
	
	
		
			126 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			126 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
/dts-v1/;
 | 
						|
 | 
						|
#include "bcm6358.dtsi"
 | 
						|
 | 
						|
#include <dt-bindings/input/input.h>
 | 
						|
 | 
						|
/ {
 | 
						|
	model = "Pirelli A226M-FWB";
 | 
						|
	compatible = "pirelli,a226m-fwb", "brcm,bcm6358";
 | 
						|
 | 
						|
	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 34 1>;
 | 
						|
			linux,code = <KEY_WPS_BUTTON>;
 | 
						|
		};
 | 
						|
		reset {
 | 
						|
			label = "reset";
 | 
						|
			gpios = <&pinctrl 37 1>;
 | 
						|
			linux,code = <KEY_RESTART>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
 | 
						|
	gpio-leds {
 | 
						|
		compatible = "gpio-leds";
 | 
						|
 | 
						|
		voip_red {
 | 
						|
			label = "DWV-S0:red:VoIP";
 | 
						|
			gpios = <&pinctrl 0 1>;
 | 
						|
		};
 | 
						|
		eth_red {
 | 
						|
			label = "DWV-S0:red:ethernet";
 | 
						|
			gpios = <&pinctrl 1 1>;
 | 
						|
		};
 | 
						|
		dsl_green {
 | 
						|
			label = "DWV-S0:green:ADSL";
 | 
						|
			gpios = <&pinctrl 2 1>;
 | 
						|
		};
 | 
						|
		usb_green {
 | 
						|
			label = "DWV-S0:green:USB";
 | 
						|
			gpios = <&pinctrl 3 1>;
 | 
						|
		};
 | 
						|
		power_green {
 | 
						|
			label = "DWV-S0:green:power";
 | 
						|
			gpios = <&pinctrl 4 1>;
 | 
						|
			default-state = "on";
 | 
						|
		};
 | 
						|
		power_red {
 | 
						|
			label = "DWV-S0:red:power";
 | 
						|
			gpios = <&pinctrl 5 1>;
 | 
						|
		};
 | 
						|
		inet_red {
 | 
						|
			label = "DWV-S0:red:internet";
 | 
						|
			gpios = <&pinctrl 6 1>;
 | 
						|
		};
 | 
						|
		inet_green {
 | 
						|
			label = "DWV-S0:green:internet";
 | 
						|
			gpios = <&pinctrl 7 1>;
 | 
						|
		};
 | 
						|
		eth_green {
 | 
						|
			label = "DWV-S0:green:ethernet";
 | 
						|
			gpios = <&pinctrl 8 1>;
 | 
						|
		};
 | 
						|
		voip_green {
 | 
						|
			label = "DWV-S0:green:VoIP";
 | 
						|
			gpios = <&pinctrl 9 1>;
 | 
						|
		};
 | 
						|
		wifi_red {
 | 
						|
			label = "DWV-S0:red:wifi";
 | 
						|
			gpios = <&pinctrl 10 1>;
 | 
						|
		};
 | 
						|
		usb_red {
 | 
						|
			label = "DWV-S0:red:USB";
 | 
						|
			gpios = <&pinctrl 11 1>;
 | 
						|
		};
 | 
						|
		dsl_red {
 | 
						|
			label = "DWV-S0:red:ADSL";
 | 
						|
			gpios = <&pinctrl 12 1>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 | 
						|
 | 
						|
&pflash {
 | 
						|
	status = "ok";
 | 
						|
 | 
						|
	linux,part-probe = "bcm63xxpart";
 | 
						|
 | 
						|
	partitions {
 | 
						|
		compatible = "fixed-partitions";
 | 
						|
		#address-cells = <1>;
 | 
						|
		#size-cells = <1>;
 | 
						|
 | 
						|
		cfe@0 {
 | 
						|
			label = "CFE";
 | 
						|
			reg = <0x000000 0x020000>;
 | 
						|
			read-only;
 | 
						|
		};
 | 
						|
 | 
						|
		linux@10000 {
 | 
						|
			label = "linux";
 | 
						|
			reg = <0x010000 0xfc0000>;
 | 
						|
			compatible = "brcm,bcm963xx-imagetag";
 | 
						|
		};
 | 
						|
 | 
						|
		nvram@7f0000 {
 | 
						|
			label = "nvram";
 | 
						|
			reg = <0xfe0000 0x020000>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 | 
						|
 | 
						|
&uart0 {
 | 
						|
	status = "ok";
 | 
						|
};
 |