diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index 6423edf..1a25f24 100644 --- a/conf/machine/apalis-imx6.conf +++ b/conf/machine/apalis-imx6.conf @@ -9,9 +9,14 @@ MACHINEOVERRIDES =. "mx6:mx6q:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa9.inc -PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" -KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb \ - imx6q-apalis-ixora-v1.1.dtb" +PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" +KBUILD_DEFCONFIG:use-nxp-bsp ?= "apalis_imx6_defconfig" +KERNEL_DEVICETREE += " \ + imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb \ + imx6q-apalis-ixora-v1.1.dtb \ +" +KERNEL_DEVICETREE:append:use-nxp-bsp = "imx6q-apalis-ixora-v1.2.dtb" + KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" @@ -35,3 +40,4 @@ WKS_FILE_DEPENDS:append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci" +MACHINE_FIRMWARE:remove = "firmware-imx-epdc" diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf index 7224a38..8438dbc 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -10,8 +10,10 @@ include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" +KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri_imx6_defconfig" KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \ - imx6dl-colibri-aster.dtb" + imx6dl-colibri-aster.dtb imx6dl-colibri-iris.dtb \ + imx6dl-colibri-iris-v2.dtb" KERNEL_DEVICETREE:use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ @@ -34,3 +36,4 @@ WKS_FILE_DEPENDS:append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" +MACHINE_FIRMWARE:remove = "firmware-imx-epdc" diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf index 5470dd0..88f20e9 100644 --- a/conf/machine/colibri-imx6ull.conf +++ b/conf/machine/colibri-imx6ull.conf @@ -9,16 +9,22 @@ MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex" -KERNEL_DEVICETREE += "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" +PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ?= "linux-toradex" +KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri-imx6ull_defconfig" +KERNEL_DEVICETREE += " \ + imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb \ +" +KERNEL_DEVICETREE:append:use_nxp_bsp = " \ + imx6ull-colibri-aster.dtb imx6ull-colibri-wifi-aster.dtb \ + imx6ull-colibri-iris.dtb imx6ull-colibri-wifi-iris.dtb \ + imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-iris-v2.dtb \ +" + KERNEL_IMAGETYPE = "zImage" # The kernel lives in its own ubi volume. RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" -PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" UBOOT_BINARY = "u-boot-nand.imx" diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf index 563a3b2..8c29032 100644 --- a/conf/machine/colibri-imx7-emmc.conf +++ b/conf/machine/colibri-imx7-emmc.conf @@ -2,7 +2,7 @@ #@NAME: Toradex Colibri iMX7 Dual 1GB (eMMC) #@SOC: i.MX 7Dual #@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM (eMMC) -#@MAINTAINER: Stefan Agner +#@MAINTAINER: Max Krummenacher MACHINEOVERRIDES =. "mx7:mx7d:" @@ -10,9 +10,15 @@ include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" - -KERNEL_DEVICETREE = "imx7d-colibri-emmc-eval-v3.dtb" -KERNEL_DEVICETREE:append:use-nxp-bsp = " imx7d-colibri-emmc-aster.dtb" +KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri_imx7_defconfig" +KERNEL_DEVICETREE = " \ + imx7d-colibri-emmc-eval-v3.dtb \ + imx7d-colibri-emmc-aster.dtb \ +" +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ + imx7d-colibri-emmc-iris.dtb \ + imx7d-colibri-emmc-iris-v2.dtb \ +" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" @@ -29,3 +35,4 @@ IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr" WKS_FILE_DEPENDS:append = " u-boot-default-script" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" +MACHINE_FIRMWARE:remove = "firmware-imx-epdc" diff --git a/conf/machine/colibri-imx7-nand.conf b/conf/machine/colibri-imx7-nand.conf index abeacae..a78fd4e 100644 --- a/conf/machine/colibri-imx7-nand.conf +++ b/conf/machine/colibri-imx7-nand.conf @@ -10,27 +10,24 @@ include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex" - +KBUILD_DEFCONFIG:use-nxp-bsp ?= "colibri_imx7_defconfig" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = " \ - imx7d-colibri-eval-v3.dtb \ - imx7s-colibri-eval-v3.dtb \ + imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb \ + imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx7d-colibri-aster.dtb \ - imx7s-colibri-aster.dtb \ + imx7d-colibri-iris.dtb imx7s-colibri-iris.dtb \ + imx7d-colibri-iris-v2.dtb imx7s-colibri-iris-v2.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_PACKAGE_NAME}-base = "" -PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" -PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" # U-Boot NAND binary includes 0x400 padding required for NAND boot @@ -53,3 +50,4 @@ UBI_VOLNAME = "rootfs" SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" +MACHINE_FIRMWARE:remove = "firmware-imx-epdc" diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 1aff090..30621ae 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -2,7 +2,7 @@ #@NAME: Toradex Colibri VF50/VF61 #@SOC: VF500/VF610 #@DESCRIPTION: Machine configuration for Toradex Colibri VF50/VF61 powered by Freescale Vybrid SoC -#@MAINTAINER: Stefan Agner +#@MAINTAINER: Max Krummenacher MACHINEOVERRIDES =. "vf:vf50:vf60:" @@ -27,10 +27,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ # hence no need to deploy the kernel binary in the image itself RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" -PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" PREFERRED_PROVIDER_virtual/kernel-module-mcc ?= "kernel-module-mcc-toradex" PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev ?= "kernel-module-mcc-toradex"