diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-05-01 16:23:54 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-05-12 10:06:07 +0200 |
commit | 78b96eef475c1001367d26141c70ec5e9b35be50 (patch) | |
tree | 1e67592bcb5e99a82efa3d6d220737897c0fb3ec | |
parent | 6e413ca5ad7b465813ad1a2414167c8ee3356c4e (diff) |
colibri_vf: update to U-Boot 2015.04/Linux 4.0
-rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-toradex-vf-4.0/defconfig (renamed from recipes-kernel/linux/linux-toradex-vf-3.18/defconfig) | 75 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-toradex-vf_4.0.bb (renamed from recipes-kernel/linux/linux-toradex-vf_3.18.bb) | 6 |
3 files changed, 57 insertions, 28 deletions
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 74dc6ec..9389a25 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb @@ -11,8 +11,8 @@ PR = "r0" S = "${WORKDIR}/git" -SRCREV_colibri-vf = "73b99ed96be527c482e63f8d0aac4e6188b1f7e0" -SRCBRANCH_colibri-vf = "2014.10-toradex" +SRCREV_colibri-vf = "93d011ae1319c297d3cf31d40a88b21699d89d7b" +SRCBRANCH_colibri-vf = "2015.04-toradex-next" SRCREV_mx6 = "0260e62f008aa292d87da7c1a9fbe1051a793518" SRCBRANCH_mx6 = "2014.04-toradex" SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}" diff --git a/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig b/recipes-kernel/linux/linux-toradex-vf-4.0/defconfig index e9fc673..8c76234 100644 --- a/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig +++ b/recipes-kernel/linux/linux-toradex-vf-4.0/defconfig @@ -1,15 +1,16 @@ CONFIG_KERNEL_LZO=y CONFIG_SYSVIPC=y CONFIG_FHANDLE=y -CONFIG_NO_HZ=y +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_GZIP=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y @@ -23,24 +24,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y 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_CMA=y +CONFIG_KEXEC=y +# CONFIG_ATAGS_PROC is not set 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_BINFMT_MISC=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set @@ -49,8 +50,27 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_LRO is not set CONFIG_IPV6=y CONFIG_NETFILTER=y +CONFIG_BRIDGE_NETFILTER=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_TABLES=y +CONFIG_NF_TABLES_INET=y +CONFIG_NFT_MASQ=y +CONFIG_NFT_NAT=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_CONNMARK=y +CONFIG_NETFILTER_XT_MATCH_NFACCT=y +CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_NFT_CHAIN_NAT_IPV4=y +CONFIG_NFT_MASQ_IPV4=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_NF_TABLES_BRIDGE=y +CONFIG_BRIDGE=y +# CONFIG_BRIDGE_IGMP_SNOOPING is not set CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y +CONFIG_CAN_MCP251X=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_RFKILL=y @@ -62,23 +82,18 @@ 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_NAND_VF610_NFC=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y +CONFIG_MTD_UBI_BLOCK=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 @@ -92,6 +107,7 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_ROCKER is not set # CONFIG_NET_VENDOR_SAMSUNG is not set # CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_SMSC is not set @@ -102,16 +118,17 @@ CONFIG_MICREL_PHY=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set 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_WM97XX=y # CONFIG_TOUCHSCREEN_WM9705 is not set # CONFIG_TOUCHSCREEN_WM9713 is not set -CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_COLIBRI_VF50=y +# CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set CONFIG_SERIAL_FSL_LPUART=y @@ -120,7 +137,6 @@ 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_SPI=y CONFIG_SPI_FSL_DSPI=y @@ -128,11 +144,12 @@ CONFIG_SPI_SPIDEV=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=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 @@ -160,10 +177,13 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=y CONFIG_SND=y +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set CONFIG_SND_SOC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_FSL_SAI_WM9712=y -CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y @@ -171,11 +191,17 @@ CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=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_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y @@ -217,6 +243,7 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_NTFS_RW=y CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y @@ -224,6 +251,7 @@ CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_ROOT_NFS=y +CONFIG_CIFS=y CONFIG_NLS_DEFAULT="cp437" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y @@ -242,6 +270,7 @@ CONFIG_SECURITYFS=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set CONFIG_CRC_T10DIF=y +CONFIG_XZ_DEC=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_4.0.bb index 3b9b566..1f5e228 100644 --- a/recipes-kernel/linux/linux-toradex-vf_3.18.bb +++ b/recipes-kernel/linux/linux-toradex-vf_4.0.bb @@ -6,8 +6,8 @@ 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.3b7+git" -SRCBRANCH = "toradex_vf_3.18-next" -SRCREV = "5f68f254e269bdc25c57888e245ae4cddb320be0" +LOCALVERSION = "-v2.4b1+git" +SRCBRANCH = "toradex_vf_4.0-next" +SRCREV = "7ae637bf95bdbc01b1930bef898e4085aa7fdaa4" DEPENDS += "lzop-native bc-native" COMPATIBLE_MACHINE = "(colibri-vf)" |