From 59ce3787c7b628cc244b9db7364046ad69fcf1a6 Mon Sep 17 00:00:00 2001
From: Jerome Forissier <jerome.forissier@linaro.org>
Date: Wed, 13 Apr 2016 15:22:33 +0200
Subject: [PATCH] kconfigs/qemu.conf: disable CONFIG_JFFS2_FS
The line disabling CONFIG_JFFS2_FS was removed by mistake by commit
a6d968c8bc63 ("qemu: generic driver"). Restore it to fix the Travis
tests.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
---
kconfigs/qemu.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kconfigs/qemu.conf b/kconfigs/qemu.conf
index 1976bb4..3d87298 100644
--- a/kconfigs/qemu.conf
+++ b/kconfigs/qemu.conf
@@ -1,4 +1,6 @@
CONFIG_TEE=y
CONFIG_OPTEE=y
-### This prevents random failures of "make check" in Travis CI
+### Enabling PREEMPT and disabling JFFS2_FS prevents random failures of
+### "make check" in Travis CI
CONFIG_PREEMPT=y
+CONFIG_JFFS2_FS=n
--
GitLab