Freescale's i.MX23 and i.MX28 series micro processors are very similar. The linux kernel include support for both CPU series under the name 'mxs' so let's follow this naming scheme. This prevents opening a new OpenWRT target (e.g. imx28) when support for i.MX28 based devices was introduced.
Signed-off-by: Michael Heimpold <[email protected]> --- Hi Florian, thanks for the hint, looks clearly better now :-) Regards, Michael package/boot/imx-bootlets/Makefile | 2 +- package/boot/uboot-imx23/Makefile | 2 +- target/linux/{imx23 => mxs}/Makefile | 6 +++--- target/linux/{imx23 => mxs}/base-files/etc/inittab | 0 target/linux/{imx23 => mxs}/config-default | 0 target/linux/{imx23 => mxs}/image/Makefile | 0 target/linux/{imx23 => mxs}/modules.mk | 12 ++++++------ .../{imx23 => mxs}/patches/100-soc-audio-support.patch | 0 .../linux/{imx23 => mxs}/patches/101-soc-audio-dts.patch | 0 target/linux/{imx23 => mxs}/patches/105-imx23-dcp.patch | 0 target/linux/{imx23 => mxs}/patches/106-add-dcp-dts.patch | 0 target/linux/{imx23 => mxs}/patches/110-lradc-dts.patch | 0 target/linux/{imx23 => mxs}/profiles/01-olinuxino.mk | 0 tools/Makefile | 2 +- 14 files changed, 12 insertions(+), 12 deletions(-) rename target/linux/{imx23 => mxs}/Makefile (83%) rename target/linux/{imx23 => mxs}/base-files/etc/inittab (100%) rename target/linux/{imx23 => mxs}/config-default (100%) rename target/linux/{imx23 => mxs}/image/Makefile (100%) rename target/linux/{imx23 => mxs}/modules.mk (95%) rename target/linux/{imx23 => mxs}/patches/100-soc-audio-support.patch (100%) rename target/linux/{imx23 => mxs}/patches/101-soc-audio-dts.patch (100%) rename target/linux/{imx23 => mxs}/patches/105-imx23-dcp.patch (100%) rename target/linux/{imx23 => mxs}/patches/106-add-dcp-dts.patch (100%) rename target/linux/{imx23 => mxs}/patches/110-lradc-dts.patch (100%) rename target/linux/{imx23 => mxs}/profiles/01-olinuxino.mk (100%) diff --git a/package/boot/imx-bootlets/Makefile b/package/boot/imx-bootlets/Makefile index 1c6a23c..a5b7738 100644 --- a/package/boot/imx-bootlets/Makefile +++ b/package/boot/imx-bootlets/Makefile @@ -19,7 +19,7 @@ define Package/imx-bootlets SECTION:=boot CATEGORY:=Boot Loaders TITLE:=i.MX23 bootlets - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs endef define Package/imx-bootlets/description diff --git a/package/boot/uboot-imx23/Makefile b/package/boot/uboot-imx23/Makefile index 13f1f96..f41b23d 100644 --- a/package/boot/uboot-imx23/Makefile +++ b/package/boot/uboot-imx23/Makefile @@ -35,7 +35,7 @@ define Package/uboot/template define Package/uboot-imx23-$(1) SECTION:=boot CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs TITLE:=$(2) URL:=http://www.denx.de/wiki/U-Boot VARIANT:=$(1) diff --git a/target/linux/imx23/Makefile b/target/linux/mxs/Makefile similarity index 83% rename from target/linux/imx23/Makefile rename to target/linux/mxs/Makefile index 4eec4b9..c1a94cc 100644 --- a/target/linux/imx23/Makefile +++ b/target/linux/mxs/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk ARCH:=arm -BOARD:=imx23 -BOARDNAME:=Freescale i.MX23 series +BOARD:=mxs +BOARDNAME:=Freescale i.MX23/i.MX28 FEATURES:=ext4 rtc usb gpio CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s MAINTAINER:=Zoltan HERPAI <[email protected]> @@ -16,7 +16,7 @@ LINUX_VERSION:=3.10.9 KERNELNAME:="zImage dtbs" define Target/Description - Support for Freescale i.MX233-based boards + Support for Freescale i.MX23/i.MX28-based boards. endef include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx23/base-files/etc/inittab b/target/linux/mxs/base-files/etc/inittab similarity index 100% rename from target/linux/imx23/base-files/etc/inittab rename to target/linux/mxs/base-files/etc/inittab diff --git a/target/linux/imx23/config-default b/target/linux/mxs/config-default similarity index 100% rename from target/linux/imx23/config-default rename to target/linux/mxs/config-default diff --git a/target/linux/imx23/image/Makefile b/target/linux/mxs/image/Makefile similarity index 100% rename from target/linux/imx23/image/Makefile rename to target/linux/mxs/image/Makefile diff --git a/target/linux/imx23/modules.mk b/target/linux/mxs/modules.mk similarity index 95% rename from target/linux/imx23/modules.mk rename to target/linux/mxs/modules.mk index f999c31..ef8a86b 100644 --- a/target/linux/imx23/modules.mk +++ b/target/linux/mxs/modules.mk @@ -7,7 +7,7 @@ define KernelPackage/rtc-stmp3xxx SUBMENU:=$(OTHER_MENU) TITLE:=STMP3xxx SoC built-in RTC support - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs $(call AddDepends/rtc) KCONFIG:=\ CONFIG_RTC_CLASS=y \ @@ -35,7 +35,7 @@ $(eval $(call KernelPackage,wdt-stmp3xxx)) define KernelPackage/usb-chipidea-imx TITLE:=Support for ChipIdea controllers on i.MX - DEPENDS:=+kmod-usb-chipidea @TARGET_imx23 + DEPENDS:=+kmod-usb-chipidea @TARGET_mxs FILES:=\ $(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko AUTOLOAD:=$(call AutoLoad,52,ci13xxx_imx,1) @@ -66,7 +66,7 @@ $(eval $(call KernelPackage,usb-mxs-phy,1)) define KernelPackage/usb-net-smsc95xx TITLE:=SMSC95xx USB/2.0 Ethernet driver - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs KCONFIG:=CONFIG_USB_NET_SMSC95XX FILES:=$(LINUX_DIR)/drivers/net/usb/smsc95xx.ko AUTOLOAD:=$(call AutoLoad,64,smsc95xx) @@ -90,7 +90,7 @@ define KernelPackage/sound-soc-imx23 $(LINUX_DIR)/sound/soc/mxs/snd-soc-mxs-builtin-pcm.ko \ $(LINUX_DIR)/sound/soc/codecs/snd-soc-mxs-builtin-codec.ko AUTOLOAD:=$(call AutoLoad,65,snd-soc-mxs-builtin-pcm snd-soc-mxs-builtin-dai snd-soc-mxs-builtin-codec snd-soc-mxs-builtin-audio) - DEPENDS:=@TARGET_imx23 +kmod-sound-soc-core + DEPENDS:=@TARGET_mxs +kmod-sound-soc-core $(call AddDepends/sound) endef @@ -103,7 +103,7 @@ $(eval $(call KernelPackage,sound-soc-imx23)) define KernelPackage/iio-mxs-lradc SUBMENU:=$(OTHER_MENU) TITLE:=LRADC driver for i.MX23/28 - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs KCONFIG:=CONFIG_MXS_LRADC FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/mxs-lradc.ko \ $(LINUX_DIR)/drivers/iio/industrialio-triggered-buffer.ko @@ -118,7 +118,7 @@ $(eval $(call KernelPackage,iio-mxs-lradc)) define KernelPackage/crypto-hw-dcp TITLE:=i.MX23/28 DCP hardware crypto module - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs KCONFIG:=CONFIG_CRYPTO_DEV_DCP FILES:=$(LINUX_DIR)/drivers/crypto/dcp.ko AUTOLOAD:=$(call AutoLoad,90,dcp) diff --git a/target/linux/imx23/patches/100-soc-audio-support.patch b/target/linux/mxs/patches/100-soc-audio-support.patch similarity index 100% rename from target/linux/imx23/patches/100-soc-audio-support.patch rename to target/linux/mxs/patches/100-soc-audio-support.patch diff --git a/target/linux/imx23/patches/101-soc-audio-dts.patch b/target/linux/mxs/patches/101-soc-audio-dts.patch similarity index 100% rename from target/linux/imx23/patches/101-soc-audio-dts.patch rename to target/linux/mxs/patches/101-soc-audio-dts.patch diff --git a/target/linux/imx23/patches/105-imx23-dcp.patch b/target/linux/mxs/patches/105-imx23-dcp.patch similarity index 100% rename from target/linux/imx23/patches/105-imx23-dcp.patch rename to target/linux/mxs/patches/105-imx23-dcp.patch diff --git a/target/linux/imx23/patches/106-add-dcp-dts.patch b/target/linux/mxs/patches/106-add-dcp-dts.patch similarity index 100% rename from target/linux/imx23/patches/106-add-dcp-dts.patch rename to target/linux/mxs/patches/106-add-dcp-dts.patch diff --git a/target/linux/imx23/patches/110-lradc-dts.patch b/target/linux/mxs/patches/110-lradc-dts.patch similarity index 100% rename from target/linux/imx23/patches/110-lradc-dts.patch rename to target/linux/mxs/patches/110-lradc-dts.patch diff --git a/target/linux/imx23/profiles/01-olinuxino.mk b/target/linux/mxs/profiles/01-olinuxino.mk similarity index 100% rename from target/linux/imx23/profiles/01-olinuxino.mk rename to target/linux/mxs/profiles/01-olinuxino.mk diff --git a/tools/Makefile b/tools/Makefile index d0dc53b..2eb0609 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,7 +21,7 @@ tools-y += findutils tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_powerpc) += upx tools-$(CONFIG_TARGET_x86) += qemu -tools-$(CONFIG_TARGET_imx23) += elftosb +tools-$(CONFIG_TARGET_mxs) += elftosb tools-$(CONFIG_TARGET_brcm2708) += mtools dosfstools ifneq ($(CONFIG_TARGET_ar71xx),) tools-y += lzma-old squashfs -- 1.7.10.4 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
