This commit updates the Linux Timesys kernel to version 3.13. The MCC driver has been updated to version 2.1 and is now present in-tree.
Newer, more stable drivers are included for UART and power management compared to Linux 3.0 for Vybrid. Signed-off-by: Anthony Felice <[email protected]> --- conf/machine/twr-vf65gs10.conf | 2 + ...ix-mac-address-read-to-match-fuse-layout-.patch | 37 --------- ...e-console-device-name-to-match-mainline-u.patch | 35 -------- .../defconfig | 92 ++++++++++++++-------- ...nux-timesys_3.0.15.bb => linux-timesys_3.13.bb} | 11 +-- 5 files changed, 64 insertions(+), 113 deletions(-) delete mode 100644 recipes-kernel/linux/linux-timesys-3.0.15/0001-mvf_fec.c-Fix-mac-address-read-to-match-fuse-layout-.patch delete mode 100644 recipes-kernel/linux/linux-timesys-3.0.15/0002-mvf.c-Change-console-device-name-to-match-mainline-u.patch rename recipes-kernel/linux/{linux-timesys-3.0.15 => linux-timesys-3.13}/defconfig (68%) rename recipes-kernel/linux/{linux-timesys_3.0.15.bb => linux-timesys_3.13.bb} (56%) diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf index 5a6dc87..28ecfca 100644 --- a/conf/machine/twr-vf65gs10.conf +++ b/conf/machine/twr-vf65gs10.conf @@ -11,6 +11,8 @@ SOC_FAMILY = "vf:vf60" PREFERRED_PROVIDER_virtual/kernel ?= "linux-timesys" +KERNEL_DEVICETREE = "vf610-twr.dtb" + UBOOT_MACHINE = "vf610twr_config" SERIAL_CONSOLE = "115200 ttyLP1" diff --git a/recipes-kernel/linux/linux-timesys-3.0.15/0001-mvf_fec.c-Fix-mac-address-read-to-match-fuse-layout-.patch b/recipes-kernel/linux/linux-timesys-3.0.15/0001-mvf_fec.c-Fix-mac-address-read-to-match-fuse-layout-.patch deleted file mode 100644 index 7cf3597..0000000 --- a/recipes-kernel/linux/linux-timesys-3.0.15/0001-mvf_fec.c-Fix-mac-address-read-to-match-fuse-layout-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05143ab75368653deee90dd24f26fa17e21711e9 Mon Sep 17 00:00:00 2001 -From: Andy Voltz <[email protected]> -Date: Thu, 6 Jun 2013 11:48:44 -0400 -Subject: [PATCH 1/2] mvf_fec.c: Fix mac address read to match fuse layout for - latest u-boot - ---- - arch/arm/mach-mvf/mvf_fec.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/arm/mach-mvf/mvf_fec.c b/arch/arm/mach-mvf/mvf_fec.c -index d51f205..1ab339b 100644 ---- a/arch/arm/mach-mvf/mvf_fec.c -+++ b/arch/arm/mach-mvf/mvf_fec.c -@@ -35,13 +35,13 @@ static int fec_get_mac_addr(unsigned char *mac) - unsigned int value; - - value = readl(MVF_IO_ADDRESS(MVF_FEC_BASE_ADDR) + ENET_PALR); -- mac[2] = value & 0xff; -- mac[3] = (value >> 8) & 0xff; -- mac[4] = (value >> 16) & 0xff; -- mac[5] = (value >> 24) & 0xff; -+ mac[3] = value & 0xff; -+ mac[2] = (value >> 8) & 0xff; -+ mac[1] = (value >> 16) & 0xff; -+ mac[0] = (value >> 24) & 0xff; - value = readl(MVF_IO_ADDRESS(MVF_FEC_BASE_ADDR) + ENET_PAUR); -- mac[0] = (value >> 16) & 0xff; -- mac[1] = (value >> 24) & 0xff; -+ mac[5] = (value >> 16) & 0xff; -+ mac[4] = (value >> 24) & 0xff; - - return 0; - } --- -1.7.9.5 - diff --git a/recipes-kernel/linux/linux-timesys-3.0.15/0002-mvf.c-Change-console-device-name-to-match-mainline-u.patch b/recipes-kernel/linux/linux-timesys-3.0.15/0002-mvf.c-Change-console-device-name-to-match-mainline-u.patch deleted file mode 100644 index 3c75b71..0000000 --- a/recipes-kernel/linux/linux-timesys-3.0.15/0002-mvf.c-Change-console-device-name-to-match-mainline-u.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bf6634e8ad489e47150c0acb8efbe5ddd89066f5 Mon Sep 17 00:00:00 2001 -From: Andy Voltz <[email protected]> -Date: Thu, 27 Jun 2013 15:20:27 -0400 -Subject: [PATCH 2/2] mvf.c: Change console device name to match mainline - u-boot - ---- - drivers/tty/serial/mvf.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/tty/serial/mvf.c b/drivers/tty/serial/mvf.c -index 814a7da..4f7a82f 100644 ---- a/drivers/tty/serial/mvf.c -+++ b/drivers/tty/serial/mvf.c -@@ -55,7 +55,7 @@ - /* We've been assigned a range on the "Low-density serial ports" major */ - #define SERIAL_IMX_MAJOR 207 - #define MINOR_START 16 --#define DEV_NAME "ttymxc" -+#define DEV_NAME "ttyLP" - #define MAX_INTERNAL_IRQ MXC_INTERNAL_IRQS - - /* -@@ -605,7 +605,7 @@ static int imx_startup(struct uart_port *port) - if (sport->enable_dma) { - /* request eDMA channel and buffer */ - sport->dma_tx_ch = mcf_edma_request_channel(pdata->dma_req_tx, -- dma_tx_callback, NULL, 1, sport, NULL, "ttymxc"); -+ dma_tx_callback, NULL, 1, sport, NULL, DEV_NAME); - - sport->dma_is_txing = 0; - --- -1.7.9.5 - diff --git a/recipes-kernel/linux/linux-timesys-3.0.15/defconfig b/recipes-kernel/linux/linux-timesys-3.13/defconfig similarity index 68% rename from recipes-kernel/linux/linux-timesys-3.0.15/defconfig rename to recipes-kernel/linux/linux-timesys-3.13/defconfig index b750bed..71b76c0 100644 --- a/recipes-kernel/linux/linux-timesys-3.0.15/defconfig +++ b/recipes-kernel/linux/linux-timesys-3.13/defconfig @@ -1,25 +1,22 @@ -CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=m CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MXC=y -CONFIG_ARCH_MVF=y -CONFIG_MACH_MVFA5_TWR_VF700=y -CONFIG_DMA_ZONE_SIZE=16 -CONFIG_ARM_ERRATA_743622=y +CONFIG_SOC_VF610=y CONFIG_ARM_ERRATA_754322=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_VMSPLIT_2G=y CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_COMPACTION=y CONFIG_KSM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 @@ -38,25 +35,27 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set +CONFIG_CAN=y +CONFIG_CAN_VCAN=y +CONFIG_CAN_FLEXCAN=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_FSL_NFC=y -CONFIG_MTD_NAND_FSL_NFC_SWECC=y +CONFIG_MTD_SPI_NOR_BASE=y +CONFIG_SPI_FSL_QUADSPI=y +CONFIG_MTD_UBI=y CONFIG_BLK_DEV_RAM=y -CONFIG_MISC_DEVICES=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y CONFIG_MICREL_PHY=y -CONFIG_NET_ETHERNET=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set CONFIG_INPUT_POLLDEV=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y @@ -67,50 +66,74 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y # CONFIG_CONSOLE_TRANSLATIONS is not set CONFIG_LEGACY_PTY_COUNT=4 -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_IMX=y CONFIG_SPI=y -CONFIG_SPI_MVF_DSPI_EDMA=y +CONFIG_SPI_FSL_DSPI=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set +CONFIG_WATCHDOG=y +CONFIG_IMX2_WDT=y +CONFIG_MFD_SYSCON=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -CONFIG_USB_VIDEO_CLASS=y CONFIG_FB=y -CONFIG_FB_MVF_DCU=y +CONFIG_FB_FSL_DCU=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y CONFIG_LOGO=y CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set CONFIG_SND=y CONFIG_SND_PCM_OSS=y CONFIG_SND_SOC=y +CONFIG_SND_SOC_FSL_SAI=y +CONFIG_SND_SOC_SGTL5000=y +CONFIG_SND_SIMPLE_CARD=y CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ARC=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_MXC=y +CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_MXS_PHY=y +CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=m 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_PWM=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_RTC_CLASS=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y -# CONFIG_MXC_HMP4E is not set -# CONFIG_MXC_HWEVENT is not set +CONFIG_FSL_EDMA=y +CONFIG_STAGING=y +CONFIG_IIO=y +CONFIG_VF610_ADC=y +CONFIG_PWM=y +CONFIG_PWM_FSL_FTM=y +# CONFIG_RESET_CONTROLLER is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set @@ -119,26 +142,27 @@ CONFIG_AUTOFS4_FS=m CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_JFFS2_FS=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_EFI_PARTITION=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=m +CONFIG_FUNCTION_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_ARM_UNWIND is not set +CONFIG_DEBUG_LL=y CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRC_CCITT=m +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y diff --git a/recipes-kernel/linux/linux-timesys_3.0.15.bb b/recipes-kernel/linux/linux-timesys_3.13.bb similarity index 56% rename from recipes-kernel/linux/linux-timesys_3.0.15.bb rename to recipes-kernel/linux/linux-timesys_3.13.bb index 25fd9e5..c6e074c 100644 --- a/recipes-kernel/linux/linux-timesys_3.0.15.bb +++ b/recipes-kernel/linux/linux-timesys_3.13.bb @@ -1,20 +1,17 @@ # Copyright (C) 2013-2014 Timesys Corporation # Released under the MIT license (see COPYING.MIT for the terms) include linux-imx.inc +require recipes-kernel/linux/linux-dtb.inc SUMMARY = "Linux Kernel with added drivers and board support for Vybrid-based platforms" -# Revision of 3.0.15_vybrid branch +# Revision of 3.13_vybrid branch SRC_URI = "git://github.com/Timesys/linux-timesys.git;protocol=git;branch=${SRCBRANCH} \ file://defconfig \ " -SRC_URI_append_twr-vf65gs10 = "file://0001-mvf_fec.c-Fix-mac-address-read-to-match-fuse-layout-.patch \ - file://0002-mvf.c-Change-console-device-name-to-match-mainline-u.patch \ -" - -SRCBRANCH = "3.0.15_vybrid-twr" -SRCREV = "50c4c848d6b8743894cfcec166db475ef6140504" +SRCBRANCH = "3.13_vybrid" +SRCREV = "d7e5498bf6bb0dda6f2d7a09c4d940ce95c79539" LOCALVERSION ?= "-${SRCBRANCH}" COMPATIBLE_MACHINE = "(vf60)" -- 1.9.1 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
