From patchwork Sun Jul 8 12:28:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 941018 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="bsbLWsUd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41NnnW5d9pz9s1b for ; Sun, 8 Jul 2018 22:28:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DC9CAC21DCA; Sun, 8 Jul 2018 12:28:35 +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 74261C21C93; Sun, 8 Jul 2018 12:28:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 70D0AC21C93; Sun, 8 Jul 2018 12:28:30 +0000 (UTC) Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by lists.denx.de (Postfix) with ESMTPS id B92D6C21C2C for ; Sun, 8 Jul 2018 12:28:29 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id p4-v6so21970114itf.2 for ; Sun, 08 Jul 2018 05:28:29 -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=P1jvEYCXPG5dHGTP8syuk0eGjh9D2Nev24EWA0n9DGE=; b=bsbLWsUdPKrJEKjk5kEEYxJSMBIVX6cw2DicRxr0EMTDt+EbxWDv90gWsHI0zd4s3G szFnVy3KKNfeN2QGsELmwMjK5JzP6xJiHLm/cu2H66jaCjjNq0BiIk83bewwTU/0RQ1+ nfUmtIq21selrs5xYID4UFYWZj7OmDh5Yw4CryRHpjIzhn9CLsit6N0ARyoR8xOWOgOl NRfJ9NffZ6XlJk0n0iUmmSJIegiPL/DY3nCFnoUwSfbl0FKfriEEW8lA2JdTrrSlZTi4 pA3PqFPM5qQt8vutH+lylh9y6a/wH2asr2OtnKznoZSA3VgmhnJYDbpLxTOWXNzLa07y 03XA== 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=P1jvEYCXPG5dHGTP8syuk0eGjh9D2Nev24EWA0n9DGE=; b=cbBV8tKJiFU3Ef0B8AjQaCAL2WHvxSXksvW+dwA4Nwp0vk0rwQsq8SN8uo5g1qoFiO VIeRKqmSBbf/9fFfPksqeGpVJ2SKl5GPWtV+TQt2xcU03T3cFxNlARmMGEIMuxfHm8t6 LnovptLrrXyXoVew/aUuCBqoOdiXYATOhvzz9NbcMuVO9cO1iTG8boXKYOINVKbCd/dA pj+FIvWquF1BctcFQxe/EljsX5uUDkQWiE7TM5e4EI8bV1Alm2hbsvQC3V2HI74/Qu+D qTkE32zsLHNNUwSZPJ280V5MbrZhhuIgSiHOzMaAQB2H7K4X3EJ9Ld4qzWwnmUNgDVC1 l2pg== X-Gm-Message-State: APt69E1oRnm6hmQq/6P+K3DHGYMfHX7TDDET9zSIYP0TJ3seq3tRN90J Eh90+XbYqgM6C2BmQuguV8M= X-Google-Smtp-Source: AAOMgpfwkT+t14YT7hClJUg7QMjPmlFCE+0CvHeYJKJKuQ346asoShBhpLzLrxZ2+qtTors3jLfMxA== X-Received: by 2002:a02:1b04:: with SMTP id l4-v6mr14344833jad.120.1531052908034; Sun, 08 Jul 2018 05:28:28 -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 i23-v6sm5817093iog.12.2018.07.08.05.28.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 05:28:26 -0700 (PDT) From: Adam Ford To: adam.ford@logicpd.com Date: Sun, 8 Jul 2018 07:28:10 -0500 Message-Id: <20180708122811.21033-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Wenyou Yang , u-boot@lists.denx.de, Priyanka Jain , Josh Wu , Ludovic Desroches , Bo Shen Subject: [U-Boot] [PATCH] configs: Make NAND_BOOT and ONENAND_BOOT imply 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" Some boards indicate support from booting NAND or ONENAND booting, but don't enable the CONFIG_NAND. This makes those boards imply NAND which will make enabling other flags that are dependent on CONFIG_NAND possible and easier to migrate. Signed-off-by: Adam Ford diff --git a/common/Kconfig b/common/Kconfig index 4c7a1a9af8..a22268cbf9 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -125,6 +125,7 @@ config NOR_BOOT config NAND_BOOT bool "Support for booting from NAND flash" default n + imply NAND help Enabling this will make a U-Boot binary that is capable of being booted via NAND flash. This is not a must, some SoCs need this, @@ -133,6 +134,7 @@ config NAND_BOOT config ONENAND_BOOT bool "Support for booting from ONENAND" default n + imply NAND help Enabling this will make a U-Boot binary that is capable of being booted via ONENAND. This is not a must, some SoCs need this, diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index d85a92a026..5b5a942f23 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 33da570b4d..1627206c9e 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 5dab4bae88..87944fce47 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index cbb6133266..c6f91453a8 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -41,7 +41,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y -CONFIG_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 590d0ba9dd..8a33f4c4d3 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -39,7 +39,6 @@ CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_PHY_GIGE=y diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig index b4a7376197..ebba7599f0 100644 --- a/configs/sama5d2_ptc_ek_nandflash_defconfig +++ b/configs/sama5d2_ptc_ek_nandflash_defconfig @@ -45,7 +45,6 @@ CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ATMEL=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig index 46ec7c728f..9def836578 100644 --- a/configs/sama5d36ek_cmp_nandflash_defconfig +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 4efcba6062..8d0e475cca 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -54,7 +54,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_ETH=y CONFIG_MACB=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index b2e46e5bdb..940decc322 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -56,7 +56,6 @@ CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index eae8a04c25..e2f8bbbe49 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -52,7 +52,6 @@ CONFIG_SYS_I2C_AT91=y CONFIG_I2C_EEPROM=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 60fc8add29..1b0be82122 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -52,7 +52,6 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y -CONFIG_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1fb8968ef5..b5f63c834b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3626,7 +3626,6 @@ CONFIG_SYS_NAND_MAX_OOBFREE CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES CONFIG_SYS_NAND_NO_SUBPAGE CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -CONFIG_SYS_NAND_ONFI_DETECTION CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_NAND_PAGE_2K CONFIG_SYS_NAND_PAGE_4K @@ -3638,7 +3637,6 @@ CONFIG_SYS_NAND_SELECT_DEVICE CONFIG_SYS_NAND_SIZE CONFIG_SYS_NAND_SPL_KERNEL_OFFS CONFIG_SYS_NAND_SPL_SIZE -CONFIG_SYS_NAND_USE_FLASH_BBT CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_NAND_U_BOOT_RELOC CONFIG_SYS_NAND_U_BOOT_RELOC_SP