[PATCH v1 1/2] colibri-imx8qxp: rename all occurences to colibri-imx8x
From: Philippe Schenker philippe.schenker@toradex.com
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 ---
arch/arm/dts/fsl-imx8qxp-colibri.dts | 6 +++--- board/toradex/colibri-imx8x/MAINTAINERS | 2 +- ...ibri-imx8qxp-imximage.cfg => colibri-imx8x-imximage.cfg} | 0 .../{colibri-imx8qxp_defconfig => colibri-imx8x_defconfig} | 2 +- doc/board/toradex/colibri-imx8x.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename board/toradex/colibri-imx8x/{colibri-imx8qxp-imximage.cfg => colibri-imx8x-imximage.cfg} (100%) rename configs/{colibri-imx8qxp_defconfig => colibri-imx8x_defconfig} (98%)
diff --git a/arch/arm/dts/fsl-imx8qxp-colibri.dts b/arch/arm/dts/fsl-imx8qxp-colibri.dts index 0c20edf2cf..11ece34c02 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 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 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 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 719e7473e1..92dc103ce3 100644 --- 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 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
From: Philippe Schenker philippe.schenker@toradex.com
The Toradex product is called apalis-imx8 consisting of SoM with i.MX8QM and i.MX8QP SoCs.
Signed-off-by: Philippe Schenker philippe.schenker@toradex.com Reviewed-by: Igor Opaniuk igor.opaniuk@toradex.com ---
arch/arm/dts/fsl-imx8qm-apalis.dts | 6 +++--- board/toradex/apalis-imx8/MAINTAINERS | 2 +- ...{apalis-imx8qm-imximage.cfg => apalis-imx8-imximage.cfg} | 0 configs/{apalis-imx8qm_defconfig => apalis-imx8_defconfig} | 2 +- doc/board/toradex/apalix-imx8.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename board/toradex/apalis-imx8/{apalis-imx8qm-imximage.cfg => apalis-imx8-imximage.cfg} (100%) rename configs/{apalis-imx8qm_defconfig => apalis-imx8_defconfig} (98%)
diff --git a/arch/arm/dts/fsl-imx8qm-apalis.dts b/arch/arm/dts/fsl-imx8qm-apalis.dts index 9b1f8aa32d..5187b79452 100644 --- a/arch/arm/dts/fsl-imx8qm-apalis.dts +++ b/arch/arm/dts/fsl-imx8qm-apalis.dts @@ -12,8 +12,8 @@ #include "fsl-imx8qm-apalis-u-boot.dtsi"
/ { - model = "Toradex Apalis iMX8QM"; - compatible = "toradex,apalis-imx8qm", "fsl,imx8qm"; + model = "Toradex Apalis iMX8"; + compatible = "toradex,apalis-imx8", "fsl,imx8qm";
chosen { bootargs = "console=ttyLP1,115200 earlycon=lpuart32,0x5a070000,115200"; @@ -38,7 +38,7 @@ <&pinctrl_qspi1a_gpios>, <&pinctrl_sata1_act>, <&pinctrl_sim0_gpios>, <&pinctrl_usdhc1_gpios>;
- apalis-imx8qm { + apalis-imx8 { pinctrl_gpio12: gpio12grp { fsl,pins = < /* Apalis GPIO1 */ diff --git a/board/toradex/apalis-imx8/MAINTAINERS b/board/toradex/apalis-imx8/MAINTAINERS index feacf7eded..7fbd1be10f 100644 --- a/board/toradex/apalis-imx8/MAINTAINERS +++ b/board/toradex/apalis-imx8/MAINTAINERS @@ -5,6 +5,6 @@ S: Maintained F: arch/arm/dts/fsl-imx8-apalis.dts F: arch/arm/dts/fsl-imx8-apalis-u-boot.dtsi F: board/toradex/apalis-imx8/ -F: configs/apalis-imx8qm_defconfig +F: configs/apalis-imx8_defconfig F: doc/board/toradex/apalix-imx8.rst F: include/configs/apalis-imx8.h diff --git a/board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg similarity index 100% rename from board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg rename to board/toradex/apalis-imx8/apalis-imx8-imximage.cfg diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8_defconfig similarity index 98% rename from configs/apalis-imx8qm_defconfig rename to configs/apalis-imx8_defconfig index 5cf0e2b017..72e58216bd 100644 --- a/configs/apalis-imx8qm_defconfig +++ b/configs/apalis-imx8_defconfig @@ -11,7 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8/apalis-imx8-imximage.cfg" CONFIG_LOG=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/doc/board/toradex/apalix-imx8.rst b/doc/board/toradex/apalix-imx8.rst index 4b7ea65d31..29593faf1a 100644 --- a/doc/board/toradex/apalix-imx8.rst +++ b/doc/board/toradex/apalix-imx8.rst @@ -51,7 +51,7 @@ Build U-Boot ------------ .. code-block:: bash
- $ make apalis-imx8qm_defconfig + $ make apalis-imx8_defconfig $ make u-boot-dtb.imx
Load the U-Boot Binary Using UUU
From: Philippe Schenker philippe.schenker@toradex.com The Toradex product is called apalis-imx8 consisting of SoM with i.MX8QM and i.MX8QP SoCs. Signed-off-by: Philippe Schenker philippe.schenker@toradex.com Reviewed-by: Igor Opaniuk igor.opaniuk@toradex.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
From: Philippe Schenker philippe.schenker@toradex.com 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
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (2)
-
Igor Opaniuk -
sbabic＠denx.de