imx6: rename target to 'imx'

This is first step in migrating to a generic i.MX target which in the
next steps will also get divided into arch-specific subtargets.

In the result, this will make it possible to support, within a single
target, also other modern NXP i.MX families, like the i.MX 7, i.MX 8
or recently introduced i.MX 9.

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

33 files changed, 5 insertions, 5 deletions

diff --git a/target/linux/imx6/Makefile b/target/linux/imx/Makefile
index e735d1d885..6f00cba992 100644
--- a/target/linux/imx6/Makefile
+++ b/target/linux/imx/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 ARCH:=arm
-BOARD:=imx6
-BOARDNAME:=NXP i.MX 6
+BOARD:=imx
+BOARDNAME:=NXP i.MX
 FEATURES:=audio display fpu gpio pcie rtc usb usbgadget squashfs targz nand ubifs boot-part rootfs-part
 CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=neon
diff --git a/target/linux/imx6/base-files/etc/board.d/02_network b/target/linux/imx/base-files/etc/board.d/02_network
index 1668b86008..1668b86008 100644
--- a/target/linux/imx6/base-files/etc/board.d/02_network
+++ b/target/linux/imx/base-files/etc/board.d/02_network
diff --git a/target/linux/imx6/base-files/etc/inittab b/target/linux/imx/base-files/etc/inittab
index b944a93ada..b944a93ada 100644
--- a/target/linux/imx6/base-files/etc/inittab
+++ b/target/linux/imx/base-files/etc/inittab
diff --git a/target/linux/imx6/base-files/lib/imx6.sh b/target/linux/imx/base-files/lib/imx.sh
index 46d2eeb006..46d2eeb006 100644
--- a/target/linux/imx6/base-files/lib/imx6.sh
+++ b/target/linux/imx/base-files/lib/imx.sh
diff --git a/target/linux/imx6/base-files/lib/preinit/79_move_config b/target/linux/imx/base-files/lib/preinit/79_move_config
index baa7ffe44b..6ed59320ac 100644
--- a/target/linux/imx6/base-files/lib/preinit/79_move_config
+++ b/target/linux/imx/base-files/lib/preinit/79_move_config
@@ -1,4 +1,4 @@
-. /lib/imx6.sh
+. /lib/imx.sh
 . /lib/functions.sh
 . /lib/upgrade/common.sh
 
diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx/base-files/lib/upgrade/platform.sh
index 79f2a5078b..e18d59c771 100755
--- a/target/linux/imx6/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx/base-files/lib/upgrade/platform.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2010-2015 OpenWrt.org
 #
 
-. /lib/imx6.sh
+. /lib/imx.sh
 
 RAMFS_COPY_BIN='blkid jffs2reset'
 
diff --git a/target/linux/imx6/config-5.10 b/target/linux/imx/config-5.10
index 73ce01ebdd..73ce01ebdd 100644
--- a/target/linux/imx6/config-5.10
+++ b/target/linux/imx/config-5.10
diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx/config-5.4
index 6f5142b012..6f5142b012 100644
--- a/target/linux/imx6/config-5.4
+++ b/target/linux/imx/config-5.4
diff --git a/target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.bin b/target/linux/imx/files/firmware/imx/sdma/sdma-imx6q.bin
index 4d0593cec7..4d0593cec7 100644
--- a/target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.bin
+++ b/target/linux/imx/files/firmware/imx/sdma/sdma-imx6q.bin
diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx/image/Makefile
index 5f8e5f1c04..5f8e5f1c04 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx/image/Makefile
diff --git a/target/linux/imx6/image/bootscript-solidrun_cubox-i b/target/linux/imx/image/bootscript-solidrun_cubox-i
index 2ed48ab941..2ed48ab941 100644
--- a/target/linux/imx6/image/bootscript-solidrun_cubox-i
+++ b/target/linux/imx/image/bootscript-solidrun_cubox-i
diff --git a/target/linux/imx6/image/bootscript-toradex_apalis b/target/linux/imx/image/bootscript-toradex_apalis
index 3a3a6dadb1..3a3a6dadb1 100644
--- a/target/linux/imx6/image/bootscript-toradex_apalis
+++ b/target/linux/imx/image/bootscript-toradex_apalis
diff --git a/target/linux/imx6/image/bootscript-ventana b/target/linux/imx/image/bootscript-ventana
index 734f74a30c..734f74a30c 100644
--- a/target/linux/imx6/image/bootscript-ventana
+++ b/target/linux/imx/image/bootscript-ventana
diff --git a/target/linux/imx6/image/recovery-toradex_apalis b/target/linux/imx/image/recovery-toradex_apalis
index d75b954345..d75b954345 100644
--- a/target/linux/imx6/image/recovery-toradex_apalis
+++ b/target/linux/imx/image/recovery-toradex_apalis
diff --git a/target/linux/imx6/patches-5.10/100-bootargs.patch b/target/linux/imx/patches-5.10/100-bootargs.patch
index cf63a3bdb1..cf63a3bdb1 100644
--- a/target/linux/imx6/patches-5.10/100-bootargs.patch
+++ b/target/linux/imx/patches-5.10/100-bootargs.patch
diff --git a/target/linux/imx6/patches-5.10/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch b/target/linux/imx/patches-5.10/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
index e14dc484b0..e14dc484b0 100644
--- a/target/linux/imx6/patches-5.10/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
+++ b/target/linux/imx/patches-5.10/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch
diff --git a/target/linux/imx6/patches-5.10/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch b/target/linux/imx/patches-5.10/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
index 8f07f0b1a5..8f07f0b1a5 100644
--- a/target/linux/imx6/patches-5.10/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
+++ b/target/linux/imx/patches-5.10/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch
diff --git a/target/linux/imx6/patches-5.4/001-ARM-dts-imx-Add-GW5907-board-support.patch b/target/linux/imx/patches-5.4/001-ARM-dts-imx-Add-GW5907-board-support.patch
index e830897704..e830897704 100644
--- a/target/linux/imx6/patches-5.4/001-ARM-dts-imx-Add-GW5907-board-support.patch
+++ b/target/linux/imx/patches-5.4/001-ARM-dts-imx-Add-GW5907-board-support.patch
diff --git a/target/linux/imx6/patches-5.4/002-ARM-dts-imx-Add-GW5910-board-support.patch b/target/linux/imx/patches-5.4/002-ARM-dts-imx-Add-GW5910-board-support.patch
index 5c52bde70d..5c52bde70d 100644
--- a/target/linux/imx6/patches-5.4/002-ARM-dts-imx-Add-GW5910-board-support.patch
+++ b/target/linux/imx/patches-5.4/002-ARM-dts-imx-Add-GW5910-board-support.patch
diff --git a/target/linux/imx6/patches-5.4/003-ARM-dts-imx-Add-GW5913-board-support.patch b/target/linux/imx/patches-5.4/003-ARM-dts-imx-Add-GW5913-board-support.patch
index 32f344c588..32f344c588 100644
--- a/target/linux/imx6/patches-5.4/003-ARM-dts-imx-Add-GW5913-board-support.patch
+++ b/target/linux/imx/patches-5.4/003-ARM-dts-imx-Add-GW5913-board-support.patch
diff --git a/target/linux/imx6/patches-5.4/004-ARM-dts-imx-Add-GW5912-board-support.patch b/target/linux/imx/patches-5.4/004-ARM-dts-imx-Add-GW5912-board-support.patch
index da733ff357..da733ff357 100644
--- a/target/linux/imx6/patches-5.4/004-ARM-dts-imx-Add-GW5912-board-support.patch
+++ b/target/linux/imx/patches-5.4/004-ARM-dts-imx-Add-GW5912-board-support.patch
diff --git a/target/linux/imx6/patches-5.4/005-v5.7-ARM-dts-imx6qdl-gw553x-add-lsm9ds1-iio-imu-magn-supp.patch b/target/linux/imx/patches-5.4/005-v5.7-ARM-dts-imx6qdl-gw553x-add-lsm9ds1-iio-imu-magn-supp.patch
index f05c1f1ec1..f05c1f1ec1 100644
--- a/target/linux/imx6/patches-5.4/005-v5.7-ARM-dts-imx6qdl-gw553x-add-lsm9ds1-iio-imu-magn-supp.patch
+++ b/target/linux/imx/patches-5.4/005-v5.7-ARM-dts-imx6qdl-gw553x-add-lsm9ds1-iio-imu-magn-supp.patch
diff --git a/target/linux/imx6/patches-5.4/006-v5.7-ARM-dts-imx-ventana-add-fxos8700-on-gateworks-boards.patch b/target/linux/imx/patches-5.4/006-v5.7-ARM-dts-imx-ventana-add-fxos8700-on-gateworks-boards.patch
index 1d8844fb0d..1d8844fb0d 100644
--- a/target/linux/imx6/patches-5.4/006-v5.7-ARM-dts-imx-ventana-add-fxos8700-on-gateworks-boards.patch
+++ b/target/linux/imx/patches-5.4/006-v5.7-ARM-dts-imx-ventana-add-fxos8700-on-gateworks-boards.patch
diff --git a/target/linux/imx6/patches-5.4/006-v5.7-ARM-dts-imx6qdl-gw5910-add-CC1352-UART.patch b/target/linux/imx/patches-5.4/006-v5.7-ARM-dts-imx6qdl-gw5910-add-CC1352-UART.patch
index 72a98a2b15..72a98a2b15 100644
--- a/target/linux/imx6/patches-5.4/006-v5.7-ARM-dts-imx6qdl-gw5910-add-CC1352-UART.patch
+++ b/target/linux/imx/patches-5.4/006-v5.7-ARM-dts-imx6qdl-gw5910-add-CC1352-UART.patch
diff --git a/target/linux/imx6/patches-5.4/006-v5.8-ARM-dts-imx6qdl-gw552x-add-USB-OTG-support.patch b/target/linux/imx/patches-5.4/006-v5.8-ARM-dts-imx6qdl-gw552x-add-USB-OTG-support.patch
index 8d436be631..8d436be631 100644
--- a/target/linux/imx6/patches-5.4/006-v5.8-ARM-dts-imx6qdl-gw552x-add-USB-OTG-support.patch
+++ b/target/linux/imx/patches-5.4/006-v5.8-ARM-dts-imx6qdl-gw552x-add-USB-OTG-support.patch
diff --git a/target/linux/imx6/patches-5.4/007-v5.8-ARM-dts-imx6qdl-gw560x-add-lsm9ds1-iio-imu-magn-supp.patch b/target/linux/imx/patches-5.4/007-v5.8-ARM-dts-imx6qdl-gw560x-add-lsm9ds1-iio-imu-magn-supp.patch
index 537b6f4d67..537b6f4d67 100644
--- a/target/linux/imx6/patches-5.4/007-v5.8-ARM-dts-imx6qdl-gw560x-add-lsm9ds1-iio-imu-magn-supp.patch
+++ b/target/linux/imx/patches-5.4/007-v5.8-ARM-dts-imx6qdl-gw560x-add-lsm9ds1-iio-imu-magn-supp.patch
diff --git a/target/linux/imx6/patches-5.4/008-v5.8-ARM-dts-imx6qdl-gw5904-add-lsm9ds1-iio-imu-magn-supp.patch b/target/linux/imx/patches-5.4/008-v5.8-ARM-dts-imx6qdl-gw5904-add-lsm9ds1-iio-imu-magn-supp.patch
index 4d24b40535..4d24b40535 100644
--- a/target/linux/imx6/patches-5.4/008-v5.8-ARM-dts-imx6qdl-gw5904-add-lsm9ds1-iio-imu-magn-supp.patch
+++ b/target/linux/imx/patches-5.4/008-v5.8-ARM-dts-imx6qdl-gw5904-add-lsm9ds1-iio-imu-magn-supp.patch
diff --git a/target/linux/imx6/patches-5.4/009-v5.8-ARM-dts-imx6qdl-gw5910-add-support-for-bcm4330-bt.patch b/target/linux/imx/patches-5.4/009-v5.8-ARM-dts-imx6qdl-gw5910-add-support-for-bcm4330-bt.patch
index 545a6fddd5..545a6fddd5 100644
--- a/target/linux/imx6/patches-5.4/009-v5.8-ARM-dts-imx6qdl-gw5910-add-support-for-bcm4330-bt.patch
+++ b/target/linux/imx/patches-5.4/009-v5.8-ARM-dts-imx6qdl-gw5910-add-support-for-bcm4330-bt.patch
diff --git a/target/linux/imx6/patches-5.4/010-v5.8-ARM-dts-imx6qdl-gw5910-fix-wlan-regulator.patch b/target/linux/imx/patches-5.4/010-v5.8-ARM-dts-imx6qdl-gw5910-fix-wlan-regulator.patch
index ce2fa2ee90..ce2fa2ee90 100644
--- a/target/linux/imx6/patches-5.4/010-v5.8-ARM-dts-imx6qdl-gw5910-fix-wlan-regulator.patch
+++ b/target/linux/imx/patches-5.4/010-v5.8-ARM-dts-imx6qdl-gw5910-fix-wlan-regulator.patch
diff --git a/target/linux/imx6/patches-5.4/100-bootargs.patch b/target/linux/imx/patches-5.4/100-bootargs.patch
index cf63a3bdb1..cf63a3bdb1 100644
--- a/target/linux/imx6/patches-5.4/100-bootargs.patch
+++ b/target/linux/imx/patches-5.4/100-bootargs.patch
diff --git a/target/linux/imx6/patches-5.4/301-apalis-ixora-dts-leds.patch b/target/linux/imx/patches-5.4/301-apalis-ixora-dts-leds.patch
index bae9df1734..bae9df1734 100644
--- a/target/linux/imx6/patches-5.4/301-apalis-ixora-dts-leds.patch
+++ b/target/linux/imx/patches-5.4/301-apalis-ixora-dts-leds.patch
diff --git a/target/linux/imx6/patches-5.4/302-apalis-ixora-dts-reset-button.patch b/target/linux/imx/patches-5.4/302-apalis-ixora-dts-reset-button.patch
index f5afb66371..f5afb66371 100644
--- a/target/linux/imx6/patches-5.4/302-apalis-ixora-dts-reset-button.patch
+++ b/target/linux/imx/patches-5.4/302-apalis-ixora-dts-reset-button.patch
diff --git a/target/linux/imx6/profiles/100-default.mk b/target/linux/imx/profiles/100-default.mk
index a025b88888..5e90724a58 100644
--- a/target/linux/imx6/profiles/100-default.mk
+++ b/target/linux/imx/profiles/100-default.mk
@@ -8,7 +8,7 @@ define Profile/Default
 endef
 
 define Profile/Default/Description
- Package set compatible with most NXP i.MX 6 based boards.
+ Package set compatible with most NXP i.MX based boards.
 endef
 
 $(eval $(call Profile,Default))