diff --git a/target/linux/imx6/Makefile b/target/linux/imx/Makefile similarity index 93% rename from target/linux/imx6/Makefile rename to target/linux/imx/Makefile index e735d1d885c..6f00cba9928 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 similarity index 100% rename from target/linux/imx6/base-files/etc/board.d/02_network rename to 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 similarity index 100% rename from target/linux/imx6/base-files/etc/inittab rename to 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 similarity index 100% rename from target/linux/imx6/base-files/lib/imx6.sh rename to 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 similarity index 96% rename from target/linux/imx6/base-files/lib/preinit/79_move_config rename to target/linux/imx/base-files/lib/preinit/79_move_config index baa7ffe44b0..6ed59320ac5 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 similarity index 99% rename from target/linux/imx6/base-files/lib/upgrade/platform.sh rename to target/linux/imx/base-files/lib/upgrade/platform.sh index 79f2a5078ba..e18d59c771b 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 similarity index 100% rename from target/linux/imx6/config-5.10 rename to target/linux/imx/config-5.10 diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx/config-5.4 similarity index 100% rename from target/linux/imx6/config-5.4 rename to 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 similarity index 100% rename from target/linux/imx6/files/firmware/imx/sdma/sdma-imx6q.bin rename to target/linux/imx/files/firmware/imx/sdma/sdma-imx6q.bin diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx/image/Makefile similarity index 100% rename from target/linux/imx6/image/Makefile rename to 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 similarity index 100% rename from target/linux/imx6/image/bootscript-solidrun_cubox-i rename to 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 similarity index 100% rename from target/linux/imx6/image/bootscript-toradex_apalis rename to target/linux/imx/image/bootscript-toradex_apalis diff --git a/target/linux/imx6/image/bootscript-ventana b/target/linux/imx/image/bootscript-ventana similarity index 100% rename from target/linux/imx6/image/bootscript-ventana rename to target/linux/imx/image/bootscript-ventana diff --git a/target/linux/imx6/image/recovery-toradex_apalis b/target/linux/imx/image/recovery-toradex_apalis similarity index 100% rename from target/linux/imx6/image/recovery-toradex_apalis rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.10/100-bootargs.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.10/300-ARM-dts-imx6q-apalis-ixora-add-status-LEDs-aliases.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.10/301-ARM-dts-imx6q-apalis-ixora-make-switch3-reset-button.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/001-ARM-dts-imx-Add-GW5907-board-support.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/002-ARM-dts-imx-Add-GW5910-board-support.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/003-ARM-dts-imx-Add-GW5913-board-support.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/004-ARM-dts-imx-Add-GW5912-board-support.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/005-v5.7-ARM-dts-imx6qdl-gw553x-add-lsm9ds1-iio-imu-magn-supp.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/006-v5.7-ARM-dts-imx-ventana-add-fxos8700-on-gateworks-boards.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/006-v5.7-ARM-dts-imx6qdl-gw5910-add-CC1352-UART.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/006-v5.8-ARM-dts-imx6qdl-gw552x-add-USB-OTG-support.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/007-v5.8-ARM-dts-imx6qdl-gw560x-add-lsm9ds1-iio-imu-magn-supp.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/008-v5.8-ARM-dts-imx6qdl-gw5904-add-lsm9ds1-iio-imu-magn-supp.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/009-v5.8-ARM-dts-imx6qdl-gw5910-add-support-for-bcm4330-bt.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/010-v5.8-ARM-dts-imx6qdl-gw5910-fix-wlan-regulator.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/100-bootargs.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/301-apalis-ixora-dts-leds.patch rename to 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 similarity index 100% rename from target/linux/imx6/patches-5.4/302-apalis-ixora-dts-reset-button.patch rename to 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 similarity index 78% rename from target/linux/imx6/profiles/100-default.mk rename to target/linux/imx/profiles/100-default.mk index a025b888881..5e90724a582 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))