FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-01 23:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm/imx6q: Rename Sabreauto to Armadillo2

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

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Dirk Behme 2011-12-08 08:22:01 +01:00 committed by Shawn Guo
parent 477fce49ae
commit 752baf5647
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/arm/fsl.txt
View File

@ -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:

4
arch/arm/boot/dts/imx6q-sabreauto.dts → arch/arm/boot/dts/imx6q-arm2.dts
View File

@ -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";

2
arch/arm/mach-imx/mach-imx6q.c
View File

@ -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,
}; };