From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8508FC433F5 for ; Sun, 29 May 2022 16:56:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E3698428A; Sun, 29 May 2022 18:56:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 37A548429D; Sun, 29 May 2022 18:55:38 +0200 (CEST) Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (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 03EA584207 for ; Sun, 29 May 2022 18:55:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f179.google.com with SMTP id b200so9118116qkc.7 for ; Sun, 29 May 2022 09:55:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3H88F4CbrOps9daxYG/KXkg5F4W/YZH+DuMU+xEwVNo=; b=fvorLekZJTLKMRzzcB1XDf/u4tJp8T8NT3Wgz3IXzT3CV/zptb6BeUz0mkx+y2xb4d 3F83Etwj17wBW1wMUxaVcN8P8XB8oJTsJdgtiN3+X3fyzXlvy2/hG3ye2DkPM0fgJedm 1vUewBEw0FfsQEJPtVbSGjDa4TAa+h9gY3LE/ft5yGXrdCW2jOfR2XXfWCt81Z34gTDJ pvdKjBIBsKuEh43Ar5ThTkPpFQy6hsOsVepijghpEafVbE99GhhJUvOznw7AyxzqYF7a 7XYMdXDexgFkz1VBbzO+9V5M2Z+XHk9skjvdkDPlkwYWe9CanNXc/HkU2AIGrJTBlv1U ipBA== X-Gm-Message-State: AOAM533fIIxwKcvCYoQqZJfNqi+D+ks/5fdflr8YJ3K9rOmwSUiP8ejy j02MI0mvYYnZybJDCVKgPMNwJDKH/g== X-Google-Smtp-Source: ABdhPJw87De6oj1zXmLDC3T1oUTv6tjseaVC2a7PMA0RvGXjXohoajywx0BJb2EFqEr4xwHYrRlRbQ== X-Received: by 2002:a05:620a:25c7:b0:699:be71:59ee with SMTP id y7-20020a05620a25c700b00699be7159eemr35061467qko.222.1653843328478; Sun, 29 May 2022 09:55:28 -0700 (PDT) Received: from localhost.localdomain (2603-6081-7b00-25fd-0000-0000-0000-1003.res6.spectrum.com. [2603:6081:7b00:25fd::1003]) by smtp.gmail.com with ESMTPSA id o15-20020ac841cf000000b002f90517bc25sm6130409qtm.41.2022.05.29.09.55.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 09:55:27 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 04/20] Convert CONFIG_TPL_NAND_INIT to Kconfig Date: Sun, 29 May 2022 12:55:05 -0400 Message-Id: <20220529165521.912054-4-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220529165521.912054-1-trini@konsulko.com> References: <20220529165521.912054-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_TPL_NAND_INIT Signed-off-by: Tom Rini --- drivers/mtd/nand/raw/Kconfig | 4 ++++ drivers/mtd/nand/raw/Makefile | 2 +- drivers/mtd/nand/raw/fsl_ifc_spl.c | 2 +- include/configs/P1010RDB.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index d75f371c951f..4129a33866bf 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -23,6 +23,9 @@ config TPL_SYS_NAND_SELF_INIT This option, if enabled, provides more flexible and linux-like NAND initialization process, in SPL. +config TPL_NAND_INIT + bool + config SYS_NAND_DRIVER_ECC_LAYOUT bool "Omit standard ECC layouts to save space" help @@ -165,6 +168,7 @@ config NAND_FSL_ELBC_DT config NAND_FSL_IFC bool "Support Freescale Integrated Flash Controller NAND driver" select TPL_SYS_NAND_SELF_INIT if TPL_NAND_SUPPORT + select TPL_NAND_INIT if TPL && !TPL_FRAMEWORK select SPL_SYS_NAND_SELF_INIT select SYS_NAND_SELF_INIT select FSL_IFC diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 6ec3581d20e9..e3f6b903f75f 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o obj-$(CONFIG_SPL_NAND_ECC) += nand_ecc.o obj-$(CONFIG_SPL_NAND_BASE) += nand_base.o obj-$(CONFIG_SPL_NAND_IDENT) += nand_ids.o nand_timings.o -obj-$(CONFIG_SPL_NAND_INIT) += nand.o +obj-$(CONFIG_TPL_NAND_INIT) += nand.o ifeq ($(CONFIG_SPL_ENV_SUPPORT),y) obj-$(CONFIG_ENV_IS_IN_NAND) += nand_util.o endif diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c index b7e37416a49b..4d11922a6503 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_spl.c +++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c @@ -297,7 +297,7 @@ void nand_boot(void) uboot(); } -#ifndef CONFIG_SPL_NAND_INIT +#ifndef CONFIG_TPL_NAND_INIT void nand_init(void) { } diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9024df1adcfd..ead535566157 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #else #ifdef CONFIG_TPL_BUILD -#define CONFIG_SPL_NAND_INIT #define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_NAND_U_BOOT_SIZE (576 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST (0x11000000) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b68082c41105..849a0b8cb649 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -93,7 +93,6 @@ #define CONFIG_SYS_MPC85XX_NO_RESETVEC #elif defined(CONFIG_MTD_RAW_NAND) #ifdef CONFIG_TPL_BUILD -#define CONFIG_SPL_NAND_INIT #define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_NAND_U_BOOT_SIZE (832 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST (0x11000000) -- 2.25.1