From 666a83e5d135c3191b846287d88636b4624cdee2 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 5 Jan 2014 14:15:08 +0100 Subject: colibri-vf: use meta-fsl* layer for BSP files remove the files copied from meta-fsl* for Colibri-VF V2.1 move the colibri-vf u-boot and kernel stuff to meta-fsl-arm-extra --- conf/machine/colibri-vf.conf | 33 ---------- conf/machine/include/fsl-default-providers.inc | 5 -- conf/machine/include/fsl-default-settings.inc | 3 - conf/machine/include/fsl-default-versions.inc | 1 - conf/machine/include/imx-base.inc | 85 -------------------------- 5 files changed, 127 deletions(-) delete mode 100644 conf/machine/colibri-vf.conf delete mode 100644 conf/machine/include/fsl-default-providers.inc delete mode 100644 conf/machine/include/fsl-default-settings.inc delete mode 100644 conf/machine/include/fsl-default-versions.inc delete mode 100644 conf/machine/include/imx-base.inc (limited to 'conf') diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf deleted file mode 100644 index aef2abe..0000000 --- a/conf/machine/colibri-vf.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: colibri_vf50/colibri_vf61 SOM powered by Freescale Vybrid family -#@SOC: vf50 vf61 -#@DESCRIPTION: Toradex Colibri VF50, Colibri VF61 - -#use hard float -DEFAULTTUNE = "armv7ahf-neon" -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa5.inc - -#TODO -SOC_FAMILY = "vf:vf60" - -PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-vf" -PREFERRED_PROVIDER_u-boot = "u-boot-colibri-vf" -UBOOT_SUFFIX = "nand" -UBOOT_MAKE_TARGET = "" -UBOOT_MACHINE = "colibri_vf_config" - -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" - -SERIAL_CONSOLE = "115200 ttymxc0" - -MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa touchscreen ethernet wifi bluetooth 3g" -EXTRA_IMAGEDEPENDS += "u-boot" - -#Workaround -#if there is /dev/null with correct major and minor number, the userspace RS232 -#console gobbles most of the output. Sometimes there is a kernel oops during -#init. So don't provide any device files during in the rootfs and let the -#tempdevfs do the work -USE_DEVFS = "1" diff --git a/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc deleted file mode 100644 index de15189..0000000 --- a/conf/machine/include/fsl-default-providers.inc +++ /dev/null @@ -1,5 +0,0 @@ -# Freescale BSP default providers - -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx" -PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc" diff --git a/conf/machine/include/fsl-default-settings.inc b/conf/machine/include/fsl-default-settings.inc deleted file mode 100644 index b36e75a..0000000 --- a/conf/machine/include/fsl-default-settings.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Freescale BSP default settings - -IMAGE_CLASSES += "image_types_fsl" diff --git a/conf/machine/include/fsl-default-versions.inc b/conf/machine/include/fsl-default-versions.inc deleted file mode 100644 index d2a4e93..0000000 --- a/conf/machine/include/fsl-default-versions.inc +++ /dev/null @@ -1 +0,0 @@ -# Freescale BSP default versions diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc deleted file mode 100644 index bd293fd..0000000 --- a/conf/machine/include/imx-base.inc +++ /dev/null @@ -1,85 +0,0 @@ -# Provides the i.MX common settings - -include conf/machine/include/fsl-default-settings.inc -include conf/machine/include/fsl-default-versions.inc -include conf/machine/include/fsl-default-providers.inc - -include conf/machine/include/soc-family.inc - -# Disable perf features as 2.6.35.3 fail to build otherwise -PERF_FEATURES_ENABLE = "" - -# Set specific make target and binary suffix -UBOOT_MAKE_TARGET = "u-boot.imx" -UBOOT_SUFFIX ?= "imx" - -UBOOT_ENTRYPOINT_mx3 = "0x80008000" -UBOOT_ENTRYPOINT_mx51 = "0x90008000" -UBOOT_ENTRYPOINT_mx53 = "0x70008000" -UBOOT_ENTRYPOINT_mx6 = "0x10008000" -UBOOT_ENTRYPOINT_mx6sl = "0x80008000" -UBOOT_ENTRYPOINT_vf60 = "0x80008000" - -PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.11.4" - -XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_mx5 = "xf86-video-imxfb" -XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - ${XSERVER_DRIVER}" - -# Ship kernel modules -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" - -# Firmware -MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" -MACHINE_FIRMWARE_append_mx6d = " firmware-imx-vpu-imx6d" -MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d" -MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" -MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" - -# FIXME: Needs addition of firmware-imx of official BSPs -#MACHINE_FIRMWARE_append_mx35 = " firmware-imx-sdma-imx35" -#MACHINE_FIRMWARE_append_mx31 = " firmware-imx-sdma-imx31" -#MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27" -#MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25" - -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" - -# Extra audio support -# FIXME: Add support for ALL SoC families -MACHINE_EXTRA_RRECOMMENDS_append_mx5 = " imx-audio" -MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " imx-audio" - -# Extra udev rules -MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf" - -# Gstreamer plugin -MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" -MACHINE_GSTREAMER_PLUGIN_mx3 ?= "" - -# mx5 GPU libraries -PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51" -PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51" -PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-x11-bin-mx51" - -# mx6 GPU libraries -PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q" -PREFERRED_PROVIDER_virtual/libgl_mx6 ?= "gpu-viv-bin-mx6q" -PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q" -PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q" - -PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc" - -EXTRA_IMAGEDEPENDS = "u-boot" - -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" - -SERIAL_CONSOLE = "115200 ttymxc0" - -KERNEL_IMAGETYPE = "uImage" - -MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" -- cgit v1.2.3