colibri-imx8qxp: rename all occurences 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>
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>

diff --git a/arch/arm/dts/fsl-imx8qxp-colibri.dts b/arch/arm/dts/fsl-imx8qxp-colibri.dts
index 0c20edf2cf34870fb82420803ae102dcdc2c44e6..11ece34c024eaaa15b305754645f2210726b1f77 100644 (file)
--- 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 earlycon=lpuart32,0x5a090000,115200";
@@ -32,7 +32,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_hog2>;
 
-       colibri-imx8qxp {
+       colibri-imx8x {
                pinctrl_lpuart0: lpuart0grp {
                        fsl,pins = <
                                SC_P_UART0_RX_ADMA_UART0_RX     0x06000020

diff --git a/board/toradex/colibri-imx8x/MAINTAINERS b/board/toradex/colibri-imx8x/MAINTAINERS
index f6853586c8b316c71a0a8d8306c0936c4c5487b3..de62f87a560e98262eb43fa93b7166106b3461a3 100644 (file)
--- 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
similarity index 100%
rename from board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg
rename to board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg

diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8x_defconfig
similarity index 98%
rename from configs/colibri-imx8qxp_defconfig
rename to configs/colibri-imx8x_defconfig
index 719e7473e195463740fcab1a1edb5511df6bf7a1..92dc103ce3b7709c5e6de8c8abb0b56bf48c1f3e 100644 (file)
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -10,7 +10,7 @@ CONFIG_TARGET_COLIBRI_IMX8X=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=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_LOG=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/doc/board/toradex/colibri-imx8x.rst b/doc/board/toradex/colibri-imx8x.rst
index 244e5a4c04728cd3936de4a73fffe04ccd741bba..616f40ae0f0b8d014cb5bd6e5cb780a1f7599919 100644 (file)
--- 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