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

Commit 752baf56 authored by Dirk Behme's avatar Dirk Behme Committed by Shawn Guo
Browse files

arm/imx6q: Rename Sabreauto to Armadillo2 



The Sabreauto board was renamed to Armadillo2 recently. To avoid
confusion, rename Sabreauto to Armadillo2/arm2.

Signed-off-by: default avatarDirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 477fce49

Documentation/devicetree/bindings/arm/fsl.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,9 +21,9 @@ i.MX53 Smart Mobile Reference Design Board 
Required root node properties:

Required root node properties:

    - compatible = "fsl,imx53-smd", "fsl,imx53";

    - compatible = "fsl,imx53-smd", "fsl,imx53";





i.MX6 Quad SABRE Automotive Board

i.MX6 Quad Armadillo2 Board

Required root node properties:

Required root node properties:

    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";

    - compatible = "fsl,imx6q-arm2", "fsl,imx6q";





i.MX6 Quad SABRE Lite Board

i.MX6 Quad SABRE Lite Board

Required root node properties:

Required root node properties:

arch/arm/boot/dts/imx6q-sabreauto.dts→arch/arm/boot/dts/imx6q-arm2.dts

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,8 @@ 
/include/ "imx6q.dtsi"

/include/ "imx6q.dtsi"





/ {

/ {

	model = "Freescale i.MX6 Quad SABRE Automotive Board";

	model = "Freescale i.MX6 Quad Armadillo2 Board";

	compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";

	compatible = "fsl,imx6q-arm2", "fsl,imx6q";





	chosen {

	chosen {

		bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";

		bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";

arch/arm/mach-imx/mach-imx6q.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ static struct sys_timer imx6q_timer = { 
};

};





static const char *imx6q_dt_compat[] __initdata = {

static const char *imx6q_dt_compat[] __initdata = {

	"fsl,imx6q-sabreauto",

	"fsl,imx6q-arm2",

	"fsl,imx6q-sabrelite",

	"fsl,imx6q-sabrelite",

	NULL,

	NULL,

};

};