From patchwork Thu Dec 12 11:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1208393 X-Patchwork-Delegate: simon.k.r.goldschmidt@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YWn039Dnz9sPK for ; Thu, 12 Dec 2019 22:30:11 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B106816AC; Thu, 12 Dec 2019 12:30:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RIneWBZu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C9D681680; Thu, 12 Dec 2019 12:30:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8C2AC81680 for ; Thu, 12 Dec 2019 12:29:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=simon.k.r.goldschmidt@gmail.com Received: by mail-wm1-x343.google.com with SMTP id d5so2091373wmb.4 for ; Thu, 12 Dec 2019 03:29:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=dTNmaSx1TiGcWuj8NEa7zdiaYSqe+SBQCuN9qF+wwPA=; b=RIneWBZukiZAq10vIq2Ax0q4uCl6RdqBQ/IoVA2Z3Z1LC0blzje9E0RAtM8GaIp+06 X1HPlCPjUBDb3Lf89+29yFUdxVd5qte3VPMDChliVyJ8P3rPbDPfggt3ioqSw7+Lz2xD EreO5XMz0j47vmGYfZbYYInSiTx8lMatESE80mSH/gHbuNE2supERYd1nV6MQW5NlhsC Lwgoj5yfiFydf3yuFgz4PHLJEowHYu9FSkjcq3shq3EvB53jTO4y0yxq3inOh0gLY4Iw Y5rCyayrCAZJ4LJWiUKBGylxgyH66VLGI1wSQ3Zm14fgFP2OJ6FD3Arz6uPtOIkOm2/q ockA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dTNmaSx1TiGcWuj8NEa7zdiaYSqe+SBQCuN9qF+wwPA=; b=K7el3fCaJZsDU/apjjQkaxjI+0rBexoHzbnrzvyeuxw4TVnOwm1RHqG+s4ReCrZAfB X63zyOsvEZUex4+VK7I3Sr4MA7kukrzQ0nM9shhFSwmLYA3gqPJFaTiyjDgl9IYloYza aCK/lcLe4n6/yQ2mumdPiU5HrMJsJqq63P4jq6nNTyIqWXhvL/NqJzEsLObvqk4lUcJ+ tWYE+4NvO09peNcu0xQW6JrHsaUcKGOuvxw9YU6zy9RGbGyrDfaAra/FvxRKiC/6vJPH hmOKNNs/Pztkov7qUc7PC52k76xQNzUjUpJdtiahzktCJasZrPNV2Pxekgho5KjxOC6J 6e9Q== X-Gm-Message-State: APjAAAXVN6wya1TLYwLCEQayOauJXkYvD4WBgmqFmeJ3ohvr1Mgh9ePz 3rhYpSL5IrD8npZytGMJJhs= X-Google-Smtp-Source: APXvYqwXmZo+m/PNQjw/gzNaynCt3DAys5Fc4f/0ayN8zIuQh5gPfieoQir5yX2xMxWo9tkNxbRiNg== X-Received: by 2002:a1c:f213:: with SMTP id s19mr6439993wmc.42.1576150199001; Thu, 12 Dec 2019 03:29:59 -0800 (PST) Received: from devvmsgnb.guest.pepperl-fuchs.local ([80.150.243.190]) by smtp.gmail.com with ESMTPSA id k8sm5741564wrl.3.2019.12.12.03.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 03:29:58 -0800 (PST) From: simon.k.r.goldschmidt@gmail.com To: Marek Vasut Subject: [PATCH] configs: socfpga: fix building Stratix10 and Agilex Date: Thu, 12 Dec 2019 12:29:52 +0100 Message-Id: <20191212112952.28682-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.11.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, Boris Brezillon , Miquel Raynal , Stefan Roese Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean From: Simon Goldschmidt This fixes a merge error that accidentally left CONFIG_MTD_DEVICE active by removing it from the config file. Signed-off-by: Simon Goldschmidt --- include/configs/socfpga_soc64_common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 4b27483788..4afadafd35 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -62,7 +62,6 @@ /*#define CONFIG_ENV_IS_IN_SPI_FLASH*/ #ifndef CONFIG_SPL_BUILD -#define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define MTDIDS_DEFAULT "nor0=ff705000.spi.0" #endif /* CONFIG_SPL_BUILD */