Machine: Apalis-iMX8X: Change name from apalis-imx8qxp to apalis-imx8x

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

7 files changed, 7 insertions, 15 deletions

diff --git a/arch/arm/dts/fsl-imx8qxp-apalis.dts b/arch/arm/dts/fsl-imx8qxp-apalis.dts
index bc0c257141..f915a981fe 100644
--- a/arch/arm/dts/fsl-imx8qxp-apalis.dts
+++ b/arch/arm/dts/fsl-imx8qxp-apalis.dts
@@ -21,8 +21,8 @@
 #include "fsl-imx8qxp.dtsi"
 
 / {
-	model = "Toradex Apalis iMX8QXP";
-	compatible = "toradex,apalis-imx8qxp", "fsl,imx8qxp";
+	model = "Toradex Apalis iMX8X";
+	compatible = "toradex,apalis-imx8x", "fsl,imx8qxp";
 
 	chosen {
 		bootargs = "console=ttyLP1,115200 earlycon=lpuart32,0x5a070000,115200";
@@ -50,7 +50,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_reset_moci>;
 
-	apalis-imx8qxp {
+	apalis-imx8x {
 		/* Apalis UART1 */
 		pinctrl_lpuart1: lpuart1grp {
 			fsl,pins = <
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index fa310c1c18..07e2a78882 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -99,7 +99,7 @@ source "board/freescale/imx8qm_mek/Kconfig"
 source "board/freescale/imx8qxp_arm2/Kconfig"
 source "board/freescale/imx8qxp_mek/Kconfig"
 source "board/toradex/apalis-imx8/Kconfig"
-source "board/toradex/apalis-imx8qxp/Kconfig"
+source "board/toradex/apalis-imx8x/Kconfig"
 source "board/toradex/colibri-imx8qxp/Kconfig"
 
 endif
diff --git a/board/toradex/apalis-imx8qxp/Kconfig b/board/toradex/apalis-imx8x/Kconfig
index f89df49864..be4f87f194 100644
--- a/board/toradex/apalis-imx8qxp/Kconfig
+++ b/board/toradex/apalis-imx8x/Kconfig
@@ -1,13 +1,13 @@
 if TARGET_APALIS_IMX8QXP
 
 config SYS_BOARD
-	default "apalis-imx8qxp"
+	default "apalis-imx8x"
 
 config SYS_VENDOR
 	default "toradex"
 
 config SYS_CONFIG_NAME
-	default "apalis-imx8qxp"
+	default "apalis-imx8x"
 
 config TDX_CFG_BLOCK
 	default y
@@ -25,14 +25,6 @@ config TDX_CFG_BLOCK_PART
 config TDX_CFG_BLOCK_OFFSET
 	default "-512"
 
-config TDX_CMD_IMX_MFGR
-	bool "Enable factory testing commands for Toradex Apalis iMX8QXP modules"
-	help
-	  This adds the commands
-	    pf8100_otp_prog - Program the OTP fuses on the PMIC PF8100
-	  If executed on already fused modules it doesn't change any fuse setting.
-	default y
-
 source "board/toradex/common/Kconfig"
 
 endif
diff --git a/board/toradex/apalis-imx8qxp/Makefile b/board/toradex/apalis-imx8x/Makefile
index e59b206da9..19025863e8 100644
--- a/board/toradex/apalis-imx8qxp/Makefile
+++ b/board/toradex/apalis-imx8x/Makefile
@@ -3,4 +3,4 @@
 # Copyright 2018-2019 Toradex
 #
 
-obj-y += apalis-imx8qxp.o
+obj-y += apalis-imx8x.o
diff --git a/board/toradex/apalis-imx8qxp/apalis-imx8qxp.c b/board/toradex/apalis-imx8x/apalis-imx8x.c
index ddc34054b6..ddc34054b6 100644
--- a/board/toradex/apalis-imx8qxp/apalis-imx8qxp.c
+++ b/board/toradex/apalis-imx8x/apalis-imx8x.c
diff --git a/configs/apalis-imx8qxp_defconfig b/configs/apalis-imx8x_defconfig
index 5baa759a30..5baa759a30 100644
--- a/configs/apalis-imx8qxp_defconfig
+++ b/configs/apalis-imx8x_defconfig
diff --git a/include/configs/apalis-imx8qxp.h b/include/configs/apalis-imx8x.h
index ed0cc10b24..ed0cc10b24 100644
--- a/include/configs/apalis-imx8qxp.h
+++ b/include/configs/apalis-imx8x.h