From patchwork Tue Jul 10 11:47:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 941942 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="NhSvt6cE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41Q0nV5b7mz9s00 for ; Tue, 10 Jul 2018 21:47:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 08C47C21D8A; Tue, 10 Jul 2018 11:47:50 +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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 C14F7C21C2F; Tue, 10 Jul 2018 11:47:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 383D7C21C2F; Tue, 10 Jul 2018 11:47:46 +0000 (UTC) Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by lists.denx.de (Postfix) with ESMTPS id A2043C21C29 for ; Tue, 10 Jul 2018 11:47:45 +0000 (UTC) Received: by mail-it0-f67.google.com with SMTP id w16-v6so8663785ita.0 for ; Tue, 10 Jul 2018 04:47:45 -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=4WGYrgvey/k2Wa9jYp4PC5j4CmRD1+dlZF/Dg8f6o6g=; b=NhSvt6cEyh8EePgZePP9kNFFIzSUP4TghK2FE6uoQRHgtnJf9nGQyhq1g/+op2+7kk bHvW/Cma2CgeVQCDwIvdSPLT6795gF+UYcEm0igbbpo4XGlkpWumZNotvQgKJUrvMQxZ TV7KXo4ZHr1domE6Yn3K7pB1BSVPXMGdHG8zsDaANnfh30sit0AAnmAxx7K2ZfwhlPo3 H87/p6pu0spyrmWskXNYp+cb4jDW7/XGR2GcR1J3hnlRS7TAC5kCcyzyxXw6vitZk3Lp w1hz1uimbJ537d+ynyxvEfNBb38wbGIS1xQS7EYqThzWh0Y0QR4yiRPfs16zLxjI7l21 K/BQ== 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=4WGYrgvey/k2Wa9jYp4PC5j4CmRD1+dlZF/Dg8f6o6g=; b=L0fkk+bFrmiz3H8ZTsi6PFuoZn4COp4eT6SQTmY36IXZRaNLoebOOhAERoU6GmiFGi 5dHJi0yu8xV8M6W6bSzDU2MzvTaVm8MRonYWQXjp9BHltSpYD+bznOkvSf1WPNVHTqhZ bS9/c0gtN5PrO1v6k9GzpnKFVj3/QM9S5m7cJ1d99A5uTb3W/RHXuOgNWdMfj8Dbe/m+ QaQBmTH6xDDOVSHndz+rtZfrRTjL9kP0ZWlbGraVI1AVXps3SMCCl+tWlU40q8xclnJV l+dOagprI5R3L2P4OYI+ZG9ixDZSZk5SQzH4t86eOSzGLO10K3C4Asgu96X3eF4pflDe p6VA== X-Gm-Message-State: APt69E09FrdTb/KyoLTNfk8j1bfZVMeqSXYHk95U9xqLMKuVoQ06/zM6 cugfDnUsqMZ3p6w4i71jJgA= X-Google-Smtp-Source: AAOMgpd3i/bYaOIHcP9G0yH6xYF9nXh6jdtQEB9eQkmqsVnkuFBiOETpvFVvs5NU+7hum5rXwLRWyw== X-Received: by 2002:a02:c007:: with SMTP id y7-v6mr20603322jai.87.1531223264060; Tue, 10 Jul 2018 04:47:44 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id f15-v6sm6214631ioh.64.2018.07.10.04.47.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 04:47:43 -0700 (PDT) From: Adam Ford To: adam.ford@logicpd.com Date: Tue, 10 Jul 2018 06:47:33 -0500 Message-Id: <20180710114733.5848-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: u-boot@lists.denx.de, phoward@gme.net.au Subject: [U-Boot] [PATCH] configs: Convert CONFIG_USE_NAND to CONFIG_NAND 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" The DA850-EVM and OMAPL138_LCDK both use checks for CONFIG_USE_NAND. This patch changes these checks to CONFIG_NAND which is already defined in Kconfig. Since the OMAPL138_LCDK already had CONFIG_NAND defined in its defconfig, it can be deleted from configs/omapl138_lcdk.h. Signed-off-by: Adam Ford diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ebfdd1c7a3..6690be60b6 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -148,7 +148,7 @@ /* * Flash & Environment */ -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) @@ -273,12 +273,12 @@ #define CONFIG_CLOCKS #endif -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif -#if !defined(CONFIG_USE_NAND) && \ +#if !defined(CONFIG_NAND) && \ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_SIZE (16 << 10) diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 58624ec581..ee6f866581 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -16,7 +16,6 @@ #define CONFIG_DRIVER_TI_EMAC #undef CONFIG_USE_SPIFLASH #undef CONFIG_SYS_USE_NOR -#define CONFIG_USE_NAND /* * Disable DM_* for SPL build and can be re-enabled after adding @@ -142,7 +141,7 @@ /* * Flash & Environment */ -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) @@ -262,12 +261,12 @@ #ifndef CONFIG_DRIVER_TI_EMAC #endif -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif -#if !defined(CONFIG_USE_NAND) && \ +#if !defined(CONFIG_NAND) && \ !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_SIZE (16 << 10) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 97e27ae7fe..8ded15c89a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4418,7 +4418,6 @@ CONFIG_SYS_USE_FLASH CONFIG_SYS_USE_MAIN_OSCILLATOR CONFIG_SYS_USE_MMC CONFIG_SYS_USE_MPC834XSYS_USB_PHY -CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NOR CONFIG_SYS_USE_NORFLASH