From f6a0254280f905978ac635d58eb18e71e947daf2 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 12 Dec 2014 18:01:08 +0100 Subject: colibri-vf: switch to mainline kernel based on 3.18 Switch default kernel recipe to linux-toradex-vf which will build a kernel based on the toradex 3.18-next branch. --- conf/machine/colibri-vf.conf | 8 +- recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb | 2 +- .../linux/linux-toradex-vf-3.18/defconfig | 244 +++++++++++++++++++++ recipes-kernel/linux/linux-toradex-vf_3.18.bb | 13 ++ recipes-kernel/linux/linux-toradex_3.17.bb | 13 -- recipes/images/trdx-extra.inc | 5 - 6 files changed, 264 insertions(+), 21 deletions(-) create mode 100644 recipes-kernel/linux/linux-toradex-vf-3.18/defconfig create mode 100644 recipes-kernel/linux/linux-toradex-vf_3.18.bb delete mode 100644 recipes-kernel/linux/linux-toradex_3.17.bb diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index ed61392..3bc85e3 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -10,8 +10,12 @@ require conf/machine/include/tune-cortexa5.inc SOC_FAMILY = "vf:vf60" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex-fsl" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex-vf" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb" + +# U-Boot reads the kernel and device tree directly from rootfs +IMAGE_INSTALL_append = " kernel-image kernel-devicetree" PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl" @@ -31,7 +35,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa" SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLE = "115200 ttyLP0" # don't pull in systemd 216 backported into meta-angstrom PREFERRED_VERSION_systemd = "211%" diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb index 9ff0f66..c2a4ab9 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb @@ -11,7 +11,7 @@ PR = "r0" S = "${WORKDIR}/git" -SRCREV_colibri-vf = "7e8cf7a82c3ddd5b7d54a9f81cf8027b78fc0d6c" +SRCREV_colibri-vf = "d69e7bbceb14e09f0af2cddeb68ee5734a1c2d45" SRCBRANCH_colibri-vf = "2014.10-toradex-next" SRCREV_mx6 = "d593e1931d1a9fa00ee99dcd9b61e1c3f738ab1c" SRCBRANCH_mx6 = "2014.04-toradex-next" diff --git a/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig b/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig new file mode 100644 index 0000000..ecddcfa --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig @@ -0,0 +1,244 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y +CONFIG_FHANDLE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_CGROUPS=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_KALLSYMS_ALL=y +CONFIG_EMBEDDED=y +CONFIG_PERF_EVENTS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_MXC=y +CONFIG_SOC_VF610=y +CONFIG_SWP_EMULATE=y +CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_VMSPLIT_2G=y +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_AEABI=y +CONFIG_HIGHMEM=y +CONFIG_CMA=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_PM_RUNTIME=y +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +CONFIG_IPV6=y +CONFIG_NETFILTER=y +CONFIG_CAN=y +CONFIG_CAN_FLEXCAN=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_RFKILL=y +CONFIG_RFKILL_INPUT=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +CONFIG_DMA_CMA=y +CONFIG_CONNECTOR=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_FSL_NFC=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_FASTMAP=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_HISILICON is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_MICREL_PHY=y +CONFIG_INPUT_POLLDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_IMX=y +# CONFIG_MOUSE_PS2 is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_EGALAX=y +CONFIG_TOUCHSCREEN_FUSION_F0710A=y +CONFIG_TOUCHSCREEN_STMPE=y +CONFIG_TOUCHSCREEN_COLIBRI_VF50=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_FSL_LPUART=y +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_HW_RANDOM=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_IMX=y +CONFIG_GPIO_SYSFS=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_SYSCON=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_IMX2_WDT=y +CONFIG_MFD_STMPE=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_ANATOP=y +CONFIG_REGULATOR_GPIO=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +# CONFIG_RC_MAP is not set +# CONFIG_RC_DECODERS is not set +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=y +# CONFIG_USB_GSPCA is not set +CONFIG_FB=y +CONFIG_FB_FSL_DCU=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PWM=y +CONFIG_BACKLIGHT_GPIO=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_IMX_SGTL5000=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_SERIAL=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_MXS_PHY=y +CONFIG_USB_GADGET=y +CONFIG_USB_FSL_USB2=y +CONFIG_USB_ETH=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_ESDHC_IMX=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_SNVS=y +CONFIG_DMADEVICES=y +# CONFIG_MX3_IPU is not set +CONFIG_FSL_EDMA=y +CONFIG_STAGING=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_IIO=y +CONFIG_IIO_TRIGGER=y +CONFIG_VF610_ADC=y +CONFIG_PWM=y +CONFIG_PWM_FSL_FTM=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_OVERLAY_FS=y +CONFIG_VFAT_FS=y +CONFIG_NTFS_FS=y +CONFIG_NTFS_RW=y +CONFIG_TMPFS=y +CONFIG_UBIFS_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_FS=y +CONFIG_LOCKUP_DETECTOR=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10 +# CONFIG_SCHED_DEBUG is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_FTRACE is not set +# CONFIG_ARM_UNWIND is not set +CONFIG_SECURITYFS=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_T10DIF=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y diff --git a/recipes-kernel/linux/linux-toradex-vf_3.18.bb b/recipes-kernel/linux/linux-toradex-vf_3.18.bb new file mode 100644 index 0000000..e0cba0a --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-vf_3.18.bb @@ -0,0 +1,13 @@ +require recipes-kernel/linux/linux-imx.inc +require recipes-kernel/linux/linux-dtb.inc + +SUMMARY = "Linux kernel for Toradex Colibri VFxx boards" + +SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \ + file://defconfig" + +LOCALVERSION = "-v2.3b5" +SRCBRANCH = "toradex_vf_3.18-next" +SRCREV = "${AUTOREV}" +DEPENDS += "lzop-native bc-native" +COMPATIBLE_MACHINE = "(colibri-vf)" diff --git a/recipes-kernel/linux/linux-toradex_3.17.bb b/recipes-kernel/linux/linux-toradex_3.17.bb deleted file mode 100644 index 7664f25..0000000 --- a/recipes-kernel/linux/linux-toradex_3.17.bb +++ /dev/null @@ -1,13 +0,0 @@ -require recipes-kernel/linux/linux-imx.inc -require recipes-kernel/linux/linux-dtb.inc - -SUMMARY = "Linux kernel for Toradex Colibri VFxx boards" - -SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \ - file://defconfig" - -LOCALVERSION = "-v2.3b2" -SRCBRANCH = "toradex_vf_3.17-next" -SRCREV = "c646b0f4fdad4cc9dabdcbe40b5a893d173e2850" -DEPENDS += "lzop-native bc-native" -COMPATIBLE_MACHINE = "(colibri-vf)" diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc index 60c3295..1b39df4 100644 --- a/recipes/images/trdx-extra.inc +++ b/recipes/images/trdx-extra.inc @@ -117,12 +117,7 @@ IMAGE_INSTALL_MACHINE_colibri-vf = " \ mqxboot \ libmcc \ mcc-pingpong \ - kernel-module-fusion-f0710a \ kernel-module-mcc \ - kernel-module-snd-ac97-codec \ - kernel-module-snd-soc-mvf \ - kernel-module-mvf-sai-ac97 \ - kernel-module-snd-soc-wm9712 \ " IMAGE_INSTALL_MACHINE = "" -- cgit v1.2.3