imx6: move profile definitions to the image/Makefile

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index 584ac7a060f99e707deb528b2a7c42e0405e6794..931076f9141c819b0d7efb35a1a5dd66cd9402bc 100644 (file)
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -116,7 +116,8 @@ endef
 DEVICE_VARS += DEVICE_DTS
 
 define Device/ventana
-       PROFILES = Generic VENTANA
+       PROFILES := Generic VENTANA
+       DEVICE_TITLE := Gateworks Ventana family
        DEVICE_DTS:= \
                imx6dl-gw51xx \
                imx6dl-gw52xx \
@@ -131,16 +132,24 @@ define Device/ventana
                imx6q-gw5400-a \
                imx6q-gw551x \
                imx6q-gw552x
+       DEVICE_PACKAGES := kmod-thermal-imx kmod-sky2 kmod-usb-chipidea-imx kmod-usb-mxs-phy \
+               kmod-sound-core kmod-sound-soc-imx kmod-sound-soc-imx-sgtl5000 \
+               kmod-can kmod-can-flexcan kmod-can-raw \
+               kmod-rtc-ds1672 kmod-gpio-pca953x kmod-hwmon-gsc kmod-eeprom-at24 \
+               kmod-leds-gpio kmod-pps-gpio kmod-gw16083 \
+               kobs-ng
        IMAGES := nand_normal.ubi nand_large.ubi bootfs.tar.gz
        IMAGE/nand_normal.ubi := ubi-boot-overlay normal 2048 124KiB 128KiB 8124
        IMAGE/nand_large.ubi := ubi-boot-overlay large 4096 248KiB 256KiB 8124
        IMAGE/bootfs.tar.gz := bootfs.tar.gz
-       IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2)
+       IMAGE_NAME := $$(IMAGE_PREFIX)-$$(1)-$$(2)
 endef
 
 define Device/wandboard
-       PROFILES = Generic IMX6DL_WANDBOARD
+       PROFILES := Generic IMX6DL_WANDBOARD
+       DEVICE_TITLE := Wandboard Dual
        DEVICE_DTS := imx6dl-wandboard
+       DEVICE_PACKAGES := kmod-thermal-imx kmod-usb-chipidea-imx kmod-usb-mxs-phy
 endef
 
 TARGET_DEVICES += \

diff --git a/target/linux/imx6/profiles/100-generic.mk b/target/linux/imx6/profiles/100-generic.mk
index cdb58e4a1eca9af2213a87afbf379d54c93a0d4b..d977f9ab775c3e0524a00eb4db0d6534e7ce5e1f 100644 (file)
--- a/target/linux/imx6/profiles/100-generic.mk
+++ b/target/linux/imx6/profiles/100-generic.mk
@@ -6,6 +6,7 @@
 #
 
 define Profile/Generic
+  PRIORITY:=1
   NAME:=Generic (default)
   PACKAGES:= \
        kmod-thermal-imx kmod-usb-chipidea-imx kmod-usb-mxs-phy

diff --git a/target/linux/imx6/profiles/110-wandboard.mk b/target/linux/imx6/profiles/110-wandboard.mk
deleted file mode 100644 (file)
index 0763355..0000000
--- a/target/linux/imx6/profiles/110-wandboard.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/IMX6DL_WANDBOARD
-  NAME:=Wandboard Dual
-  PACKAGES:= \
-       kmod-thermal-imx kmod-usb-chipidea-imx kmod-usb-mxs-phy
-endef
-
-$(eval $(call Profile,IMX6DL_WANDBOARD))

diff --git a/target/linux/imx6/profiles/120-gateworks.mk b/target/linux/imx6/profiles/120-gateworks.mk
deleted file mode 100644 (file)
index 87b5821..0000000
--- a/target/linux/imx6/profiles/120-gateworks.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/VENTANA
-  NAME:=Gateworks Ventana family
-  PACKAGES:= \
-       kmod-thermal-imx kmod-sky2 kmod-usb-chipidea-imx kmod-usb-mxs-phy \
-       kmod-sound-core kmod-sound-soc-imx kmod-sound-soc-imx-sgtl5000 \
-       kmod-can kmod-can-flexcan kmod-can-raw \
-       kmod-rtc-ds1672 kmod-gpio-pca953x kmod-hwmon-gsc kmod-eeprom-at24 \
-       kmod-leds-gpio kmod-pps-gpio kmod-gw16083 \
-       kobs-ng
-endef
-
-define Profile/VENTANA/Description
- The Gateworks Ventana family of products is based on the Freescale i.MX6Q SoC
- and offers a large variety of peripherals such as:
-
-  * DDR3
-  * NAND or SPI flash
-  * multiple PCIe (with USB for Cellular modems)
-  * Optional expansion for additional USB/PCI based periperhals
-  * USB EHCI
-  * USB OTG
-  * HDMI Audio/Video in/out
-  * Analog Video in/out
-  * Analog Audio in/out
-  * Gateworks System Controller
-  * Optional GPS with PPS
-  * Canbus
-  * User GPIO
-  * mSATA
-endef
-
-$(eval $(call Profile,VENTANA))