summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2016-01-11 14:17:37 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-03-14 14:26:27 +0100
commit42b65abefd5160256559bf121a67ae4ec490abda (patch)
treef151abd9a7808fbbb1e819f32ef88f09cef63b62 /conf
parent6211e2d2cade1540baf49b755e87d5ca2d737808 (diff)
Apalis/Colibri iMX6: drop in favour of meta-fsl-arm-extra
machine/u-boot/kernel files have been added to meta-fsl-arm-extra. Use them from there now. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx6.conf24
-rw-r--r--conf/machine/colibri-imx6.conf23
2 files changed, 0 insertions, 47 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
deleted file mode 100644
index ab897d7..0000000
--- a/conf/machine/apalis-imx6.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: Toradex Apalis iMX6Q/D
-#@SOC: i.MX6
-#@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM
-
-DEFAULTTUNE_mx6 = "armv7athf-neon"
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
-
-SOC_FAMILY = "mx6:mx6q"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
-KERNEL_DEVICETREE = "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
- imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb"
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_MACHINE = "apalis_imx6_defconfig"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci "
-EXTRA_IMAGEDEPENDS += "u-boot"
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
deleted file mode 100644
index 7812e02..0000000
--- a/conf/machine/colibri-imx6.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#@TYPE: Machine
-#@NAME: Toradex Colibri iMX6DL/S
-#@SOC: i.MX6 DL/S
-#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 SOM
-
-DEFAULTTUNE_mx6 = "armv7athf-neon"
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
-
-SOC_FAMILY = "mx6:mx6dl"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
-KERNEL_DEVICETREE = "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_MACHINE = "colibri_imx6_defconfig"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
-EXTRA_IMAGEDEPENDS += "u-boot"