diff options
| -rw-r--r-- | package/boot/imx-bootlets/Makefile | 6 | ||||
| -rw-r--r-- | package/boot/uboot-imx23/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/mxs/Makefile (renamed from target/linux/imx23/Makefile) | 6 | ||||
| -rw-r--r-- | target/linux/mxs/base-files/etc/inittab (renamed from target/linux/imx23/base-files/etc/inittab) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/config-default (renamed from target/linux/imx23/config-default) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/image/Makefile (renamed from target/linux/imx23/image/Makefile) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/modules.mk (renamed from target/linux/imx23/modules.mk) | 30 | ||||
| -rw-r--r-- | target/linux/mxs/patches/100-soc-audio-support.patch (renamed from target/linux/imx23/patches/100-soc-audio-support.patch) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/patches/101-soc-audio-dts.patch (renamed from target/linux/imx23/patches/101-soc-audio-dts.patch) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/patches/105-imx23-dcp.patch (renamed from target/linux/imx23/patches/105-imx23-dcp.patch) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/patches/106-add-dcp-dts.patch (renamed from target/linux/imx23/patches/106-add-dcp-dts.patch) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/patches/110-lradc-dts.patch (renamed from target/linux/imx23/patches/110-lradc-dts.patch) | 0 | ||||
| -rw-r--r-- | target/linux/mxs/profiles/01-olinuxino.mk (renamed from target/linux/imx23/profiles/01-olinuxino.mk) | 4 | ||||
| -rw-r--r-- | tools/Makefile | 2 |
14 files changed, 25 insertions, 25 deletions
diff --git a/package/boot/imx-bootlets/Makefile b/package/boot/imx-bootlets/Makefile index 1c6a23c06f..2ff60ee2f8 100644 --- a/package/boot/imx-bootlets/Makefile +++ b/package/boot/imx-bootlets/Makefile @@ -18,12 +18,12 @@ include $(INCLUDE_DIR)/package.mk define Package/imx-bootlets SECTION:=boot CATEGORY:=Boot Loaders - TITLE:=i.MX23 bootlets - DEPENDS:=@TARGET_imx23 + TITLE:=i.MX23/i.MX28 bootlets + DEPENDS:=@TARGET_mxs endef define Package/imx-bootlets/description - i.MX23 bootlets (for oLinuxino) + i.MX23/i.MX28 bootlets (for oLinuxino) endef define Build/Compile diff --git a/package/boot/uboot-imx23/Makefile b/package/boot/uboot-imx23/Makefile index 13f1f963cd..f41b23db16 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 index 9195c2c95d..fe08898fd3 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 series FEATURES:=ext4 rtc usb gpio CPU_TYPE:=arm926ej-s @@ -17,7 +17,7 @@ LINUX_VERSION:=3.10.15 KERNELNAME:="zImage dtbs" define Target/Description - Support for Freescale i.MX233-based boards + Support for Freescale i.MX23/i.MX28 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 index 09359b79d8..09359b79d8 100644 --- a/target/linux/imx23/base-files/etc/inittab +++ b/target/linux/mxs/base-files/etc/inittab diff --git a/target/linux/imx23/config-default b/target/linux/mxs/config-default index 7d05e9f537..7d05e9f537 100644 --- a/target/linux/imx23/config-default +++ b/target/linux/mxs/config-default diff --git a/target/linux/imx23/image/Makefile b/target/linux/mxs/image/Makefile index b9102375d6..b9102375d6 100644 --- a/target/linux/imx23/image/Makefile +++ b/target/linux/mxs/image/Makefile diff --git a/target/linux/imx23/modules.mk b/target/linux/mxs/modules.mk index f999c31e85..90967391f0 100644 --- a/target/linux/imx23/modules.mk +++ b/target/linux/mxs/modules.mk @@ -7,9 +7,9 @@ define KernelPackage/rtc-stmp3xxx SUBMENU:=$(OTHER_MENU) TITLE:=STMP3xxx SoC built-in RTC support - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs $(call AddDepends/rtc) - KCONFIG:=\ + KCONFIG:= \ CONFIG_RTC_CLASS=y \ CONFIG_RTC_DRV_STMP=m FILES:=$(LINUX_DIR)/drivers/rtc/rtc-stmp3xxx.ko @@ -34,16 +34,16 @@ endef $(eval $(call KernelPackage,wdt-stmp3xxx)) define KernelPackage/usb-chipidea-imx - TITLE:=Support for ChipIdea controllers on i.MX - DEPENDS:=+kmod-usb-chipidea @TARGET_imx23 - FILES:=\ + TITLE:=Support for ChipIdea controllers on Freescale i.MX SoCs + DEPENDS:=+kmod-usb-chipidea @TARGET_mxs + FILES:= \ $(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko AUTOLOAD:=$(call AutoLoad,52,ci13xxx_imx,1) $(call AddDepends/usb) endef define KernelPackage/usb-chipidea-imx/description - Kernel support for USB ChipIdea controllers on i.MX + Kernel support for USB ChipIdea controllers on Freescale i.MX SoCs endef $(eval $(call KernelPackage,usb-chipidea-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) @@ -79,8 +79,8 @@ endef $(eval $(call KernelPackage,usb-net-smsc95xx)) -define KernelPackage/sound-soc-imx23 - TITLE:=Freescale i.MX233 built-in SoC sound support +define KernelPackage/sound-soc-mxs + TITLE:=Freescale i.MX23/i.MX28 built-in SoC sound support KCONFIG:= \ CONFIG_SND_SOC_MXS_BUILTIN_CODEC \ CONFIG_SND_MXS_SOC_BUILTIN @@ -90,20 +90,20 @@ 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 -define KernelPackage/sound-soc-imx23/description - Kernel support for i.MX233 built-in SoC audio +define KernelPackage/sound-soc-mxs/description + Kernel support for Freescale i.MX23/i.MX28 built-in SoC audio endef -$(eval $(call KernelPackage,sound-soc-imx23)) +$(eval $(call KernelPackage,sound-soc-mxs)) 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 index ef07f92c78..ef07f92c78 100644 --- a/target/linux/imx23/patches/100-soc-audio-support.patch +++ b/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 index 924cbebb08..924cbebb08 100644 --- a/target/linux/imx23/patches/101-soc-audio-dts.patch +++ b/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 index ae74209775..ae74209775 100644 --- a/target/linux/imx23/patches/105-imx23-dcp.patch +++ b/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 index ddb223c38c..ddb223c38c 100644 --- a/target/linux/imx23/patches/106-add-dcp-dts.patch +++ b/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 index a2b9886959..a2b9886959 100644 --- a/target/linux/imx23/patches/110-lradc-dts.patch +++ b/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 index 252f99a854..9308cff8fc 100644 --- a/target/linux/imx23/profiles/01-olinuxino.mk +++ b/target/linux/mxs/profiles/01-olinuxino.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ define Profile/olinuxino NAME:=Olimex Olinuxino boards PACKAGES += imx-bootlets kmod-usb-mxs-phy kmod-usb-net kmod-usb-net-smsc95xx \ kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat kmod-rtc-stmp3xxx \ - kmod-sound-core kmod-sound-soc-imx23 kmod-iio-mxs-lradc + kmod-sound-core kmod-sound-soc-mxs kmod-iio-mxs-lradc endef define Profile/olinuxino/Description diff --git a/tools/Makefile b/tools/Makefile index b167a60544..7fea248113 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 |