diff options
author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-09-27 10:16:11 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-05 19:22:21 +0100 |
commit | 3f5ee44cbd44775458bb98b018b259468b5d608c (patch) | |
tree | c1e179b093016f8fa78f71a0d0c51753aa6a3355 | |
parent | 6aa8da38c6b410a050cefa895263d26e024aa1a4 (diff) |
Machine: Apalis-iMX8X: Change name from apalis-imx8qxp to apalis-imx8x
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
-rw-r--r-- | arch/arm/dts/fsl-imx8qxp-apalis.dts | 6 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx8/Kconfig | 2 | ||||
-rw-r--r-- | board/toradex/apalis-imx8x/Kconfig (renamed from board/toradex/apalis-imx8qxp/Kconfig) | 12 | ||||
-rw-r--r-- | board/toradex/apalis-imx8x/Makefile (renamed from board/toradex/apalis-imx8qxp/Makefile) | 2 | ||||
-rw-r--r-- | board/toradex/apalis-imx8x/apalis-imx8x.c (renamed from board/toradex/apalis-imx8qxp/apalis-imx8qxp.c) | 0 | ||||
-rw-r--r-- | configs/apalis-imx8x_defconfig (renamed from configs/apalis-imx8qxp_defconfig) | 0 | ||||
-rw-r--r-- | include/configs/apalis-imx8x.h (renamed from include/configs/apalis-imx8qxp.h) | 0 |
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 bc0c2571413..f915a981fe5 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 8f52fb286c4..ae37430bfa1 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -115,7 +115,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" config SNVS_SEC_SC diff --git a/board/toradex/apalis-imx8qxp/Kconfig b/board/toradex/apalis-imx8x/Kconfig index f89df498642..be4f87f1942 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 e59b206da96..19025863e82 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 ddc34054b61..ddc34054b61 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 5baa759a30e..5baa759a30e 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 ed0cc10b240..ed0cc10b240 100644 --- a/include/configs/apalis-imx8qxp.h +++ b/include/configs/apalis-imx8x.h |