From 9c84370ad6e500a92e357b236d8baead74469353 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 --- classes/image_types_fsl.bbclass | 271 ------------------------- 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 -------- recipes-bsp/u-boot/u-boot-colibri-vf.bb | 29 --- recipes-kernel/linux/linux-toradex-vf_git.bb | 52 ----- 7 files changed, 446 deletions(-) delete mode 100644 classes/image_types_fsl.bbclass 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 delete mode 100644 recipes-bsp/u-boot/u-boot-colibri-vf.bb delete mode 100644 recipes-kernel/linux/linux-toradex-vf_git.bb diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass deleted file mode 100644 index 1868c41..0000000 --- a/classes/image_types_fsl.bbclass +++ /dev/null @@ -1,271 +0,0 @@ -inherit image_types - -IMAGE_BOOTLOADER ?= "u-boot" - -# Handle u-boot suffixes -UBOOT_SUFFIX ?= "bin" -UBOOT_PADDING ?= "0" -UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" - -# -# Handles i.MX mxs bootstream generation -# - -# IMX Bootlets Linux bootstream -IMAGE_DEPENDS_linux.sb = "elftosb-native imx-bootlets virtual/kernel" -IMAGE_LINK_NAME_linux.sb = "" -IMAGE_CMD_linux.sb () { - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_dtb="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.dtb || true`" - linux_bd_file=imx-bootlets-linux.bd-${MACHINE} - if [ `basename $kernel_bin .bin` = `basename $kernel_dtb .dtb` ]; then - # When using device tree we build a zImage with the dtb - # appended on the end of the image - linux_bd_file=imx-bootlets-linux.bd-dtb-${MACHINE} - cat $kernel_bin $kernel_dtb \ - > $kernel_bin-dtb - rm -f ${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb - ln -s $kernel_bin-dtb ${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb - fi - - # Ensure the file is generated - rm -f ${IMAGE_NAME}.linux.sb - elftosb -z -c $linux_bd_file -o ${IMAGE_NAME}.linux.sb - - # Remove the appended file as it is only used here - rm -f $kernel_bin-dtb -} - - -# U-Boot mxsboot generation to SD-Card -UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard" -IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native u-boot" -IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard" - -# Boot partition volume id -BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}" - -# Boot partition size [in KiB] -BOOT_SPACE ?= "8192" - -# Set alignment to 4MB [in KiB] -IMAGE_ROOTFS_ALIGNMENT = "4096" - -IMAGE_DEPENDS_sdcard = "parted-native dosfstools-native mtools-native \ - virtual/kernel ${IMAGE_BOOTLOADER}" - -SDCARD = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sdcard" - -SDCARD_GENERATION_COMMAND_mxs = "generate_mxs_sdcard" -SDCARD_GENERATION_COMMAND_mx5 = "generate_imx_sdcard" -SDCARD_GENERATION_COMMAND_mx6 = "generate_imx_sdcard" -SDCARD_GENERATION_COMMAND_vf60 = "generate_imx_sdcard" - -# -# Create an image that can by written onto a SD card using dd for use -# with i.MX SoC family -# -# External variables needed: -# ${SDCARD_ROOTFS} - the rootfs image to incorporate -# ${IMAGE_BOOTLOADER} - bootloader to use {u-boot, barebox} -# -# The disk layout used is: -# -# 0 -> IMAGE_ROOTFS_ALIGNMENT - reserved to bootloader (not partitioned) -# IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE - kernel and other data -# BOOT_SPACE -> SDIMG_SIZE - rootfs -# -# Default Free space = 1.3x -# Use IMAGE_OVERHEAD_FACTOR to add more space -# <---------> -# 4MiB 8MiB SDIMG_ROOTFS 4MiB -# <-----------------------> <----------> <----------------------> <------------------------------> -# ------------------------ ------------ ------------------------ ------------------------------- -# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | IMAGE_ROOTFS_ALIGNMENT | -# ------------------------ ------------ ------------------------ ------------------------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 4096 4MiB + 8MiB 4MiB + 8Mib + SDIMG_ROOTFS 4MiB + 8MiB + SDIMG_ROOTFS + 4MiB -generate_imx_sdcard () { - # Create partition table - parted -s ${SDCARD} mklabel msdos - parted -s ${SDCARD} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) - parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) - parted ${SDCARD} print - - # Burn bootloader - case "${IMAGE_BOOTLOADER}" in - imx-bootlets) - bberror "The imx-bootlets is not supported for i.MX based machines" - exit 1 - ;; - u-boot) - dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 skip=${UBOOT_PADDING} bs=512 - ;; - barebox) - dd if=${DEPLOY_DIR_IMAGE}/barebox-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 skip=1 bs=512 - dd if=${DEPLOY_DIR_IMAGE}/bareboxenv-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 bs=512k - ;; - "") - ;; - *) - bberror "Unkown IMAGE_BOOTLOADER value" - exit 1 - ;; - esac - - # Create boot partition image - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ - | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} - - # Copy boot scripts - for item in ${BOOT_SCRIPTS}; do - src=`echo $item | awk -F':' '{ print $1 }'` - dst=`echo $item | awk -F':' '{ print $2 }'` - - mcopy -i ${WORKDIR}/boot.img -s $src ::/$dst - done - - # Copy device tree file - if test -n "${KERNEL_DEVICETREE}"; then - for DTS_FILE in ${KERNEL_DEVICETREE}; do - DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` - if [ -e "${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_bin_for_dtb="`readlink ${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`" - if [ $kernel_bin = $kernel_bin_for_dtb ]; then - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb - fi - fi - done - fi - - # Burn Partition - dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync -} - -# -# Create an image that can by written onto a SD card using dd for use -# with i.MXS SoC family -# -# External variables needed: -# ${SDCARD_ROOTFS} - the rootfs image to incorporate -# ${IMAGE_BOOTLOADER} - bootloader to use {imx-bootlets, u-boot} -# -generate_mxs_sdcard () { - # Create partition table - parted -s ${SDCARD} mklabel msdos - - case "${IMAGE_BOOTLOADER}" in - imx-bootlets) - # The disk layout used is: - # - # 0 -> 1024 - Unused (not partitioned) - # 1024 -> BOOT_SPACE - kernel and other data (bootstream) - # BOOT_SPACE -> SDIMG_SIZE - rootfs - # - # Default Free space = 1.3x - # Use IMAGE_OVERHEAD_FACTOR to add more space - # <---------> - # 1024 8MiB SDIMG_ROOTFS 4MiB - # <-------> <----------> <----------------------> <------------------------------> - # --------------------- ------------------------ ------------------------------- - # | Unused | BOOT_SPACE | ROOTFS_SIZE | IMAGE_ROOTFS_ALIGNMENT | - # --------------------- ------------------------ ------------------------------- - # ^ ^ ^ ^ ^ - # | | | | | - # 0 1024 1024 + 8MiB 1024 + 8Mib + SDIMG_ROOTFS 1024 + 8MiB + SDIMG_ROOTFS + 4MiB - parted -s ${SDCARD} unit KiB mkpart primary 1024 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) - parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) - - # Empty 4 bytes from boot partition - dd if=/dev/zero of=${SDCARD} conv=notrunc seek=2048 count=4 - - # Write the bootstream in (2048 + 4) bytes - dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.linux.sb of=${SDCARD} conv=notrunc seek=1 seek=2052 - ;; - u-boot) - # The disk layout used is: - # - # 1M - 2M - reserved to bootloader and other data - # 2M - BOOT_SPACE - kernel - # BOOT_SPACE - SDCARD_SIZE - rootfs - # - # The disk layout used is: - # - # 1M -> 2M - reserved to bootloader and other data - # 2M -> BOOT_SPACE - kernel and other data - # BOOT_SPACE -> SDIMG_SIZE - rootfs - # - # Default Free space = 1.3x - # Use IMAGE_OVERHEAD_FACTOR to add more space - # <---------> - # 4MiB 8MiB SDIMG_ROOTFS 4MiB - # <-----------------------> <-------------> <----------------------> <------------------------------> - # ---------------------------------------- ------------------------ ------------------------------- - # | | | |ROOTFS_SIZE | IMAGE_ROOTFS_ALIGNMENT | - # ---------------------------------------- ------------------------ ------------------------------- - # ^ ^ ^ ^ ^ ^ ^ - # | | | | | | | - # 0 1M 2M 4M 4MiB + BOOTSPACE 4MiB + BOOTSPACE + SDIMG_ROOTFS 4MiB + BOOTSPACE + SDIMG_ROOTFS + 4MiB - # - parted -s ${SDCARD} unit KiB mkpart primary 1024 2048 - parted -s ${SDCARD} unit KiB mkpart primary 2048 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) - parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) - - dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 skip=${UBOOT_PADDING} bs=$(expr 1024 \* 1024) - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ - | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') - - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} - if test -n "${KERNEL_DEVICETREE}"; then - for DTS_FILE in ${KERNEL_DEVICETREE}; do - DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` - if [ -e "${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_bin_for_dtb="`readlink ${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`" - if [ $kernel_bin = $kernel_bin_for_dtb ]; then - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb - fi - fi - done - fi - - dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=2 bs=$(expr 1024 \* 1024) - ;; - *) - bberror "Unkown IMAGE_BOOTLOADER value" - exit 1 - ;; - esac - - # Change partition type for mxs processor family - bbnote "Setting partition type to 0x53 as required for mxs' SoC family." - echo -n S | dd of=${SDCARD} bs=1 count=1 seek=450 conv=notrunc - - parted ${SDCARD} print - - dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync -} - -IMAGE_CMD_sdcard () { - if [ -z "${SDCARD_ROOTFS}" ]; then - bberror "SDCARD_ROOTFS is undefined. To use sdcard image from Freescale's BSP it needs to be defined." - exit 1 - fi - - # Align boot partition and calculate total SD card image size - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT}) - - # Initialize a sparse file - dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE}) - - ${SDCARD_GENERATION_COMMAND} -} 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" diff --git a/recipes-bsp/u-boot/u-boot-colibri-vf.bb b/recipes-bsp/u-boot/u-boot-colibri-vf.bb deleted file mode 100644 index afc211b..0000000 --- a/recipes-bsp/u-boot/u-boot-colibri-vf.bb +++ /dev/null @@ -1,29 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc - -PROVIDES += "u-boot" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ - file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab" - -PV = "${PR}+gitr${SRCREV}" -PR = "r0" - -S = "${WORKDIR}/git" -SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=colibri_vf" -SRCREV_colibri-vf = "f624e019a3f37ee4415a407afae0e026dd203714" - -#FILESPATHPKG =. "git:" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE = "colibri-vf" -DEFAULT_PREFERENCE_colibri-vf = "1" - -# colibri_vf: build additionally a u-boot binary used for sd-card boot -SPL_BINARY_colibri-vf = "u-boot.imx" -SPL_IMAGE_colibri-vf = "u-boot-${MACHINE}-${PV}-${PR}.imx" -SPL_SYMLINK_colibri-vf = "u-boot-${MACHINE}.imx" -do_compile_append_colibri-vf() { - oe_runmake colibri_vf_sdboot_config - oe_runmake -} diff --git a/recipes-kernel/linux/linux-toradex-vf_git.bb b/recipes-kernel/linux/linux-toradex-vf_git.bb deleted file mode 100644 index b5e8bb8..0000000 --- a/recipes-kernel/linux/linux-toradex-vf_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -inherit kernel -require recipes-kernel/linux/linux.inc - -LINUX_VERSION ?= "3.0.15" - -SRCREV_colibri-vf = "72249651843f93d50c302833546fb2880052a80f" -PR_colibri-vf = "V2.1b3" - -PV = "${LINUX_VERSION}+gitr${SRCREV}" -S = "${WORKDIR}/git" -SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=colibri_vf" -# a Patch -# SRC_URI += "file://a.patch " - -COMPATIBLE_MACHINE_colibri-vf = "colibri-vf" - -# 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 ${S}/.config -# echo "CONFIG_TEGRA_CAMERA=y" >> ${S}/.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/'`" - - oe_runmake $DEFCONFIG - - #maybe change some configuration - config_script -} - -kernel_do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} LD="${KERNEL_LD}" - 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