Message ID | 20221120140829.3057894-23-trini@konsulko.com |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=fTrZqBQg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFXdk2JQSz23mR for <incoming@patchwork.ozlabs.org>; Mon, 21 Nov 2022 01:16:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5D6C8542C; Sun, 20 Nov 2022 15:10:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="fTrZqBQg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6644485344; Sun, 20 Nov 2022 15:09:27 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (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 5BDA88530B for <u-boot@lists.denx.de>; Sun, 20 Nov 2022 15:09:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82e.google.com with SMTP id c15so5924865qtw.8 for <u-boot@lists.denx.de>; Sun, 20 Nov 2022 06:09:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lIFZjW85qrAogEFgEKXA+vT/gO9HW6l4MkDpppbiSk4=; b=fTrZqBQgA1HAjwm+MOzMpBFgrLitfZ5X8H/BRnp6f1u/K6EorStaXyX29n/oogFB0X rKD175+KCLN0MPDxya4Ga5LKX+tzesJ/f9Ao2qeyNAkSUT+dChS2cTdddzMx+9j2CV5y FsArHq2YraIQvGszR1kWFyVk4HPE+0E/S1hgw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lIFZjW85qrAogEFgEKXA+vT/gO9HW6l4MkDpppbiSk4=; b=ITD9NbC6e9/HPhZuh8gODw4cZfOuL7MVlEiFr/aUT1FL9fNthDHysIY16LobwMpt1E fmB6NEeus2QajdoIZ3yFmTThRsTE8TOfuDs6UKi5jNHnfLCHTyE9v5mUzeElURnZUEiq LTOvog4lKHZr12Y31Uace3AI4rvJNA1kMqpHudxMdRCcf1Iun6Zlog6wyGyvMQHMROR1 TJv1K5OLabs45NvR8XNdJntyeALiSXFjHwFgYXZHjCCXYvoR/IGZ10ISBhKwldKDe4gi d/5Tot2UDMf+PptugHVmX4z92bECQFRLTAiLEfD5QxllKdgVzkWUExrDKsDhWYb44Cra Wf1A== X-Gm-Message-State: ANoB5pmZ81VQluD/lVvxRiuNbVS+4Kke8K00VjToHwlVa/vkY6LNRwzb yZ7K5QEGzDIRqO19KD2IRmHixxMyE6R4tA== X-Google-Smtp-Source: AA0mqf7vFoRIMcpcA0O1qCAreBoUa3Tr17HdGUYnA1fj24tHg5kj/Ti0Jy+ML5OaXAovbBOMj3A4+A== X-Received: by 2002:ac8:7255:0:b0:3a5:68b6:88f2 with SMTP id l21-20020ac87255000000b003a568b688f2mr13974159qtp.471.1668953323517; Sun, 20 Nov 2022 06:08:43 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.08.43 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:43 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PoC 132/241] global: Migrate CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC to CFG Date: Sun, 20 Nov 2022 09:07:22 -0500 Message-Id: <20221120140829.3057894-23-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index e4e144bd7c83..25cd685555e8 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -266,7 +266,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = { #if defined(CONFIG_SYS_NAND_PAGE_2K) .eccbytes = 40, -#ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC +#ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC .eccpos = { 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -287,7 +287,7 @@ static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = { .oobfree = { {.offset = 2, .length = 22, }, }, -#endif /* #ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */ +#endif /* #ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */ #elif defined(CONFIG_SYS_NAND_PAGE_4K) .eccbytes = 80, .eccpos = { diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index b1fc437395dd..5384c1f470c5 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -109,7 +109,7 @@ #define CFG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE #define CFG_SYS_NAND_MASK_CLE 0x10 #define CFG_SYS_NAND_MASK_ALE 0x8 -#define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC +#define CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC #define CFG_SYS_NAND_U_BOOT_SIZE SZ_512K #define CFG_SYS_NAND_U_BOOT_DST 0xc1080000 #define CFG_SYS_NAND_U_BOOT_START CFG_SYS_NAND_U_BOOT_DST diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8fdece74ef1e..a7409a7f4978 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -141,7 +141,7 @@ CFG_MXC_UART_BASE CFG_MXC_USB_FLAGS CFG_MXC_USB_PORT CFG_MXC_USB_PORTSC -CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC +CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CONFIG_NAND_CS_INIT CONFIG_NETDEV CONFIG_NETMASK
Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/mtd/nand/raw/davinci_nand.c | 4 ++-- include/configs/omapl138_lcdk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)