summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Stehlé <vincent.stehle@laposte.net>2016-11-09 17:38:23 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-11-09 21:24:57 +0100
commitd13b1ce707fb609e53164e1ae4281e1e3e7c84ac (patch)
tree94da90642c1a80b8acc2d37a72ba562b1239416a
parent3ded6e5e3909f1a519abbf58f386f31eba7fc806 (diff)
configs: freescale_imx31_3stack: bump kernel version to 4.1.15_2.0.0_ga
Switch to the kernel of release 4.1.15_2.0.0_ga, as it builds properly with gcc 5.x, which is now the default. We add a linux config fragment to disable the framebuffer, to repair the build for imx_v6_v7_defconfig. Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> Signed-off-by: Julien Olivain <juju@cotds.org> Tested-by: Julien Olivain <juju@cotds.org> Cc: Fabio Estevam <fabio.estevam@nxp.com> [Thomas: adjust syntax in fragment.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--board/freescale/imx31_3stack/linux.fragment1
-rw-r--r--configs/freescale_imx31_3stack_defconfig12
2 files changed, 7 insertions, 6 deletions
diff --git a/board/freescale/imx31_3stack/linux.fragment b/board/freescale/imx31_3stack/linux.fragment
new file mode 100644
index 000000000..beb6b46f2
--- /dev/null
+++ b/board/freescale/imx31_3stack/linux.fragment
@@ -0,0 +1 @@
+# CONFIG_FB_MXS is not set
diff --git a/configs/freescale_imx31_3stack_defconfig b/configs/freescale_imx31_3stack_defconfig
index bf1afad13..0476fc1b5 100644
--- a/configs/freescale_imx31_3stack_defconfig
+++ b/configs/freescale_imx31_3stack_defconfig
@@ -3,18 +3,18 @@ BR2_arm=y
BR2_arm1136jf_s=y
BR2_ARM_EABIHF=y
-# Linux headers same as kernel, a 3.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y
+# Linux headers same as kernel, a 4.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
# kernel
BR2_LINUX_KERNEL=y
-# Note: sadly the Linux kernel will not boot on the i.MX31 PDK, starting with
-# v3.16 and at least up to v4.0-rc4; this is why we use v3.15.y here.
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.10"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx31_3stack/linux.fragment"
BR2_TARGET_ROOTFS_CPIO_GZIP=y
BR2_TARGET_ROOTFS_INITRAMFS=y