From patchwork Tue Aug 13 19:04:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1146607 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aJ36IaoP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 467MZr3xRVz9sNp for ; Wed, 14 Aug 2019 05:04:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B6BE1C2201E; Tue, 13 Aug 2019 19:04:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E8EFAC21FA8; Tue, 13 Aug 2019 19:04:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 37895C21FA1; Tue, 13 Aug 2019 19:04:13 +0000 (UTC) Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by lists.denx.de (Postfix) with ESMTPS id AB394C21FA8 for ; Tue, 13 Aug 2019 19:04:12 +0000 (UTC) Received: by mail-ot1-f67.google.com with SMTP id w4so1501206ote.11 for ; Tue, 13 Aug 2019 12:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6Yh02kBC7kXol7o9wbRYxI4arRh0zCAsOxDQDUydBxk=; b=aJ36IaoPy6Mb44MrqkehwHi2ZPrMLjgIM7MQUeTnExjQzqA8tl/2HJ1KJbHLnKxaTU Q0e5FL0AEFKh4QgXKZsdMzeVHDhlOYdi35k2aJ3ZgxD2vY/4wPTfk0nmCGIqifKnFi9m AXkL474E6SSuKplh1mPClWqQTIrUL3QY29Pp3HkQLLl9eo5/1aVPoiQhimPYtXSKltis LHPfX6c2qOjO36vls5bQv1ehQkDDjG8Jx5jy7ir1HRLrujXxcYfUjvA5w5+lL4tZCdXo 9RI4bzvHlF3H/3KMsFgyY8VEvvYS8SPX3TRbq9aMIFiac+k5ns8I768eQoS0dI5OCCUh WD0w== 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=6Yh02kBC7kXol7o9wbRYxI4arRh0zCAsOxDQDUydBxk=; b=HEmmJF0BsCWjw/IAkbZ9ZFzgnuTVWSDA+RGdgVK5G7Rf9Woys4H/qVFnbi7HNf4uX2 dP9YJNfXXPKcIYEeSnroMrBt4Nf6NrKa7PNGcZ09KeeAQpBQx1PDdGopDwCaQ5ncCjro XitMKWjuHNXXW5Elh/sQ/xpJkNM/C40HOzb7LrCp50T0zBGYHzyCRAlTbLcS6C5FdULX AAv3M12V9Q97tXv8238o3nsvKc5N6eO/IQ2ds1pn8u5DiQU0cKXZljM2cN0Cn69JFlLs ybNjWQeYdcjWi7WHMtrFYOtxIE1X3XLT/pHmND5JQnxpTt6Z7vqpOUBhNUlK2k3tQ9dR K0Tw== X-Gm-Message-State: APjAAAWb9EEjBafUNh1jAk1K6shhjkA+NIrnluLwmYy9LtBNH3kozlt2 sb120qnKfZqA5H0c45NJNmRdn8tODW4= X-Google-Smtp-Source: APXvYqz3z9ZKZwS0ZcL1qQ0KpWzg06+dysrNWggCrtY1yluRNgBeLYtKWOYluKJLq9tAWRHS+J4C5w== X-Received: by 2002:a6b:8b47:: with SMTP id n68mr28812810iod.191.1565723050620; Tue, 13 Aug 2019 12:04:10 -0700 (PDT) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id k2sm89285525iom.50.2019.08.13.12.04.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 12:04:09 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Tue, 13 Aug 2019 14:04:02 -0500 Message-Id: <20190813190402.22846-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH] Revert "ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Sorry for the noise, but there appears to be a regression with older hardware. Since it broke the direct_nor boot option, it should be reverted until a better solution is available. This reverts commit 51cd1e2373274dc3167dabba628dcfc25828d36d. diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index b2b2fa272a..d9019de6e0 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -234,8 +234,7 @@ const struct pinmux_resource pinmuxes[] = { PINMUX_ITEM(emifa_pins_cs3), PINMUX_ITEM(emifa_pins_cs4), PINMUX_ITEM(emifa_pins_nand), -#endif -#ifdef CONFIG_USE_NOR +#elif defined(CONFIG_USE_NOR) PINMUX_ITEM(emifa_pins_cs2), PINMUX_ITEM(emifa_pins_nor), #endif diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index e889751b8c..407a30fbbf 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -24,15 +24,14 @@ CONFIG_CMD_DM=y # CONFIG_CMD_GPT is not set # CONFIG_CMD_MMC is not set CONFIG_CMD_MTD=y -CONFIG_CMD_NAND=y # CONFIG_CMD_PART is not set # CONFIG_CMD_SF is not set # CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_TIME is not set CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2,nor1=spi1.0,nand0=nand512" -CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare);spi1.0:32k(SPL),480k(u-boot),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address);nand512:128k(u-boot env),512k(u-boot),128k(spl-os),8m(kernel),-(rootfs)" +CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2" +CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare)" CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" @@ -50,13 +49,10 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y -CONFIG_NAND=y -CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y