summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-11-10 17:09:52 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-22 17:48:16 +0100
commit192ee0519e9debea9bd1256caf2c5f6745f48edf (patch)
tree2b71b888e009e4453b3ec9ed223e1824df5fa405 /conf
parentf730ff0356ac0671b10daffd531ac70f0de6efb1 (diff)
colibri-imx6ull: prepare for upstreaming to fslc
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/colibri-imx6ull.conf13
-rw-r--r--conf/machine/include/colibri-imx6ull.inc6
2 files changed, 11 insertions, 8 deletions
diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf
index d5d6d5f..7969d96 100644
--- a/conf/machine/colibri-imx6ull.conf
+++ b/conf/machine/colibri-imx6ull.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Toradex Colibri iMX6ULL
-#@SOC: i.MX6 ULL
+#@SOC: i.MX6ULL
#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 ULL SOM
#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
@@ -21,15 +21,12 @@ UBOOT_BINARY = "u-boot-nand.imx"
UBOOT_MAKE_TARGET = "u-boot-nand.imx"
UBOOT_MACHINE ?= "colibri-imx6ull_defconfig"
-IMAGE_CLASSES += "image_type_tezi"
-IMAGE_FSTYPES = "sdcard.gz tar.xz teziimg"
+IMAGE_FSTYPES = "wic.gz tar.xz"
+# wic support
+WKS_FILE = "sdimage-bootpart.wks"
+WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
SERIAL_CONSOLE ?= "115200 ttymxc0"
-TORADEX_PRODUCT_IDS = "0036 0040"
-TORADEX_PRODUCT_IDS[0036] = "imx6ull-colibri-eval-v3.dtb"
-TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb"
-TORADEX_FLASH_TYPE = "rawnand"
-
MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
new file mode 100644
index 0000000..741a7e6
--- /dev/null
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -0,0 +1,6 @@
+IMAGE_CLASSES += "image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
+TORADEX_PRODUCT_IDS = "0036 0040"
+TORADEX_PRODUCT_IDS[0036] = "imx6ull-colibri-eval-v3.dtb"
+TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb"
+TORADEX_FLASH_TYPE = "rawnand"