From b04ed6aa877f78cda6fb667fc10447afd5a706a1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 11 Jan 2016 14:17:37 +0100 Subject: Apalis/Colibri iMX6: drop in favour of meta-fsl-arm-extra machine/u-boot/kernel files have been added to meta-fsl-arm-extra. Use them from there now. Signed-off-by: Max Krummenacher Signed-off-by: Stefan Agner --- conf/machine/apalis-imx6.conf | 24 --------- conf/machine/colibri-imx6.conf | 23 -------- recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb | 35 ------------ recipes-kernel/linux/linux-toradex-fsl_git.bb | 77 --------------------------- 4 files changed, 159 deletions(-) delete mode 100644 conf/machine/apalis-imx6.conf delete mode 100644 conf/machine/colibri-imx6.conf delete mode 100644 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb delete mode 100644 recipes-kernel/linux/linux-toradex-fsl_git.bb diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf deleted file mode 100644 index ab897d7..0000000 --- a/conf/machine/apalis-imx6.conf +++ /dev/null @@ -1,24 +0,0 @@ -#@TYPE: Machine -#@NAME: Toradex Apalis iMX6Q/D -#@SOC: i.MX6 -#@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM - -DEFAULTTUNE_mx6 = "armv7athf-neon" -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc - -SOC_FAMILY = "mx6:mx6q" - -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_v1_0-eval.dtb \ - imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb" -KERNEL_IMAGETYPE = "uImage" - -UBOOT_MACHINE = "apalis_imx6_defconfig" - -SERIAL_CONSOLE = "115200 ttymxc0" - -MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " -EXTRA_IMAGEDEPENDS += "u-boot" diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf deleted file mode 100644 index 7812e02..0000000 --- a/conf/machine/colibri-imx6.conf +++ /dev/null @@ -1,23 +0,0 @@ -#@TYPE: Machine -#@NAME: Toradex Colibri iMX6DL/S -#@SOC: i.MX6 DL/S -#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 SOM - -DEFAULTTUNE_mx6 = "armv7athf-neon" -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc - -SOC_FAMILY = "mx6:mx6dl" - -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 imx6dl-colibri-cam-eval-v3.dtb" -KERNEL_IMAGETYPE = "uImage" - -UBOOT_MACHINE = "colibri_imx6_defconfig" - -SERIAL_CONSOLE = "115200 ttymxc0" - -MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" -EXTRA_IMAGEDEPENDS += "u-boot" diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb deleted file mode 100644 index c87800b..0000000 --- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc - -PROVIDES += "u-boot" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" - -PV = "${PR}+gitr${SRCREV}" -PR = "r0" - -S = "${WORKDIR}/git" - -SRCREV_mx6 = "b66337d357cca761bf8627acbb1ec991f425f0b4" -SRCBRANCH_mx6 = "2015.04-toradex" -SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}" - -#FILESPATHPKG =. "git:" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE = "(colibri-imx6|apalis-imx6)" -DEFAULT_PREFERENCE_apalis-imx6 = "1" -DEFAULT_PREFERENCE_colibri-imx6 = "1" - -# apalis-imx6: build additionally a u-boot binary for the IT variant -SPL_BINARY_apalis-imx6 = "u-boot.imx-it" -SPL_IMAGE_apalis-imx6 = "u-boot-${MACHINE}-${PV}-${PR}.imx-it" -SPL_SYMLINK_apalis-imx6 = "u-boot-${MACHINE}.imx-it" -do_compile_append_apalis-imx6() { - # keep u-boot with standard timings - mv u-boot.imx u-boot-std.imx - oe_runmake apalis_imx6_it_defconfig - oe_runmake ${UBOOT_MAKE_TARGET} - mv u-boot.imx ${SPL_BINARY} - mv u-boot-std.imx u-boot.imx -} diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb deleted file mode 100644 index 13a1e8e..0000000 --- a/recipes-kernel/linux/linux-toradex-fsl_git.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Linux Kernel for Toradex Freescale i.MX6 based modules" -SECTION = "kernel" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -inherit kernel -require recipes-kernel/linux/linux-dtb.inc - -DEPENDS += "lzop-native " - -LINUX_VERSION_mx6 = "3.14.28" - -LOCALVERSION = "-${PR}" -SRCREV_mx6 = "0632def1c9981e3974f724025f39b2c1588d8ee6" -PR_mx6 = "V2.5b3" - -PV = "${LINUX_VERSION}+gitr${SRCREV}" -S = "${WORKDIR}/git" -SRCBRANCH_mx6 = "toradex_imx_3.14.28_1.0.0_ga" -SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}" - -# Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS) -KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}" - -COMPATIBLE_MACHINE = "(colibri-imx6|apalis-imx6)" - -# Place changes to the defconfig here -config_script () { -# #example change to the .config -# #sets CONFIG_TEGRA_CAMERA unconditionally to 'y' -# sed -i -e /CONFIG_TEGRA_CAMERA/d ${B}/.config -# echo "CONFIG_TEGRA_CAMERA=y" >> ${B}/.config - echo "dummy" > /dev/null -} - -do_configure_prepend () { - #use the defconfig provided in the kernel source tree - #assume its called ${MACHINE}_defconfig, but with '_' instead of '-' - DEFCONFIG="`echo ${MACHINE} | sed -e 's/\-/\_/g' -e 's/$/_defconfig/'`" - - cd ${S} - export KBUILD_OUTPUT=${B} - oe_runmake $DEFCONFIG - - #maybe change some configuration - config_script - - #Add Toradex BSP Version as LOCALVERSION - sed -i -e /CONFIG_LOCALVERSION/d ${B}/.config - echo "CONFIG_LOCALVERSION=\"${LOCALVERSION}\"" >> ${B}/.config - - #Add GIT revision to the local version - head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` - printf "%s%s" +g $head > ${S}/.scmversion -} - -# We need to pass it as param since kernel might support more then one -# machine, with different entry points -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" - -kernel_do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} - if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then - gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}" - fi -} - -do_compile_kernelmodules() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - oe_runmake ${PARALLEL_MAKE} modules LD="${KERNEL_LD}" - else - bbnote "no modules to compile" - fi -} -- cgit v1.2.3