summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-05-06 12:25:59 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-23 22:15:42 +0100
commit630001b63e35258d074313f1d8882488ec998df8 (patch)
treef6f5a6a6efdb3f6a00707b5b417d320a902ea66d
parentc75fd6cad03715ea248ad363719eee8741ae046a (diff)
machines: upstream changes for 2.7.4 image
Add a inc file to allow downstream specific amendments. Currently used to inject Toradex Easy Installer image creation. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--conf/machine/apalis-imx6.conf42
-rw-r--r--conf/machine/colibri-imx6.conf41
-rw-r--r--conf/machine/colibri-imx7.conf43
-rw-r--r--conf/machine/include/README1
-rw-r--r--conf/machine/include/apalis-imx6.inc15
-rw-r--r--conf/machine/include/colibri-imx6.inc11
-rw-r--r--conf/machine/include/colibri-imx7.inc7
-rw-r--r--conf/machine/include/colibri-vf.inc8
8 files changed, 42 insertions, 126 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
deleted file mode 100644
index 1858145..0000000
--- a/conf/machine/apalis-imx6.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#@TYPE: Machine
-#@NAME: Toradex Apalis iMX6Q/D
-#@SOC: i.MX6
-#@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM
-#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
-
-MACHINEOVERRIDES =. "mx6:mx6q:"
-
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
-KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
- imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb \
- imx6q-apalis-ixora-v1.1.dtb"
-KERNEL_IMAGETYPE = "uImage"
-# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
-RDEPENDS_kernel-base = ""
-
-PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-SPL_BINARY = "SPL"
-# The SPL configures the DDR RAM depending on the module it runs on. Thus there
-# is no need to distingush between the different module types.
-# For recovery mode we build a U-Boot with save timings for all known Apalis iMX6
-# Note: The last config will be symlinked to UBOOT_BINARY which is crucial for
-# certain image formats.
-UBOOT_CONFIG ??= "recover spl"
-UBOOT_CONFIG[spl] = "apalis_imx6_defconfig,,u-boot.img"
-UBOOT_CONFIG[recover] = "apalis_imx6_nospl_it_defconfig,,u-boot.imx"
-UBOOT_MAKE_TARGET = ""
-# The payload offsets are given in number of 512 byte blocks.
-OFFSET_BOOTROM_PAYLOAD = "2"
-OFFSET_SPL_PAYLOAD = "138"
-
-IMAGE_CLASSES += "image_type_tezi"
-IMAGE_FSTYPES = "tar.xz teziimg"
-
-SERIAL_CONSOLE ?= "115200 ttymxc0"
-TORADEX_PRODUCT_IDS_apalis-imx6 = "0027 0028 0029 0035"
-
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci"
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
deleted file mode 100644
index 3ed15e9..0000000
--- a/conf/machine/colibri-imx6.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#@TYPE: Machine
-#@NAME: Toradex Colibri iMX6DL/S
-#@SOC: i.MX6 DL/S
-#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 SOM
-#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
-
-MACHINEOVERRIDES =. "mx6:mx6dl:"
-
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
-KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb imx6dl-colibri-aster.dtb"
-KERNEL_IMAGETYPE = "uImage"
-# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
-RDEPENDS_kernel-base = ""
-
-PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-SPL_BINARY = "SPL"
-# The SPL configures the DDR RAM depending on the module it runs on. Thus there
-# is no need to distingush between the different module types.
-# For recovery mode we build a U-Boot with save timings for all known Apalis iMX6
-# Note: The last config will be symlinked to UBOOT_BINARY which is crucial for
-# certain image formats.
-UBOOT_CONFIG ??= "recover spl"
-UBOOT_CONFIG[spl] = "colibri_imx6_defconfig,,u-boot.img"
-UBOOT_CONFIG[recover] = "colibri_imx6_nospl_defconfig,,u-boot.imx"
-UBOOT_MAKE_TARGET = ""
-# The payload offsets are given in number of 512 byte blocks.
-OFFSET_BOOTROM_PAYLOAD = "2"
-OFFSET_SPL_PAYLOAD = "138"
-
-IMAGE_CLASSES += "image_type_tezi"
-IMAGE_FSTYPES = "sdcard.gz tar.xz teziimg"
-
-SERIAL_CONSOLE ?= "115200 ttymxc0"
-
-TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
-
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
deleted file mode 100644
index e9e4d8d..0000000
--- a/conf/machine/colibri-imx7.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: Toradex Colibri iMX7D/S
-#@SOC: i.MX 7Dual / i.MX 7Solo
-#@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM
-#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
-
-MACHINEOVERRIDES =. "mx7:mx7d:"
-
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa7.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE += "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb"
-
-# U-Boot of our newer release read the Kernel and device tree from static UBI
-# volumes, hence no need to deploy the kernel binary in the image itself
-RDEPENDS_kernel-base = ""
-
-PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
-
-# U-Boot NAND binary includes 0x400 padding required for NAND boot
-UBOOT_BINARY = "u-boot-nand.imx"
-UBOOT_MAKE_TARGET = "u-boot-nand.imx"
-UBOOT_MACHINE ?= "colibri_imx7_defconfig"
-
-IMAGE_CLASSES += "image_type_tezi"
-IMAGE_FSTYPES = "sdcard.gz tar.xz ubifs teziimg"
-
-# Enable free --space-fixup (-F) by default, this allows DFU updates
-MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F"
-UBINIZE_ARGS = " -p 128KiB -m 2048 -s 2048"
-UBI_VOLNAME = "rootfs"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-TORADEX_PRODUCT_IDS = "0032 0033"
-TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
-TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
-TORADEX_FLASH_TYPE = "rawnand"
-
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
diff --git a/conf/machine/include/README b/conf/machine/include/README
new file mode 100644
index 0000000..0453a9f
--- /dev/null
+++ b/conf/machine/include/README
@@ -0,0 +1 @@
+The ${MACHINE}.inc files get included from this layers layer.conf
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
new file mode 100644
index 0000000..165ba66
--- /dev/null
+++ b/conf/machine/include/apalis-imx6.inc
@@ -0,0 +1,15 @@
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
+TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
+# The payload offsets are given in number of 512 byte blocks.
+OFFSET_BOOTROM_PAYLOAD = "2"
+OFFSET_SPL_PAYLOAD = "138"
+
+# The SPL configures the DDR RAM depending on the module it runs on. Thus there
+# is no need to distingush between the different module types.
+# For recovery mode we build a U-Boot with IVT which runs without SPL. It uses
+# save timings for all known Apalis iMX6.
+# Note: The last config will be symlinked to UBOOT_BINARY which is crucial for
+# certain image formats.
+UBOOT_CONFIG ?= "recover spl"
+UBOOT_CONFIG[recover] = "apalis_imx6_nospl_it_defconfig,,u-boot.imx"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
new file mode 100644
index 0000000..e8cbed0
--- /dev/null
+++ b/conf/machine/include/colibri-imx6.inc
@@ -0,0 +1,11 @@
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
+TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
+# The payload offsets are given in number of 512 byte blocks.
+OFFSET_BOOTROM_PAYLOAD = "2"
+OFFSET_SPL_PAYLOAD = "138"
+
+# Note: The last config will be symlinked to UBOOT_BINARY which is crucial for
+# certain image formats.
+UBOOT_CONFIG ?= "recover spl"
+UBOOT_CONFIG[recover] = "colibri_imx6_nospl_defconfig,,u-boot.imx"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
new file mode 100644
index 0000000..761f053
--- /dev/null
+++ b/conf/machine/include/colibri-imx7.inc
@@ -0,0 +1,7 @@
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
+TORADEX_PRODUCT_IDS = "0032 0033"
+TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
+TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
+TORADEX_FLASH_TYPE = "rawnand"
+
diff --git a/conf/machine/include/colibri-vf.inc b/conf/machine/include/colibri-vf.inc
new file mode 100644
index 0000000..b5ffe09
--- /dev/null
+++ b/conf/machine/include/colibri-vf.inc
@@ -0,0 +1,8 @@
+#IMAGE_CLASSES_append = " image_type_tezi"
+#IMAGE_FSTYPES_append = " teziimg"
+TORADEX_PRODUCT_IDS = "0010 0011 0012 0013"
+TORADEX_PRODUCT_IDS[0010] = "vf500-colibri-eval-v3.dts"
+TORADEX_PRODUCT_IDS[0011] = "vf610-colibri-eval-v3.dts"
+TORADEX_PRODUCT_IDS[0012] = "vf610-colibri-eval-v3.dts"
+TORADEX_PRODUCT_IDS[0013] = "vf500-colibri-eval-v3.dts"
+TORADEX_FLASH_TYPE = "rawnand"