Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf6c959e authored by Ralph Sennhauser's avatar Ralph Sennhauser Committed by Gregory CLEMENT
Browse files

ARM: dts: armada-385-linksys: partition layout is board specific 



Move the partition layout to individual boards. The Linksys WRT 3200 ACM
(Rango) comes with a 256MiB nand flash chip and different layout.

Signed-off-by: default avatarRalph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 0ebbb957

arch/arm/boot/dts/armada-385-linksys-caiman.dts

+67 −0
Original line number Diff line number Diff line
@@ -102,3 +102,70 @@ 
		label = "caiman:white:sata";

	};

};



&nand {

	/* 128MiB */



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@100000 {

		label = "u_env";

		reg = <0x200000 0x40000>;    /* 256KiB */

	};



	partition@140000 {

		label = "s_env";

		reg = <0x240000 0x40000>;    /* 256KiB */

	};



	partition@900000 {

		label = "devinfo";

		reg = <0x900000 0x100000>;   /* 1MiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x2800000>;  /* 40MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x2200000>;  /* 34MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@3200000 {

		label = "kernel2";

		reg = <0x3200000 0x2800000>; /* 40MiB */

	};



	partition@3800000 {

		label = "rootfs2";

		reg = <0x3800000 0x2200000>; /* 34MiB */

	};



	/*

	 * 38MiB, last MiB is for the BBT, not writable

	 */

	partition@5a00000 {

		label = "syscfg";

		reg = <0x5a00000 0x2600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x280000 0x680000>;   /* 6.5MiB */

	};

};

arch/arm/boot/dts/armada-385-linksys-cobra.dts

+67 −0
Original line number Diff line number Diff line
@@ -102,3 +102,70 @@ 
		label = "cobra:white:sata";

	};

};



&nand {

	/* 128MiB */



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@100000 {

		label = "u_env";

		reg = <0x200000 0x40000>;    /* 256KiB */

	};



	partition@140000 {

		label = "s_env";

		reg = <0x240000 0x40000>;    /* 256KiB */

	};



	partition@900000 {

		label = "devinfo";

		reg = <0x900000 0x100000>;   /* 1MiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x2800000>;  /* 40MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x2200000>;  /* 34MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@3200000 {

		label = "kernel2";

		reg = <0x3200000 0x2800000>; /* 40MiB */

	};



	partition@3800000 {

		label = "rootfs2";

		reg = <0x3800000 0x2200000>; /* 34MiB */

	};



	/*

	 * 38MiB, last MiB is for the BBT, not writable

	 */

	partition@5a00000 {

		label = "syscfg";

		reg = <0x5a00000 0x2600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x280000 0x680000>;   /* 6.5MiB */

	};

};

arch/arm/boot/dts/armada-385-linksys-shelby.dts

+67 −0
Original line number Diff line number Diff line
@@ -102,3 +102,70 @@ 
		label = "shelby:white:sata";

	};

};



&nand {

	/* 128MiB */



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@100000 {

		label = "u_env";

		reg = <0x200000 0x40000>;    /* 256KiB */

	};



	partition@140000 {

		label = "s_env";

		reg = <0x240000 0x40000>;    /* 256KiB */

	};



	partition@900000 {

		label = "devinfo";

		reg = <0x900000 0x100000>;   /* 1MiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x2800000>;  /* 40MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x2200000>;  /* 34MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@3200000 {

		label = "kernel2";

		reg = <0x3200000 0x2800000>; /* 40MiB */

	};



	partition@3800000 {

		label = "rootfs2";

		reg = <0x3800000 0x2200000>; /* 34MiB */

	};



	/*

	 * 38MiB, last MiB is for the BBT, not writable

	 */

	partition@5a00000 {

		label = "syscfg";

		reg = <0x5a00000 0x2600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x280000 0x680000>;   /* 6.5MiB */

	};

};

arch/arm/boot/dts/armada-385-linksys.dtsi

+1 −63
Original line number Diff line number Diff line
@@ -172,74 +172,12 @@ 
};



&nand {

	/* 128MiB or 256MiB */

	status = "okay";

	num-cs = <1>;

	marvell,nand-keep-config;

	marvell,nand-enable-arbiter;

	nand-on-flash-bbt;



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@100000 {

		label = "u_env";

		reg = <0x200000 0x40000>;    /* 256KiB */

	};



	partition@140000 {

		label = "s_env";

		reg = <0x240000 0x40000>;    /* 256KiB */

	};



	partition@900000 {

		label = "devinfo";

		reg = <0x900000 0x100000>;   /* 1MiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x2800000>;  /* 40MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x2200000>;  /* 34MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@3200000 {

		label = "kernel2";

		reg = <0x3200000 0x2800000>; /* 40MiB */

	};



	partition@3800000 {

		label = "rootfs2";

		reg = <0x3800000 0x2200000>; /* 34MiB */

	};



	/*

	 * 38MiB, last MiB is for the BBT, not writable

	 */

	partition@5a00000 {

		label = "syscfg";

		reg = <0x5a00000 0x2600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x280000 0x680000>;   /* 6.5MiB */

	};

};



&mdio {