Received: by 10.192.165.148 with SMTP id m20csp4163126imm; Mon, 30 Apr 2018 13:00:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqbfPeQJS4AUdn5GjFHcSR6msMTkCBgmFm10n2pc0ySA2ckKXfnuDgl3ChkVNBGMgmaSs0p X-Received: by 10.98.108.69 with SMTP id h66mr13117130pfc.43.1525118405175; Mon, 30 Apr 2018 13:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525118405; cv=none; d=google.com; s=arc-20160816; b=gVKTtNX26BmnviPqtAaXW/FH+wvV2/cvGx2azo0IHgCQMDrv4mLRJkP/twNpya7tnd 8+C+BHGvMV6PwFSRfpFo4VmeJP74Z03aJMxrKDmoW7iHD3bEQWx5tbd4PJRKNKFVs5Zu vXNNPG9oq/tPhl/ASzr5Lk+uB2W3gVYMdELIXTMHdIMbJ2bXDDeAYGzde722RdbqLaIF GV354vihDLDPcboa/FlJB930X4izVifEjFXFbkgDc4yQENr0vxbEEIT3ymen+xqoVErk BQJDan+r0e0CCSAca5UoM0IVHPluYDD4ZDCuLyESukYQWAn3g7RjO+aaR2DZYLA3BRDM SyCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dmarc-filter :arc-authentication-results; bh=D1X59lKzcegB9s5paA7RrPLOw52THZqf1ioN02t+m+0=; b=DJPfF4vR8Uhx2dU32h0HZPRUKf4/ZUDh8QWZBzQLfdcNu6p9RwVbKKkI7N93/uPRWf AM/+XfVVfJhxskCcFXcaQ3QFvDwKHIoW1mtr50RX/M24JjP7uKP9s7LYjzYu8uM+wAUl erWn++qVU+oGIJ2/2C0xR5u5CFaUNpY9eAv4xIeKuWiVm4YPGinEQ65gNsmGuap9SZaw 91nzfx8v63DHb25rc6Heo5Ry28ryBKmLrcHIYAnM2HG6jNBQ0IBWq0eVr7d4O/3FhaAb xAA0COYYdCedWQObRPAOkQXHnkxpWDCdwhlyszSphmMTvFWwFYzCmBj5Sn/aNc5pBOHW ZtOg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i14-v6si2227567pgp.558.2018.04.30.12.59.50; Mon, 30 Apr 2018 13:00:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932251AbeD3T6f (ORCPT + 99 others); Mon, 30 Apr 2018 15:58:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:34720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756049AbeD3T1r (ORCPT ); Mon, 30 Apr 2018 15:27:47 -0400 Received: from localhost (unknown [104.132.1.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 57F8822DAC; Mon, 30 Apr 2018 19:27:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57F8822DAC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thor Thayer , Dinh Nguyen Subject: [PATCH 4.14 67/91] ARM: socfpga_defconfig: Remove QSPI Sector 4K size force Date: Mon, 30 Apr 2018 12:24:49 -0700 Message-Id: <20180430184007.711867514@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430184004.216234025@linuxfoundation.org> References: <20180430184004.216234025@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thor Thayer commit 6e8fe39989720b87439fee7817a5ca362b16d931 upstream. Remove QSPI Sector 4K size force which is causing QSPI boot problems with the JFFS2 root filesystem. Fixes the following error: "Magic bitmask 0x1985 not found at ..." Cc: stable@vger.kernel.org Signed-off-by: Thor Thayer Signed-off-by: Dinh Nguyen Signed-off-by: Greg Kroah-Hartman --- arch/arm/configs/socfpga_defconfig | 1 + 1 file changed, 1 insertion(+) --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -57,6 +57,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_DENALI_DT=y CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set CONFIG_SPI_CADENCE_QUADSPI=y CONFIG_OF_OVERLAY=y CONFIG_OF_CONFIGFS=y