diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-01-03 14:53:03 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-05-12 10:04:33 +0200 |
| commit | 5ef294c1b0f7648d0a4f3a3c37a644ffaade336f (patch) | |
| tree | b38a66f529991bff7a41009bf5c7b24a5b1fc7db /conf | |
| parent | c6b22592c65fb7c0bb220d44bf43e71f55a006aa (diff) | |
Apalis/Colibri iMX6 build kernel uImage
The default changed to zImage so explicit set uImage for now.
While at it cleanup the recipe, remove pci from Colibri machine features.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/apalis-imx6.conf | 6 | ||||
| -rw-r--r-- | conf/machine/colibri-imx6.conf | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index 17263c5..23d6528 100644 --- a/conf/machine/apalis-imx6.conf +++ b/conf/machine/apalis-imx6.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: Toradex Apalis iMX6 +#@NAME: Toradex Apalis iMX6Q/D #@SOC: i.MX6 #@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM @@ -13,15 +13,13 @@ 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-eval_v1_0.dtb" +KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%" # don't pull in systemd 216 backported into meta-angstrom PREFERRED_VERSION_systemd = "211%" -# Ensure boot scripts will be available at rootfs time -#do_rootfs[depends] += "u-boot-script-boundary:do_deploy" - UBOOT_MACHINE = "apalis_imx6q1g_config" SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf index a8d2384..25c1f36 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -13,18 +13,16 @@ 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" +KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%" # don't pull in systemd 216 backported into meta-angstrom PREFERRED_VERSION_systemd = "211%" -# Ensure boot scripts will be available at rootfs time -#do_rootfs[depends] += "u-boot-script-boundary:do_deploy" - UBOOT_MACHINE = "colibri_imx6s256m_config" SERIAL_CONSOLE = "115200 ttymxc0" -MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " +MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" EXTRA_IMAGEDEPENDS += "u-boot" |