diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-20 18:18:04 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-20 18:49:55 +0200 |
| commit | eda3660f9b73c183d4e1c0aa278323a26bd0cf29 (patch) | |
| tree | 41501770a42154c4e96e586cdfe3345569a09d55 | |
| parent | 111b5f6dd839f4f164ad327e08792bff8a733ab3 (diff) | |
rename all occurences of colibri-imx8qxp to colibri-imx8x
The Toradex product is called colibri-imx8x consisting of SoM with
i.MX8QXP and i.MX8DX SoCs.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
| -rw-r--r-- | arch/arm/dts/fsl-imx8qxp-colibri.dts | 6 | ||||
| -rw-r--r-- | board/toradex/colibri-imx8x/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg (renamed from board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg) | 0 | ||||
| -rw-r--r-- | configs/colibri-imx8x_defconfig (renamed from configs/colibri-imx8qxp_defconfig) | 2 | ||||
| -rw-r--r-- | doc/board/toradex/colibri-imx8x.rst | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/dts/fsl-imx8qxp-colibri.dts b/arch/arm/dts/fsl-imx8qxp-colibri.dts index 9141358590..fc5a0e9bc1 100644 --- a/arch/arm/dts/fsl-imx8qxp-colibri.dts +++ b/arch/arm/dts/fsl-imx8qxp-colibri.dts @@ -9,8 +9,8 @@ #include "fsl-imx8qxp-colibri-u-boot.dtsi" / { - model = "Toradex Colibri iMX8QXP"; - compatible = "toradex,colibri-imx8qxp", "fsl,imx8qxp"; + model = "Toradex Colibri iMX8X"; + compatible = "toradex,colibri-imx8x", "fsl,imx8qxp"; chosen { bootargs = "console=ttyLP3,115200"; @@ -40,7 +40,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_hog2>; - colibri-imx8qxp { + colibri-imx8x { u-boot,dm-pre-proper; pinctrl_lpuart0: lpuart0grp { fsl,pins = < diff --git a/board/toradex/colibri-imx8x/MAINTAINERS b/board/toradex/colibri-imx8x/MAINTAINERS index f6853586c8..de62f87a56 100644 --- a/board/toradex/colibri-imx8x/MAINTAINERS +++ b/board/toradex/colibri-imx8x/MAINTAINERS @@ -5,6 +5,6 @@ S: Maintained F: arch/arm/dts/fsl-imx8x-colibri.dts F: arch/arm/dts/fsl-imx8x-colibri-u-boot.dtsi F: board/toradex/colibri-imx8x/ -F: configs/colibri-imx8qxp_defconfig +F: configs/colibri-imx8x_defconfig F: doc/board/toradex/colibri-imx8x.rst F: include/configs/colibri-imx8x.h diff --git a/board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg index 1dcd13271d..1dcd13271d 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg +++ b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8x_defconfig index 61d540b5ca..b14127a78d 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -14,7 +14,7 @@ CONFIG_IMX_BOOTAUX=y CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90400000 CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_SYSTEM_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg" CONFIG_BOOTDELAY=1 CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/doc/board/toradex/colibri-imx8x.rst b/doc/board/toradex/colibri-imx8x.rst index 244e5a4c04..616f40ae0f 100644 --- a/doc/board/toradex/colibri-imx8x.rst +++ b/doc/board/toradex/colibri-imx8x.rst @@ -52,7 +52,7 @@ Build U-Boot .. code-block:: bash - $ make colibri-imx8qxp_defconfig + $ make colibri-imx8x_defconfig $ make u-boot-dtb.imx Load the U-Boot Binary Using UUU |