diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boards/zii-imx7d-dev/Makefile (renamed from arch/arm/boards/zii-imx7d-rpu2/Makefile) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/zii-imx7d-dev/board.c (renamed from arch/arm/boards/zii-imx7d-rpu2/board.c) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg (renamed from arch/arm/boards/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/zii-imx7d-dev/lowlevel.c (renamed from arch/arm/boards/zii-imx7d-rpu2/lowlevel.c) | 2 | ||||
| -rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 |
7 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index bdf78d068d..a814ab8239 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -164,7 +164,7 @@ obj-$(CONFIG_MACH_ZII_RDU1) += zii-imx51-rdu1/ obj-$(CONFIG_MACH_ZII_RDU2) += zii-imx6q-rdu2/ obj-$(CONFIG_MACH_ZII_IMX8MQ_DEV) += zii-imx8mq-dev/ obj-$(CONFIG_MACH_ZII_VF610_DEV) += zii-vf610-dev/ -obj-$(CONFIG_MACH_ZII_IMX7D_RPU2) += zii-imx7d-rpu2/ +obj-$(CONFIG_MACH_ZII_IMX7D_DEV) += zii-imx7d-dev/ obj-$(CONFIG_MACH_WAGO_PFC_AM35XX) += wago-pfc-am35xx/ obj-$(CONFIG_MACH_LS1046ARDB) += ls1046ardb/ obj-$(CONFIG_MACH_TQMLS1046A) += tqmls1046a/ diff --git a/arch/arm/boards/zii-imx7d-rpu2/Makefile b/arch/arm/boards/zii-imx7d-dev/Makefile index 01c7a259e9..01c7a259e9 100644 --- a/arch/arm/boards/zii-imx7d-rpu2/Makefile +++ b/arch/arm/boards/zii-imx7d-dev/Makefile diff --git a/arch/arm/boards/zii-imx7d-rpu2/board.c b/arch/arm/boards/zii-imx7d-dev/board.c index 0a99976b7d..0a99976b7d 100644 --- a/arch/arm/boards/zii-imx7d-rpu2/board.c +++ b/arch/arm/boards/zii-imx7d-dev/board.c diff --git a/arch/arm/boards/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg b/arch/arm/boards/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg index 46f3d95048..46f3d95048 100644 --- a/arch/arm/boards/zii-imx7d-rpu2/flash-header-zii-imx7d-rpu2.imxcfg +++ b/arch/arm/boards/zii-imx7d-dev/flash-header-zii-imx7d-dev.imxcfg diff --git a/arch/arm/boards/zii-imx7d-rpu2/lowlevel.c b/arch/arm/boards/zii-imx7d-dev/lowlevel.c index 1eeab7d216..d7f8feb951 100644 --- a/arch/arm/boards/zii-imx7d-rpu2/lowlevel.c +++ b/arch/arm/boards/zii-imx7d-dev/lowlevel.c @@ -39,7 +39,7 @@ static inline void setup_uart(void) putc_ll('>'); } -ENTRY_FUNCTION(start_zii_imx7d_rpu2, r0, r1, r2) +ENTRY_FUNCTION(start_zii_imx7d_dev, r0, r1, r2) { imx7_cpu_lowlevel_init(); diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 561653930b..4c79b9880c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -133,7 +133,7 @@ pbl-dtb-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += at91-microchip-ksz9477-evb.dtb.o pbl-dtb-$(CONFIG_MACH_AT91SAM9X5EK) += at91sam9x5ek.dtb.o pbl-dtb-$(CONFIG_MACH_XILINX_ZCU104) += zynqmp-zcu104-revA.dtb.o -pbl-dtb-$(CONFIG_MACH_ZII_IMX7D_RPU2) += imx7d-zii-rpu2.dtb.o +pbl-dtb-$(CONFIG_MACH_ZII_IMX7D_DEV) += imx7d-zii-rpu2.dtb.o pbl-dtb-$(CONFIG_MACH_WAGO_PFC_AM35XX) += am35xx-pfc-750_820x.dtb.o pbl-dtb-$(CONFIG_MACH_LS1046ARDB) += fsl-ls1046a-rdb.dtb.o pbl-dtb-$(CONFIG_MACH_TQMLS1046A) += fsl-tqmls1046a-mbls10xxa.dtb.o diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6a6aab634c..b9374fe1db 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -461,8 +461,8 @@ config MACH_ZII_VF610_DEV select ARCH_VF610 select CLKDEV_LOOKUP -config MACH_ZII_IMX7D_RPU2 - bool "ZII i.MX7D RPU2" +config MACH_ZII_IMX7D_DEV + bool "ZII i.MX7D based devices" select ARCH_IMX7 config MACH_PHYTEC_PHYCORE_IMX7 |