From patchwork Sun Nov 20 13:55:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706815 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=kZNw9U8S; 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 4NFX8x60wfz23n6 for ; Mon, 21 Nov 2022 00:55:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF77C85249; Sun, 20 Nov 2022 14:55:25 +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="kZNw9U8S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 180978528A; Sun, 20 Nov 2022 14:55:25 +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-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 A505A84913 for ; Sun, 20 Nov 2022 14:55:22 +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-x831.google.com with SMTP id w4so5960596qts.0 for ; Sun, 20 Nov 2022 05:55:22 -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=LriDDHP6Hr7jMNXm7gg4VVQmSWqabmwx2Fs2dbEJ7zk=; b=kZNw9U8SZwW8xnkS5ghaeolj82SD2NEJwZn5VWcR6BYm5KQj2iudq/zt5S6tSf1kfs oYdfZaXW9fZVoWzrsMYTUDlXFHLw47bdq4v2rhv4RcI0M7ruTkEH9IWBIIPcdo+z2IhW u3agFzQepiNkSjOXQOCIgJTwJGSRGvcM54ayM= 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=LriDDHP6Hr7jMNXm7gg4VVQmSWqabmwx2Fs2dbEJ7zk=; b=fBX/w+2WMfWyrsZxwU0L9T+uMNy8ESqagD2/eYFn+srhFXTHzEQEED7Lb7ztGNtQQE hE0aHaAdSe7yAqaCeJR5fqTpfWXF5ZFsal8WaFrDAPbHA//L/715fWLGTOxvPiiV78Y4 fyDZ46imhRbx2EanvSWij+mvaaA1EEJFeO49inxWAEGShDou2tmTQH8gJjW8PoMo98DI AEZsn9bD8NG3kDGQqo3GxZ5BdhPag/0Isn2yifxiuWpnk+01VhTZ0G3GZOud0jHT74H0 oYhlrXBrKUl3NRqzv8yQWxeHM8PPrHAVudUaYO+1Kt+tW8X5oTJHpcd6KcAQVOVYmiTR 2+Vg== X-Gm-Message-State: ANoB5pncVdGIcGOrKzmACcfND1Hb+kUuhz9dN3FKAup0gD0hQIGd7CAv CE5GbVbmFykVIojd3smscvB3+EMH5Sfwtg== X-Google-Smtp-Source: AA0mqf4gVp0Xe55C4YWk00qI0gEkSvNP0DFP5VAz1UQ4wuSE1G37yeBDib62RvxMNLtZbcCCuFF2eA== X-Received: by 2002:ac8:13c7:0:b0:3a5:36cd:a5a4 with SMTP id i7-20020ac813c7000000b003a536cda5a4mr14386522qtj.81.1668952521337; Sun, 20 Nov 2022 05:55:21 -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 v18-20020a05620a0f1200b006fa32a26433sm6387618qkl.38.2022.11.20.05.55.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:55:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 106/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG Date: Sun, 20 Nov 2022 08:55:17 -0500 Message-Id: <20221120135520.3057773-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221120133352.3055600-1-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index dee8fd24b94b..a070df81d7cd 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void) writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | - TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | + TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 24312c848e2d..5719e422da97 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -44,7 +44,7 @@ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_WHOLD 200000000 -#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 +#define CFG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9609ea606fd3..1051a7b949ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -114,7 +114,7 @@ CFG_LPC32XX_NAND_SLC_RSETUP CFG_LPC32XX_NAND_SLC_RWIDTH CFG_LPC32XX_NAND_SLC_WDR_CLKS CFG_LPC32XX_NAND_SLC_WHOLD -CONFIG_LPC32XX_NAND_SLC_WSETUP +CFG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH CONFIG_MACB_SEARCH_PHY CONFIG_MALLOC_F_ADDR From patchwork Sun Nov 20 13:55:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706816 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=WBgxjeOz; 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 4NFX955XMTz23n6 for ; Mon, 21 Nov 2022 00:55:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B074785294; Sun, 20 Nov 2022 14:55:28 +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="WBgxjeOz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE55C84913; Sun, 20 Nov 2022 14:55:25 +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-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 2FB9F85249 for ; Sun, 20 Nov 2022 14:55:23 +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-qv1-xf30.google.com with SMTP id p8so5832110qvn.5 for ; Sun, 20 Nov 2022 05:55:23 -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=xotJFskliWAyGJjpyqrENaBE/raPQEE4KduG9JPrlqI=; b=WBgxjeOzkqtE6Zme5klGbPSuKz+Q54V2AGk6t3w6RTAs1sahbLmTHKO7IgN1RAkhJj d6vpeo2il3rt04MWrbOeqJ43TzerIx15m1x8F6oisGI6M9nXgD47xuAMewC8cAimXiLv tCTlPQhNFJf/hvE5lfGaISWZsoUw2FMlzsU0M= 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=xotJFskliWAyGJjpyqrENaBE/raPQEE4KduG9JPrlqI=; b=g6uoH3LxK2Uuf9xwjBjMY77auxPHuA4ySIVbMvqqygeR/VGWUbjEGYI6SwxEU+CEfw ClidY8rmiDzKr6dEIy82nGBPXLFlMRhD3QVrjGAlGVykdcSdyzplPGQYEYLZkpoiq1Yf zVfwklqnLw13fsq8TEA2702TMQaE6goIIrlv1Zdbq2YQFPdvmWCRwPGwH0UqXkZ+tI3C GdjJc/LiMRssb/ZOUvpnPnCGqMZSqsm0QkS7AD7ZwSOaaHwNx4FYfkmdZEkEbhBOBf/l KRx2jHcs5D3xBi2i5OeKe9VcBNmjLn2ClKaKDuYE2XNT4wFbLxMm+MtV+aLFaE/1j7qz UZng== X-Gm-Message-State: ANoB5pkJ7QtJuyOBTQa5OGVy17SQMBsfMMkex0IqbO4gVWokWWMq6IrD +ICHcvvIVfv4HqWCIvvANw7admjIsGAYZg== X-Google-Smtp-Source: AA0mqf7a4iBS0F+gLoIxIxx4VeirX3LKVCoL6GEnpG4h0yJjIxZj2AUN/VCOeVqhHoGe0t8BKKmfdA== X-Received: by 2002:a0c:d806:0:b0:4b1:d18b:642a with SMTP id h6-20020a0cd806000000b004b1d18b642amr3232101qvj.11.1668952521830; Sun, 20 Nov 2022 05:55:21 -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 v18-20020a05620a0f1200b006fa32a26433sm6387618qkl.38.2022.11.20.05.55.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:55:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 107/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG Date: Sun, 20 Nov 2022 08:55:18 -0500 Message-Id: <20221120135520.3057773-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120135520.3057773-1-trini@konsulko.com> References: <20221120133352.3055600-1-trini@konsulko.com> <20221120135520.3057773-1-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index a070df81d7cd..356f8d9440bb 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -127,7 +127,7 @@ static void lpc32xx_nand_init(void) /* Configure NAND flash timings */ writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | - TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | + TAC_W_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 5719e422da97..9cfee381d4ac 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -42,7 +42,7 @@ * NAND chip timings */ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 -#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 +#define CFG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CFG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1051a7b949ec..58792f1d2b7c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -115,7 +115,7 @@ CFG_LPC32XX_NAND_SLC_RWIDTH CFG_LPC32XX_NAND_SLC_WDR_CLKS CFG_LPC32XX_NAND_SLC_WHOLD CFG_LPC32XX_NAND_SLC_WSETUP -CONFIG_LPC32XX_NAND_SLC_WWIDTH +CFG_LPC32XX_NAND_SLC_WWIDTH CONFIG_MACB_SEARCH_PHY CONFIG_MALLOC_F_ADDR CONFIG_MALTA From patchwork Sun Nov 20 13:55:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706817 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=l+Ekwdtm; 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 4NFX9H0BbBz23n6 for ; Mon, 21 Nov 2022 00:55:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57B558529E; Sun, 20 Nov 2022 14:55:33 +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="l+Ekwdtm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B0908528A; Sun, 20 Nov 2022 14:55: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-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 A03BF85282 for ; Sun, 20 Nov 2022 14:55:23 +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-x830.google.com with SMTP id fz10so5928823qtb.3 for ; Sun, 20 Nov 2022 05:55:23 -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=+xw+s+sjxHdG6beLJURF1OAwqjtM7gWwNGO1eIbUsII=; b=l+EkwdtmzJqEjhbutnxoXEdCxxp8friQJGMyuApCTLJsvHg5jbLmsMVtZ+vLCshf+3 zxatApWTw46TKRJm5hR+Ee54BIHkif+9qv4weIpYP/mmY2XJFG3KTPGO56G/CXrJEwI5 qsGNf6L7Tpd5jddd54ScoIwN876MoaCiJmSrU= 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=+xw+s+sjxHdG6beLJURF1OAwqjtM7gWwNGO1eIbUsII=; b=13lyPAMpYEcg8/sgbs0TLHXGikL8EKly+rDuUzcoQnsmBYQ84m3WpXgVqvXV3P4++i DZ3dbrtmox7knHaatWMXIZ01tAv534PlMzbLYe9fQqJ5s0adeDyPBdmUR9SPsp5+sYGc ODbHCzlSHbH4Bl0E9UBIyjosjskNOBGPAW7rD3RMdYKgAtn67xqWTulOXpEyd+3G9YWj jxYMJJmPK9+r/kngszu9cWFzTw8LcOxcjyenbkUfX9pJ7CiY0DMq1rmJvH5XZUQy570/ UVfBYaXHQ6rmDC+Vh8JYecBfJIu/4wBchX3MXBd+FypevDPAqMJBjRPoGZpW7rshUA0z hM8A== X-Gm-Message-State: ANoB5pleR5ZLwlft+ORiRWJxokgvJQd3GgMU/I4YzFnaEaA2v/6P3vcE 71QW/UsBji2CIjcEIfS8StWgMQsTQKN3Ww== X-Google-Smtp-Source: AA0mqf7NWYAfH3KzrvxXu6DFJcDQ5g/I2GB74UHOf5iKct1fVsAX/BlFIrCwNAqo7bH2mFPs9jcrNQ== X-Received: by 2002:ac8:41ce:0:b0:3a5:2a53:bba2 with SMTP id o14-20020ac841ce000000b003a52a53bba2mr13980334qtm.406.1668952522343; Sun, 20 Nov 2022 05:55:22 -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 v18-20020a05620a0f1200b006fa32a26433sm6387618qkl.38.2022.11.20.05.55.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:55:22 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 108/241] global: Migrate CONFIG_MACB_SEARCH_PHY to CFG Date: Sun, 20 Nov 2022 08:55:19 -0500 Message-Id: <20221120135520.3057773-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120135520.3057773-1-trini@konsulko.com> References: <20221120133352.3055600-1-trini@konsulko.com> <20221120135520.3057773-1-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/ethernut5.h | 2 +- include/configs/vinco.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 52eb0be67611..2859188e60c9 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -49,7 +49,7 @@ /* Ethernet */ #define CONFIG_PHY_ID 0 -#define CONFIG_MACB_SEARCH_PHY +#define CFG_MACB_SEARCH_PHY /* MMC */ #ifdef CONFIG_CMD_MMC diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 74ee61f09238..1e1175f00689 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -40,7 +40,7 @@ /* USB device */ /* Ethernet Hardware */ -#define CONFIG_MACB_SEARCH_PHY +#define CFG_MACB_SEARCH_PHY #ifdef CONFIG_SPI_BOOT /* bootstrap + u-boot + env + linux in serial flash */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 58792f1d2b7c..316095b75e0d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -116,7 +116,7 @@ CFG_LPC32XX_NAND_SLC_WDR_CLKS CFG_LPC32XX_NAND_SLC_WHOLD CFG_LPC32XX_NAND_SLC_WSETUP CFG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_MACB_SEARCH_PHY +CFG_MACB_SEARCH_PHY CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MAX_DSP_CPUS From patchwork Sun Nov 20 13:55:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706818 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=qYk4EEKq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFX9T1n0Zz23n6 for ; Mon, 21 Nov 2022 00:55:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 895168529A; Sun, 20 Nov 2022 14:55:35 +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="qYk4EEKq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C82A685287; Sun, 20 Nov 2022 14:55:28 +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-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 79FE085287 for ; Sun, 20 Nov 2022 14:55:24 +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-qv1-xf33.google.com with SMTP id i12so6504910qvs.2 for ; Sun, 20 Nov 2022 05:55:24 -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=UFjTFH2aVZuIbbZtvvwiAJPK2jraIe0t+kdODzQIcIg=; b=qYk4EEKquf0IrNgTWFJM6SYagv3IHzW4uL1l3Yse1zrqwwQEk54nwParLAURW/eM6S mAAZmtcGVRtox8+W99M1/3zsSJ7xNoNc9WbnYGQkLwUhewiyq2tN3Xz8juVOayjlkyab UNbhRpFqdG3x1UXNrq9m+9UbL4vwK7UWiS9ss= 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=UFjTFH2aVZuIbbZtvvwiAJPK2jraIe0t+kdODzQIcIg=; b=30WDZhjjeSDxqDssxBOO2R6H6Si/vC0YvlaF06JpHMAtuiYW+qpR8NqICTbwjdiSMw LzwqLzOmk9i5KvZUhbuQXWmGBWaWB/3g21Elf/UDcNhLeAUU/BIuN8x3zi5p92XFiVxi 6BTovJQvoYwCIuNMQrKU7kpQbdyKW4syc8c/rYVETI99eTLtO4HdZ1stfDySj31H3lM9 WhPXRKlsLmowdjkyFgd2NZ1rLKRk5iuvWq93wdSok8eC73yQe6Su25bYM+fStTgGSmRk +wj/g1oJeOPOMHpC3n2yPsenL7hsF1T1uDm3u6rYvHQF2hgV90y9j10bk2D7qlm1mT2t SInA== X-Gm-Message-State: ANoB5pljkgzd1VapIdtA68nkiGYLRDZGx+2KKOCg/J4jJx2i3g0F0pZQ 8R9hUWXc7gs9YmvERpWZDvgB0Y2v/pcl0A== X-Google-Smtp-Source: AA0mqf6ROsN0jfItitQ/1YxVKGiReqSHIrsYQz3+tgr2se5d8uXBUl6EosnjchHcxg0Tm9itzBVsUw== X-Received: by 2002:a05:6214:3b01:b0:4c6:21d3:d074 with SMTP id nm1-20020a0562143b0100b004c621d3d074mr13771759qvb.126.1668952522940; Sun, 20 Nov 2022 05:55:22 -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 v18-20020a05620a0f1200b006fa32a26433sm6387618qkl.38.2022.11.20.05.55.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:55:22 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 109/241] global: Migrate CONFIG_MALLOC_F_ADDR to CFG Date: Sun, 20 Nov 2022 08:55:20 -0500 Message-Id: <20221120135520.3057773-4-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120135520.3057773-1-trini@konsulko.com> References: <20221120133352.3055600-1-trini@konsulko.com> <20221120135520.3057773-1-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/sandbox/cpu/start.c | 2 +- common/init/board_init.c | 2 +- common/spl/spl.c | 4 ++-- doc/arch/sandbox/sandbox.rst | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm_beacon.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mm_icore_mx8mm.h | 2 +- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8qm_mek.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/phycore_imx8mm.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/sandbox.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/verdin-imx8mp.h | 2 +- scripts/config_whitelist.txt | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 622df41f54cf..234652872ecc 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[]) } #if CONFIG_VAL(SYS_MALLOC_F_LEN) - gd->malloc_base = CONFIG_MALLOC_F_ADDR; + gd->malloc_base = CFG_MALLOC_F_ADDR; #endif #if CONFIG_IS_ENABLED(LOG) gd->default_log_level = state->default_log_level; diff --git a/common/init/board_init.c b/common/init/board_init.c index 6a550261778d..96ffb79a9869 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void) ulong board_init_f_alloc_reserve(ulong top) { /* Reserve early malloc arena */ -#ifndef CONFIG_MALLOC_F_ADDR +#ifndef CFG_MALLOC_F_ADDR #if CONFIG_VAL(SYS_MALLOC_F_LEN) top -= CONFIG_VAL(SYS_MALLOC_F_LEN); #endif diff --git a/common/spl/spl.c b/common/spl/spl.c index 1d2e8fda7284..4668367b680f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc) #if CONFIG_VAL(SYS_MALLOC_F_LEN) if (setup_malloc) { -#ifdef CONFIG_MALLOC_F_ADDR - gd->malloc_base = CONFIG_MALLOC_F_ADDR; +#ifdef CFG_MALLOC_F_ADDR + gd->malloc_base = CFG_MALLOC_F_ADDR; #endif gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN); gd->malloc_ptr = 0; diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst index e6d840365166..cd7f8a2cb0dc 100644 --- a/doc/arch/sandbox/sandbox.rst +++ b/doc/arch/sandbox/sandbox.rst @@ -615,7 +615,7 @@ Addr Config Usage ======= ======================== =============================== 0 CONFIG_SYS_FDT_LOAD_ADDR Device tree c000 CONFIG_BLOBLIST_ADDR Blob list - 10000 CONFIG_MALLOC_F_ADDR Early memory allocation + 10000 CFG_MALLOC_F_ADDR Early memory allocation f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used as the SPL load buffer in spl_test_load(). diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 19c7fca03b29..9e7322cdb937 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -14,7 +14,7 @@ /* SPL config */ #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000 #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index caa1498acead..a63325973846 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -13,7 +13,7 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000 #endif diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 7785bdc7cbe6..64cdc401d039 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -16,7 +16,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x912000 +#define CFG_MALLOC_F_ADDR 0x912000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index ee524f0e63f2..d85ae21e2317 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -14,7 +14,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 44d74bb1a788..0723d27ab703 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -11,7 +11,7 @@ #include #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index c364e06dc450..d5642b96495f 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -24,7 +24,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index e718daa07c3e..2158b0af74f9 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -15,7 +15,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -# define CONFIG_MALLOC_F_ADDR 0x930000 +# define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index c490e3829f9a..5579a05d165f 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -14,7 +14,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 #endif /* Enable Distro Boot */ diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 38ae5f137022..e4e24b522fdb 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -24,7 +24,7 @@ 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9) #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x184000 /* malloc f used before \ +#define CFG_MALLOC_F_ADDR 0x184000 /* malloc f used before \ * GD_FLG_FULL_MALLOC_INIT \ * set \ */ diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index f6f356d27ba2..f7ae1b47d063 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index d9ce5d5d0f1a..4b46321e8512 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -15,7 +15,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index eb7059f0648c..5158f2cc605a 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 7772e71013ef..a25efbb16bdb 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -12,7 +12,7 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000 #endif diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 669da591fa2b..4f55ae49403d 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -12,7 +12,7 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000 #endif diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index b7397f6038fd..d77510e1685e 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -12,7 +12,7 @@ #define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x22040000 +#define CFG_MALLOC_F_ADDR 0x22040000 #endif diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h index 5cd6492dd503..7b7bef3ca755 100644 --- a/include/configs/imx93_evk.h +++ b/include/configs/imx93_evk.h @@ -14,7 +14,7 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x204D0000 +#define CFG_MALLOC_F_ADDR 0x204D0000 #endif #ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 56d0036147c6..657124cc725d 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -47,7 +47,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 #endif #define CFG_EXTRA_ENV_SETTINGS BOOTENV diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 4dd51c7f1d7f..5a3c9f76a431 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -16,7 +16,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 218e9d9b3013..0a1df4ad4bd0 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -32,7 +32,7 @@ /* generic timer */ /* early heap for SPL DM */ -#define CONFIG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE +#define CFG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE /* serial port */ #define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2) diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 9160c78c0464..ce6dc87c69c7 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -16,7 +16,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 1d8709180c83..37ade717ae99 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index c9e57da0160a..99893a7070fe 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -6,7 +6,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MALLOC_F_ADDR 0x0010000 +#define CFG_MALLOC_F_ADDR 0x0010000 /* GUIDs for capsule updatable firmware images */ #define SANDBOX_UBOOT_IMAGE_GUID \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 7f3fa795afdc..27d7efb883de 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -14,7 +14,7 @@ #ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 3ce2714e196e..d03c69cf00ae 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -16,7 +16,7 @@ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x184000 +#define CFG_MALLOC_F_ADDR 0x184000 /* For RAW image gives a error info not panic */ #define CONFIG_POWER_PCA9450 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 316095b75e0d..f42481a7b3bc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -117,7 +117,7 @@ CFG_LPC32XX_NAND_SLC_WHOLD CFG_LPC32XX_NAND_SLC_WSETUP CFG_LPC32XX_NAND_SLC_WWIDTH CFG_MACB_SEARCH_PHY -CONFIG_MALLOC_F_ADDR +CFG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MAX_DSP_CPUS CONFIG_MAX_MEM_MAPPED From patchwork Sun Nov 20 14:07:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706820 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=Zuhftq40; 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 4NFXSF6r4Jz23lt for ; Mon, 21 Nov 2022 01:08:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5EB7852B3; Sun, 20 Nov 2022 15:08:36 +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="Zuhftq40"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 88E07852AB; Sun, 20 Nov 2022 15:08:34 +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-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 3F69C8528F for ; Sun, 20 Nov 2022 15:08:32 +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-qk1-x72f.google.com with SMTP id i9so6515518qki.10 for ; Sun, 20 Nov 2022 06:08:32 -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=lHeVI5VU9wIsk6QquLS1iuOOEIbT6Ah5ZyeO4WBDqg4=; b=Zuhftq40LNQ5PVKiRVtNW5EJrUs9H5Ca08AU7md5355w4CKL5z/dNguU50TI2/PllE 9bZ3xvgRNyS7VaV+wErAO5duovQj7HcDDnaN1V1Hof+Bwy1MjTuwUOkBIL4kqfcVq3br foVj4OmEfYB4+Uz2H3yGw+xDaZS7EevYKVYXE= 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=lHeVI5VU9wIsk6QquLS1iuOOEIbT6Ah5ZyeO4WBDqg4=; b=jMyGFY7TkQ723LtFUO/XhKMvDhU7F/YshmaRnhwiMWM0VZ5mCOhF4C/om7AsPSGXMg ivzMWL4BYxD5eVB3kaob9VWqtNahoPha2iykvMVNl6AOFBAy9WKox4ZVfAaC2EuDjQ39 HCFC+R/T8Zk/nD0FjYi0k6MaR+fe8N/5h0LM+pRa3zwMjA5STtNR8OzFgIlHuwM1EIPx oTgeB7u+9KJK66UxhLkQNRRXi8lkJJ8E+hvob6K3Ce/xKE3zd66m9zlspuYwKBoAAjRU OIOeALDCfvW9jeh8D6toemqi+azf6hysFtHcKDcvFMoqBZPceNeyVkudDxnIH3rj4Nbx 6syw== X-Gm-Message-State: ANoB5plIscg/3TH3rGIffJEufImsCVvGAntFW1Xun97s8Qbkd64QKtHk IhyI4uSz6duvgtqME7EbR8fRpTOydBZU0A== X-Google-Smtp-Source: AA0mqf4FlUM+37HXHBOAw/GD+HIqgNa0ONGF1VbgGvCtIFdQNK7vU/5VaKaU4G3e/fZrR9IKSEF3NQ== X-Received: by 2002:a37:af05:0:b0:6fa:da64:4879 with SMTP id y5-20020a37af05000000b006fada644879mr236079qke.312.1668953310802; Sun, 20 Nov 2022 06:08:30 -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.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:30 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 110/241] global: Migrate CONFIG_MALTA to CFG Date: Sun, 20 Nov 2022 09:07:00 -0500 Message-Id: <20221120140829.3057894-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120135520.3057773-4-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/rtc/mc146818.c | 2 +- include/configs/malta.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index 122691b97842..d5f9f4206566 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -13,7 +13,7 @@ #include #include -#if defined(CONFIG_X86) || defined(CONFIG_MALTA) +#if defined(CONFIG_X86) || defined(CFG_MALTA) #include #define in8(p) inb(p) #define out8(p, v) outb(v, p) diff --git a/include/configs/malta.h b/include/configs/malta.h index 65f4b05649b2..cd4f382b18f9 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -9,7 +9,7 @@ /* * System configuration */ -#define CONFIG_MALTA +#define CFG_MALTA #define CONFIG_MEMSIZE_IN_BYTES diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f42481a7b3bc..c72372a11ddc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -118,7 +118,7 @@ CFG_LPC32XX_NAND_SLC_WSETUP CFG_LPC32XX_NAND_SLC_WWIDTH CFG_MACB_SEARCH_PHY CFG_MALLOC_F_ADDR -CONFIG_MALTA +CFG_MALTA CONFIG_MAX_DSP_CPUS CONFIG_MAX_MEM_MAPPED CONFIG_MAX_RAM_BANK_SIZE From patchwork Sun Nov 20 14:07:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706821 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=Z0IczuDW; 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 4NFXSM0kMRz23lt for ; Mon, 21 Nov 2022 01:08:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4BD17852C4; Sun, 20 Nov 2022 15:08:39 +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="Z0IczuDW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E9F1985297; Sun, 20 Nov 2022 15:08:34 +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-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 909D885298 for ; Sun, 20 Nov 2022 15:08:32 +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-qv1-xf29.google.com with SMTP id p8so5844148qvn.5 for ; Sun, 20 Nov 2022 06:08:32 -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=wzg7lgcspmDl1yml5VYC9QKdjIuZsELX1U0pY0JflJE=; b=Z0IczuDWzHrMBeL/KwOKqnp3Jm2MelkVIyJFOKCjXLUB3/k80jjcxVSMIhw3JAUsD4 SyVVDGXno2APBPYWKAsaGoJXZBOQ8b6XSl5hqpaqzQJ7alhQ9fb8lINasQtzOtNGh9AU 4RTVk9z4iqk3B7p1PEmVBEL5WotT61LlK6epo= 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=wzg7lgcspmDl1yml5VYC9QKdjIuZsELX1U0pY0JflJE=; b=zg/XGYgNwoo4X1sslIQ/BzZtWi/1r6hWSfDjePifMib3bPtiFc+mVgmKo66Nm6QE8n eqdOm92iUXhMkzRitPc/oJxj4KbCZv/CNChuACzTOB0VC5M+jkbMPd3+ZlSo+ync33Uf xbbgggUDpJMzphuqVaT2Mlhf1tX0ptd2VmLqxSzZ/qfcblKzz5zQ0YrZytKwnnjxMiwU cGtoTV8ZoaQQyataa5JZ0C9QX2ecDqaxYi++08zALUOjIN4ekymrI8eu5iU4HbQdZb4n 6xP+x1FEf2RdqyxVBOG452gXfd4vj1es9JIj9aAewp9hJu9arltJGRTRFOtUFJabPbYj 9esw== X-Gm-Message-State: ANoB5plivd2WkNnm3ckCVVAB08zbaW0kFcvtRrojIDsOtmcC9SxB5MfD +JAcruvdhErA+ViddTI7Y//KLAHGZNLWuA== X-Google-Smtp-Source: AA0mqf7BmYYRSLy/enp0NPkTmHhnos4jUlHG0KC6GtZEB8FV+r3RAhL8tmI2rJs35IpG0MlUABr0sw== X-Received: by 2002:a05:6214:1850:b0:49b:402f:cf30 with SMTP id d16-20020a056214185000b0049b402fcf30mr13860545qvy.117.1668953311230; Sun, 20 Nov 2022 06:08:31 -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.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:31 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 111/241] global: Migrate CONFIG_MAX_DSP_CPUS to CFG Date: Sun, 20 Nov 2022 09:07:01 -0500 Message-Id: <20221120140829.3057894-2-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/powerpc/include/asm/config_mpc85xx.h | 4 ++-- doc/README.Heterogeneous-SoCs | 2 +- include/e500.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index d6b2b9b469a3..9738c573452b 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -152,7 +152,7 @@ #define CFG_SYS_FM_MURAM_SIZE 0x60000 #ifdef CONFIG_ARCH_B4860 -#define CONFIG_MAX_DSP_CPUS 12 +#define CFG_MAX_DSP_CPUS 12 #define CONFIG_NUM_DSP_CPUS 6 #define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 } #define CFG_SYS_NUM_FM1_DTSEC 6 @@ -161,7 +161,7 @@ #define CFG_SYS_FSL_SRIO_OB_WIN_NUM 9 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM 5 #else -#define CONFIG_MAX_DSP_CPUS 2 +#define CFG_MAX_DSP_CPUS 2 #define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4 } #define CFG_SYS_NUM_FM1_DTSEC 4 #define CFG_SYS_NUM_FM1_10GEC 0 diff --git a/doc/README.Heterogeneous-SoCs b/doc/README.Heterogeneous-SoCs index 9da652e459be..11f2dbc0013d 100644 --- a/doc/README.Heterogeneous-SoCs +++ b/doc/README.Heterogeneous-SoCs @@ -72,7 +72,7 @@ CONFIG_SYS_ETVPE_CLK - Define PLL index for ETVPE clock DSP cores and other device's components have been added in this structure. -freq_processor_dsp[CONFIG_MAX_DSP_CPUS] - Array to contain the DSP core's frequencies +freq_processor_dsp[CFG_MAX_DSP_CPUS] - Array to contain the DSP core's frequencies freq_cpri - To store CPRI frequency freq_maple - To store MAPLE frequency freq_maple_ulb - To store MAPLE-ULB frequency diff --git a/include/e500.h b/include/e500.h index 9f68a834c2f0..9ea90109406c 100644 --- a/include/e500.h +++ b/include/e500.h @@ -12,7 +12,7 @@ typedef struct { unsigned long freq_processor[CONFIG_MAX_CPUS]; #ifdef CONFIG_HETROGENOUS_CLUSTERS - unsigned long freq_processor_dsp[CONFIG_MAX_DSP_CPUS]; + unsigned long freq_processor_dsp[CFG_MAX_DSP_CPUS]; #endif unsigned long freq_systembus; unsigned long freq_ddrbus; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c72372a11ddc..31484bd13fd9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -119,7 +119,7 @@ CFG_LPC32XX_NAND_SLC_WWIDTH CFG_MACB_SEARCH_PHY CFG_MALLOC_F_ADDR CFG_MALTA -CONFIG_MAX_DSP_CPUS +CFG_MAX_DSP_CPUS CONFIG_MAX_MEM_MAPPED CONFIG_MAX_RAM_BANK_SIZE CONFIG_MEMSIZE_IN_BYTES From patchwork Sun Nov 20 14:07:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706824 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=CkOC+2ee; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXSz4gGgz23lt for ; Mon, 21 Nov 2022 01:09:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 73408852AD; Sun, 20 Nov 2022 15:08:44 +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="CkOC+2ee"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14B3D852A3; Sun, 20 Nov 2022 15:08:38 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 9CB0C852A3 for ; Sun, 20 Nov 2022 15:08:33 +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-qk1-x734.google.com with SMTP id z1so6527026qkl.9 for ; Sun, 20 Nov 2022 06:08:33 -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=k28EUC3mLj9uH29JwpUxORB9oQCYm0HNV23F8AUcdwg=; b=CkOC+2ee3e5Uqd16RjA2qwH7ipj127sN0TaQ2us562VzDRQw7KJYUb9t36JCVP8tay +JfSZGPHez39tLkz9II23geUARo5wpDql9OOr5LclS8aT+01zKlvZ6IqKgmrRUwHkufM wdcbF/DSL5lp+iTX6xvQijYm5N+yv9fzJJBPc= 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=k28EUC3mLj9uH29JwpUxORB9oQCYm0HNV23F8AUcdwg=; b=pKAYbxZs/iopu8TUsyAWycTUOzVn+0jPo4Ll9ylyuNMDhJh4U6g4HoTFrQ7RAYv9HJ 1BPDLTL1i4UDTrcnxH4jzHlrUpTp+WrUBbWLFP9h+d7TVF+/o1OluaUY+tRXtyuYWbjg B6xLzwrdHeuMsSA2qMrvCLcHzgavhatabOJuAK7gh6xKZB2dyksdn/fc5YWN7radc/BQ 1kg96FcSnrMngbf20a8qSyLJIhsxFcH1UbbpenIU3fMbhn7LwKbBj7Y6V8ky6qENadya HB7uZcKMg145xY5adGZ9iItc9yeB9lcsTnbMP+4J9arWulTR/OUCWRT+NwNgonDm2DpM y+aw== X-Gm-Message-State: ANoB5pk8UwcI2FDBskAnCe2Ysp2MmRZ+KUg4Izrie40Gz2RZLtzuTwrA tvZ//xq7++wcB0Q/lRuJK/edrTWuRhk8ng== X-Google-Smtp-Source: AA0mqf4pA+llnseAWv+Fxz2G5yv+dUgUdSx79i5P6yLDUTjcHlYhpZ7vRWMs0Mn4kaYhqLxk3Tfexg== X-Received: by 2002:a05:620a:a0e:b0:6f8:ab99:6c50 with SMTP id i14-20020a05620a0a0e00b006f8ab996c50mr13107500qka.639.1668953312060; Sun, 20 Nov 2022 06:08:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:31 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 112/241] global: Migrate CONFIG_MAX_MEM_MAPPED to CFG Date: Sun, 20 Nov 2022 09:07:02 -0500 Message-Id: <20221120140829.3057894-3-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 6 +++--- arch/arm/include/asm/arch-fsl-layerscape/config.h | 14 +++++++------- arch/arm/include/asm/arch-ls102xa/config.h | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 14 +++++++------- arch/powerpc/cpu/mpc85xx/mp.c | 4 ++-- arch/powerpc/cpu/mpc85xx/tlb.c | 8 ++++---- arch/powerpc/cpu/mpc8xxx/pamu_table.c | 2 +- arch/powerpc/include/asm/config.h | 6 +++--- arch/xtensa/include/asm/config.h | 2 +- board/ti/dra7xx/evm.c | 14 +++++++------- common/memsize.c | 6 +++--- drivers/ddr/fsl/util.c | 6 +++--- drivers/ram/mpc83xx_sdram.c | 4 ++-- include/configs/dra7xx_evm.h | 2 +- include/configs/mt7621.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/xtfpga.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 19 files changed, 53 insertions(+), 53 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 99413ef52e22..11ea2b149eab 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1311,13 +1311,13 @@ phys_size_t get_effective_memsize(void) * allocated from first region. If the memory extends to the second * region (or the third region if applicable), Management Complex (MC) * memory should be put into the highest region, i.e. the end of DDR - * memory. CONFIG_MAX_MEM_MAPPED is set to the size of first region so + * memory. CFG_MAX_MEM_MAPPED is set to the size of first region so * U-Boot doesn't relocate itself into higher address. Should DDR be * configured to skip the first region, this function needs to be * adjusted. */ - if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) { - ea_size = CONFIG_MAX_MEM_MAPPED; + if (gd->ram_size > CFG_MAX_MEM_MAPPED) { + ea_size = CFG_MAX_MEM_MAPPED; rem = gd->ram_size - ea_size; } else { ea_size = gd->ram_size; diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index c9c72e327172..b82aac9126d0 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -38,7 +38,7 @@ /* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE /* Generic Interrupt Controller Definitions */ #define GICD_BASE 0x06000000 @@ -123,7 +123,7 @@ /* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE /* DCFG - GUR */ #define CFG_SYS_FSL_OCRAM_BASE 0x18000000 /* initial RAM */ @@ -149,7 +149,7 @@ /* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE /* Generic Interrupt Controller Definitions */ #define GICD_BASE 0x06000000 @@ -193,7 +193,7 @@ /* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE /* SEC */ @@ -213,7 +213,7 @@ #define CFG_SYS_NUM_FM1_DTSEC 7 #define CFG_SYS_NUM_FM1_10GEC 1 #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 @@ -252,14 +252,14 @@ #define GICD_BASE 0x01401000 #define GICC_BASE 0x01402000 #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE #elif defined(CONFIG_ARCH_LS1046A) #define CFG_SYS_NUM_FMAN 1 #define CFG_SYS_NUM_FM1_DTSEC 8 #define CFG_SYS_NUM_FM1_10GEC 2 #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE /* SMMU Defintions */ #define SMMU_BASE 0x09000000 diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 6413a307d273..86bea960f1d1 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -76,7 +76,7 @@ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000) #ifdef CONFIG_DDR_SPD #define CONFIG_VERY_BIG_RAM -#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) +#define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #endif #define DCU_LAYER_MAX_NUM 16 diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index be85c54e4801..0abcc01b8574 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -616,12 +616,12 @@ static int reset_tlb(phys_addr_t p_addr, u32 size, phys_addr_t *phys_offset) /* * slide the testing window up to test another area * for 32_bit system, the maximum testable memory is limited to - * CONFIG_MAX_MEM_MAPPED + * CFG_MAX_MEM_MAPPED */ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset) { phys_addr_t test_cap, p_addr; - phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED); + phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED); #if !defined(CONFIG_PHYS_64BIT) || \ !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \ @@ -632,7 +632,7 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset) #endif p_addr = (*vstart) + (*size) + (*phys_offset); if (p_addr < test_cap - 1) { - p_size = min(test_cap - p_addr, CONFIG_MAX_MEM_MAPPED); + p_size = min(test_cap - p_addr, CFG_MAX_MEM_MAPPED); if (reset_tlb(p_addr, p_size, phys_offset) == -1) return -1; *vstart = CFG_SYS_DDR_SDRAM_BASE; @@ -649,18 +649,18 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset) /* initialization for testing area */ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset) { - phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED); + phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED); *vstart = CFG_SYS_DDR_SDRAM_BASE; - *size = (u32) p_size; /* CONFIG_MAX_MEM_MAPPED < 4G */ + *size = (u32) p_size; /* CFG_MAX_MEM_MAPPED < 4G */ *phys_offset = 0; #if !defined(CONFIG_PHYS_64BIT) || \ !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \ (CFG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull) - if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) { + if (gd->ram_size > CFG_MAX_MEM_MAPPED) { puts("Cannot test more than "); - print_size(CONFIG_MAX_MEM_MAPPED, + print_size(CFG_MAX_MEM_MAPPED, " without proper 36BIT support.\n"); } #endif diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index 44f8ed8a19a3..7c47e415f05d 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -193,8 +193,8 @@ u32 determine_mp_bootpg(unsigned int *pagesize) /* use last 4K of mapped memory */ - bootpg = ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ? - CONFIG_MAX_MEM_MAPPED : gd->ram_size) + + bootpg = ((gd->ram_size > CFG_MAX_MEM_MAPPED) ? + CFG_MAX_MEM_MAPPED : gd->ram_size) + CFG_SYS_SDRAM_BASE - 4096; if (pagesize) *pagesize = 4096; diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 5d21bef58781..2a78f0fe502c 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -306,12 +306,12 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr, u64 memsize = (u64)memsize_in_meg << 20; u64 size; - size = min(memsize, (u64)CONFIG_MAX_MEM_MAPPED); + size = min(memsize, (u64)CFG_MAX_MEM_MAPPED); size = tlb_map_range(ram_tlb_address, p_addr, size, TLB_MAP_RAM); - if (size || memsize > CONFIG_MAX_MEM_MAPPED) { - print_size(memsize > CONFIG_MAX_MEM_MAPPED ? - memsize - CONFIG_MAX_MEM_MAPPED + size : size, + if (size || memsize > CFG_MAX_MEM_MAPPED) { + print_size(memsize > CFG_MAX_MEM_MAPPED ? + memsize - CFG_MAX_MEM_MAPPED + size : size, " of DDR memory left unmapped in U-Boot\n"); #ifndef CONFIG_SPL_BUILD puts(" "); diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c index caad6670cc90..b906279226a5 100644 --- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c +++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c @@ -17,7 +17,7 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries) tbl->start_addr[i] = (uint64_t)virt_to_phys((void *)CFG_SYS_SDRAM_BASE); - tbl->size[i] = (phys_size_t)(min(gd->ram_size, CONFIG_MAX_MEM_MAPPED)); + tbl->size[i] = (phys_size_t)(min(gd->ram_size, CFG_MAX_MEM_MAPPED)); tbl->end_addr[i] = tbl->start_addr[i] + tbl->size[i] - 1; i++; diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 983c6f70cfee..f0702cab1431 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -14,13 +14,13 @@ #define HWCONFIG_BUFFER_SIZE 256 #endif -#ifndef CONFIG_MAX_MEM_MAPPED +#ifndef CFG_MAX_MEM_MAPPED #if defined(CONFIG_E500) || \ defined(CONFIG_MPC86xx) || \ defined(CONFIG_E300) -#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) +#define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #else -#define CONFIG_MAX_MEM_MAPPED (256 << 20) +#define CFG_MAX_MEM_MAPPED (256 << 20) #endif #endif diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index a1096ab1961b..aad06118cdbd 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -15,7 +15,7 @@ */ #if XCHAL_HAVE_PTP_MMU #define CONFIG_VERY_BIG_RAM -#define CONFIG_MAX_MEM_MAPPED (128 << 20) +#define CFG_MAX_MEM_MAPPED (128 << 20) #endif #endif diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 1c00e253ffc8..bd7aac3656a6 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -279,13 +279,13 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs) case DRA752_ES2_0: switch (emif_nr) { case 1: - if (ram_size > CONFIG_MAX_MEM_MAPPED) + if (ram_size > CFG_MAX_MEM_MAPPED) *regs = &emif1_ddr3_532_mhz_1cs_2G; else *regs = &emif1_ddr3_532_mhz_1cs; break; case 2: - if (ram_size > CONFIG_MAX_MEM_MAPPED) + if (ram_size > CFG_MAX_MEM_MAPPED) *regs = &emif2_ddr3_532_mhz_1cs_2G; else *regs = &emif2_ddr3_532_mhz_1cs; @@ -303,7 +303,7 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs) case DRA722_ES1_0: case DRA722_ES2_0: case DRA722_ES2_1: - if (ram_size < CONFIG_MAX_MEM_MAPPED) + if (ram_size < CFG_MAX_MEM_MAPPED) *regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es1; else *regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es2; @@ -362,7 +362,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) case DRA752_ES1_0: case DRA752_ES1_1: case DRA752_ES2_0: - if (ram_size > CONFIG_MAX_MEM_MAPPED) + if (ram_size > CFG_MAX_MEM_MAPPED) *dmm_lisa_regs = &lisa_map_dra7_2GB; else *dmm_lisa_regs = &lisa_map_dra7_1536MB; @@ -371,7 +371,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) case DRA722_ES2_0: case DRA722_ES2_1: default: - if (ram_size < CONFIG_MAX_MEM_MAPPED) + if (ram_size < CFG_MAX_MEM_MAPPED) *dmm_lisa_regs = &lisa_map_2G_x_2; else *dmm_lisa_regs = &lisa_map_2G_x_4; @@ -646,9 +646,9 @@ int dram_init_banksize(void) gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE; gd->bd->bi_dram[0].size = get_effective_memsize(); - if (ram_size > CONFIG_MAX_MEM_MAPPED) { + if (ram_size > CFG_MAX_MEM_MAPPED) { gd->bd->bi_dram[1].start = 0x200000000; - gd->bd->bi_dram[1].size = ram_size - CONFIG_MAX_MEM_MAPPED; + gd->bd->bi_dram[1].size = ram_size - CFG_MAX_MEM_MAPPED; } return 0; diff --git a/common/memsize.c b/common/memsize.c index 3c80ad2c8346..ad9ddf67ac5b 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -106,11 +106,11 @@ phys_size_t __weak get_effective_memsize(void) if (gd->ram_base + ram_size < gd->ram_base) ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base; -#ifndef CONFIG_MAX_MEM_MAPPED +#ifndef CFG_MAX_MEM_MAPPED return ram_size; #else /* limit stack to what we can reasonable map */ - return ((ram_size > CONFIG_MAX_MEM_MAPPED) ? - CONFIG_MAX_MEM_MAPPED : ram_size); + return ((ram_size > CFG_MAX_MEM_MAPPED) ? + CFG_MAX_MEM_MAPPED : ram_size); #endif } diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c index e49cf6e8e3db..60051392e713 100644 --- a/drivers/ddr/fsl/util.c +++ b/drivers/ddr/fsl/util.c @@ -139,10 +139,10 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params, } #if !defined(CONFIG_PHYS_64BIT) - if (base >= CONFIG_MAX_MEM_MAPPED) + if (base >= CFG_MAX_MEM_MAPPED) return; - if ((base + size) >= CONFIG_MAX_MEM_MAPPED) - size = CONFIG_MAX_MEM_MAPPED - base; + if ((base + size) >= CFG_MAX_MEM_MAPPED) + size = CFG_MAX_MEM_MAPPED - base; #endif if (set_ddr_laws(base, size, law_memctl) < 0) { printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num, diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c index a53ff93a6b06..5d022d4993bc 100644 --- a/drivers/ram/mpc83xx_sdram.c +++ b/drivers/ram/mpc83xx_sdram.c @@ -122,8 +122,8 @@ phys_size_t get_effective_memsize(void) return gd->ram_size; /* Limit stack to what we can reasonable map */ - return ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ? - CONFIG_MAX_MEM_MAPPED : gd->ram_size); + return ((gd->ram_size > CFG_MAX_MEM_MAPPED) ? + CFG_MAX_MEM_MAPPED : gd->ram_size); } /** diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 30def6abf8f4..2aca6ad085e6 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -14,7 +14,7 @@ #include #define CONFIG_VERY_BIG_RAM -#define CONFIG_MAX_MEM_MAPPED 0x80000000 +#define CFG_MAX_MEM_MAPPED 0x80000000 #ifndef CONFIG_QSPI_BOOT /* MMC ENV related defines */ diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h index 7c8c67f44697..188f481ec1fb 100644 --- a/include/configs/mt7621.h +++ b/include/configs/mt7621.h @@ -11,7 +11,7 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_VERY_BIG_RAM -#define CONFIG_MAX_MEM_MAPPED 0x1c000000 +#define CFG_MAX_MEM_MAPPED 0x1c000000 #define CFG_SYS_INIT_SP_OFFSET 0x800000 diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 54844fe69662..f13e9e6213bb 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -29,7 +29,7 @@ #define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) #define CONFIG_VERY_BIG_RAM -#define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) +#define CFG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) /* ENV setting */ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 271080303fb6..fa522ce82883 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -15,7 +15,7 @@ #define PHYS_SDRAM_SIZE (0x7c000000) /* Default size (2GB - Secure memory) */ #define CONFIG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ -#define CONFIG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE +#define CFG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE #define SQ_DRAMINFO_BASE (0x2e00ffc0) /* DRAM info from TF-A */ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 6c5a9f566bee..105ce7c0c726 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -27,7 +27,7 @@ #else #define CFG_SYS_MEMORY_BASE 0x60000000 #define CFG_SYS_IO_BASE 0x90000000 -#define CONFIG_MAX_MEM_MAPPED 0x10000000 +#define CFG_MAX_MEM_MAPPED 0x10000000 #endif /* Onboard RAM sizes: @@ -69,10 +69,10 @@ #define CONFIG_STANDALONE_LOAD_ADDR 0x60800000 #endif -#if defined(CONFIG_MAX_MEM_MAPPED) && \ - CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE +#if defined(CFG_MAX_MEM_MAPPED) && \ + CFG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE #define XTENSA_SYS_TEXT_ADDR \ - (MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN) + (MEMADDR(CFG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN) #else #define XTENSA_SYS_TEXT_ADDR \ (MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 31484bd13fd9..be26a6c456f2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -120,7 +120,7 @@ CFG_MACB_SEARCH_PHY CFG_MALLOC_F_ADDR CFG_MALTA CFG_MAX_DSP_CPUS -CONFIG_MAX_MEM_MAPPED +CFG_MAX_MEM_MAPPED CONFIG_MAX_RAM_BANK_SIZE CONFIG_MEMSIZE_IN_BYTES CONFIG_MEM_INIT_VALUE From patchwork Sun Nov 20 14:07:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706827 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=tCV+alDf; 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 4NFXTQ6M36z23lt for ; Mon, 21 Nov 2022 01:09:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF4B1852D9; Sun, 20 Nov 2022 15:08:49 +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="tCV+alDf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 51183852BE; Sun, 20 Nov 2022 15:08:39 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 1BC37852A8 for ; Sun, 20 Nov 2022 15:08:34 +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-qv1-xf2a.google.com with SMTP id df6so4278251qvb.0 for ; Sun, 20 Nov 2022 06:08:34 -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=k1ieh0n0ltbf3rextnu6kV58RP6kSQuV5xnTttfof5U=; b=tCV+alDfBBTY+zdLIzd5kuyazVcXmZWvIyubSRAfU4ohaLEcGs1FdX7row0lPY9cQ6 T6fD7g52flKKoKWUln8bgdVWmvGqROPl+K2y2o/84Co8U/LCUxA8g4UXMLdJW5nOxArO VRoBSv0Vc0Az4lZshPC4sBHrxSekcPRYBf8so= 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=k1ieh0n0ltbf3rextnu6kV58RP6kSQuV5xnTttfof5U=; b=F++w6fjCiWkYVI9mVD0RAjvd6A62RunSv/wfJJQfGAjvt2dPapcts27/xNf8SvtlUH GY8dFNUzO5G5BT8QJQBQaGOCtGE/T0MIkt/bCz4DdAD4Co0srEIK5qPUo/lpXwQAuX8k wQHxbK580UvKJLj87i0DgZbfZSP8d0viHWFtKmrCSAsxumn5m4KnyBLEmBQSE+LCWyom BiIBZk/DOB9/wur4hB5jwT8oaC4vKzgoffeVUGTvyRZ8unHQxTkC8OfIYdrHX9O7nxVe H7aAjTw2ftUN5Y+n/PhZ+mrhYX4n5YY31LKWV+vb5vBRDT/CjrXEb1WzIKG6GJtZLmgC vacg== X-Gm-Message-State: ANoB5plWofPGTWjIOZKGfIsVOF0zYzwrTEtqd7JIWqMmYyVGJePmohsT Ro/PlMp+/D3p1//NComPPadtq2NjLIuSdA== X-Google-Smtp-Source: AA0mqf64I/5COfaBKOGyUN3Mcfqg7ISf1u3aNKuHHsSoZi5TgdxD5D5MqdwF+1Va1X/1P08DFl8SNA== X-Received: by 2002:ad4:408c:0:b0:4c6:8fa7:c94b with SMTP id l12-20020ad4408c000000b004c68fa7c94bmr12173872qvp.43.1668953312582; Sun, 20 Nov 2022 06:08:32 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:32 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 113/241] global: Migrate CONFIG_MAX_RAM_BANK_SIZE to CFG Date: Sun, 20 Nov 2022 09:07:03 -0500 Message-Id: <20221120140829.3057894-4-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-davinci/misc.c | 2 +- arch/arm/mach-omap2/am33xx/board.c | 4 ++-- arch/arm/mach-omap2/sec-common.c | 2 +- arch/arm/mach-orion5x/dram.c | 4 ++-- arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +- board/phytec/phycore_am335x_r2/board.c | 2 +- board/ti/ks2_evm/board.c | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/draco.h | 2 +- include/configs/etamin.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rut.h | 2 +- include/configs/thuban.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c index 42078b39f8ab..cfad28c43d0a 100644 --- a/arch/arm/mach-davinci/misc.c +++ b/arch/arm/mach-davinci/misc.c @@ -27,7 +27,7 @@ int dram_init(void) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); return 0; } diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 86755d6d9543..a52d04d85c8a 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -73,7 +73,7 @@ int dram_init(void) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); return 0; } @@ -521,7 +521,7 @@ void board_init_f(ulong dummy) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); } #endif diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 0f9b915ea3dd..64560b21e3f5 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -203,7 +203,7 @@ u32 get_sec_mem_start(void) omap_sdram_size() #else get_ram_size((void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE) + CFG_MAX_RAM_BANK_SIZE) #endif - sec_mem_size)); return sec_mem_start; diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c index c9a3750e48de..5647f847d78f 100644 --- a/arch/arm/mach-orion5x/dram.c +++ b/arch/arm/mach-orion5x/dram.c @@ -39,7 +39,7 @@ int dram_init (void) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (long *) orion5x_sdram_bar(0), - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); return 0; } @@ -51,7 +51,7 @@ int dram_init_banksize(void) gd->bd->bi_dram[i].start = orion5x_sdram_bar(i); gd->bd->bi_dram[i].size = get_ram_size( (long *) (gd->bd->bi_dram[i].start), - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); } return 0; diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index 4b1b0b0f3716..e41d07e18cc5 100644 --- a/arch/arm/mach-orion5x/include/mach/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h @@ -53,7 +53,7 @@ #define MVCPU_WIN_ENABLE ORION5X_WIN_ENABLE #define MVCPU_WIN_DISABLE ORION5X_WIN_DISABLE -#define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024) +#define CFG_MAX_RAM_BANK_SIZE (64*1024*1024) /* include here SoC variants. 5181, 5281, 6183 should go here when adding support for them, and this comment should then be updated. */ diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c index e84dd251c254..eb573d076dd7 100644 --- a/board/phytec/phycore_am335x_r2/board.c +++ b/board/phytec/phycore_am335x_r2/board.c @@ -167,7 +167,7 @@ void sdram_init(void) /* Detect memory physically present */ gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); /* Reconfigure memory for actual detected size */ switch (gd->ram_size) { diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 1683f780a33b..5dcda12105b9 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -47,7 +47,7 @@ int dram_init(void) ddr3_size = ddr3_init(); gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); #if defined(CONFIG_TI_AEMIF) if (!(board_is_k2g_ice() || board_is_k2g_i1())) aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs); diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 3a6ffd9de0bb..f43e00e8a2b6 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -8,7 +8,7 @@ #ifndef __CONFIG_AM43XX_EVM_H #define __CONFIG_AM43XX_EVM_H -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #include diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 3e0b42507888..ab57e14392d0 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -19,7 +19,7 @@ #endif /* CONFIG_DM */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ /* Timer information */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 5a795fe99171..48ee3a50be5e 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -8,7 +8,7 @@ #ifndef __CONFIG_CM_T43_H #define __CONFIG_CM_T43_H -#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #include diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index cfc8330e35ae..736af88a0247 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -31,7 +31,7 @@ */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ /* memtest start addr */ /* memtest will be run on 16MB */ diff --git a/include/configs/draco.h b/include/configs/draco.h index b56ba9132af2..4c67174572f3 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -25,7 +25,7 @@ "led1=64,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ /* Default env settings */ #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 32b45b1e5b8d..8b2745ea96e4 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -67,7 +67,7 @@ "led5=63,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define EEPROM_ADDR_DDR3 0x90 #define EEPROM_ADDR_CHIP 0x120 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index b9ec7f379354..3a0622ab0b3b 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -27,7 +27,7 @@ */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ /* memtest start addr */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 02b88da28efa..b1fc437395dd 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -26,7 +26,7 @@ */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (128 << 20) /* SDRAM size 128MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ /* memtest start addr */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 10eaeb49de62..b701e52076db 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -23,7 +23,7 @@ "led0=117,0,1\0" \ /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */ /* Use common default */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 777df4c11259..2efb4d23cdda 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -32,7 +32,7 @@ "led5=63,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define EEPROM_ADDR_DDR3 0x90 #define EEPROM_ADDR_CHIP 0x120 diff --git a/include/configs/rut.h b/include/configs/rut.h index 99799f8494e0..4002bc4b6c88 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -19,7 +19,7 @@ #define DDR_PLL_FREQ 303 /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */ +#define CFG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */ /* Watchdog */ #define WATCHDOG_TRIGGER_GPIO 14 diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 1753fa410d18..a5913e1e7d2c 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -25,7 +25,7 @@ "led1=64,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define EEPROM_ADDR_DDR3 0x90 #define EEPROM_ADDR_CHIP 0x120 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 28dba4aa95b6..11e1936c2562 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -67,7 +67,7 @@ * Physical Memory Map */ #define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ #define CFG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 2d9d2fd66e9a..ac6d46f917b8 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -19,7 +19,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */ +#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */ #define CFG_SYS_SDRAM_BASE 0x80000000 /** diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index ed17b4292096..20f8643771d8 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -11,7 +11,7 @@ #ifndef __CONFIG_TI_AM335X_COMMON_H__ #define __CONFIG_TI_AM335X_COMMON_H__ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #include diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 7142d30a5994..a47f0902a267 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -15,7 +15,7 @@ /* Memory Configuration */ #define CFG_SYS_LPAE_SDRAM_BASE 0x800000000 -#define CONFIG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */ #ifdef CONFIG_SYS_MALLOC_F_LEN #define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index be26a6c456f2..88e4db9a9f5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -121,7 +121,7 @@ CFG_MALLOC_F_ADDR CFG_MALTA CFG_MAX_DSP_CPUS CFG_MAX_MEM_MAPPED -CONFIG_MAX_RAM_BANK_SIZE +CFG_MAX_RAM_BANK_SIZE CONFIG_MEMSIZE_IN_BYTES CONFIG_MEM_INIT_VALUE CONFIG_MFG_ENV_SETTINGS From patchwork Sun Nov 20 14:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706823 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=Hh/NeAu7; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXSc1pjXz23lt for ; Mon, 21 Nov 2022 01:09:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 373A8852C6; Sun, 20 Nov 2022 15:08:42 +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="Hh/NeAu7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 34955852BC; Sun, 20 Nov 2022 15:08:37 +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-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (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 565CD85282 for ; Sun, 20 Nov 2022 15:08:34 +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-qk1-x730.google.com with SMTP id v8so6515059qkg.12 for ; Sun, 20 Nov 2022 06:08:34 -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=kHfHvIH+v2huoNBaaVW28vGHbX42iQEvPoTqkEkG5Vc=; b=Hh/NeAu7+qn1ZuTMVp9ptT/jLiBfaeE0LxAsbu2QXdi7S+P4inFgjG7ok2/0fkZ2NZ nqi4vm+UN//3MWb/pvxLzyKudZmxAnPKomr1wYGdWwhPRRuIVEDMmeWEI7MQnYx36wLn 4xW1md2mXJpejvIs3axz3q1H22+FdWo3HaSDo= 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=kHfHvIH+v2huoNBaaVW28vGHbX42iQEvPoTqkEkG5Vc=; b=zcKy/Sx/gytbhv95Wr82lMclDsH+1TmnBVAE1ab6tKAAdHmUkw1QIvE/tobqJc7JKv AgzOVy8/mXRLCbphgBEqMk9Za2J1cziQDEBfPwfBVdHRdmtkXEnaZBahF40x7Bputu/9 e0qvEANw8y8jZiTP0xAa8cea6VjOdwHyoK3X+2oD0KedKzoVDLq3v9TnHz8iCgBc70XE 27p10Ctx9zAhCG9tZaUq/mXn5LZJcnaDblcBxnqrV7t0QpzWZC+/zmiaeVa5eEpG+xyz LLZi7ZyZj5nnZm7V9DBvr+TNCJ0+aOQsKyDqMgnIcYT4uoQx6ekwMfGdx8wr5jAkgDlm 4pfw== X-Gm-Message-State: ANoB5pmc0msKZ9fColQVssdUK6mbsjSKEsSm0+b5c2CPRxpN4s0cwMho JDrRe9TeHiap/fcqb7Yw+72nQOmJeoczmg== X-Google-Smtp-Source: AA0mqf5/p0snitu7LeYH868axER3pTbslTUFvBOX84/snKk2ebzlukGpG7ZDvJ8J4DCOvi0EUpZ6VQ== X-Received: by 2002:a05:620a:2705:b0:6f9:26a0:5333 with SMTP id b5-20020a05620a270500b006f926a05333mr12961941qkp.2.1668953313011; Sun, 20 Nov 2022 06:08:33 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:32 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 114/241] global: Migrate CONFIG_MEMSIZE_IN_BYTES to CFG Date: Sun, 20 Nov 2022 09:07:04 -0500 Message-Id: <20221120140829.3057894-5-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 4 ++-- include/configs/malta.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index d09ebd47cd83..8ab897f09641 100644 --- a/README +++ b/README @@ -373,11 +373,11 @@ The following options need to be configured: such as ARM architectural timer initialization. - Linux Kernel Interface: - CONFIG_MEMSIZE_IN_BYTES [relevant for MIPS only] + CFG_MEMSIZE_IN_BYTES [relevant for MIPS only] When transferring memsize parameter to Linux, some versions expect it to be in bytes, others in MB. - Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes. + Define CFG_MEMSIZE_IN_BYTES to make it in bytes. CONFIG_OF_LIBFDT diff --git a/include/configs/malta.h b/include/configs/malta.h index cd4f382b18f9..5301afef4d58 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -11,7 +11,7 @@ */ #define CFG_MALTA -#define CONFIG_MEMSIZE_IN_BYTES +#define CFG_MEMSIZE_IN_BYTES /* * CPU Configuration diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 88e4db9a9f5c..6461fc20d698 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -122,7 +122,7 @@ CFG_MALTA CFG_MAX_DSP_CPUS CFG_MAX_MEM_MAPPED CFG_MAX_RAM_BANK_SIZE -CONFIG_MEMSIZE_IN_BYTES +CFG_MEMSIZE_IN_BYTES CONFIG_MEM_INIT_VALUE CONFIG_MFG_ENV_SETTINGS CONFIG_MII_DEFAULT_TSEC From patchwork Sun Nov 20 14:07:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706826 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=Qn1e5dwk; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXTC1R45z23lt for ; Mon, 21 Nov 2022 01:09:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2440C852CB; Sun, 20 Nov 2022 15:08:47 +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="Qn1e5dwk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A591852C4; Sun, 20 Nov 2022 15:08:38 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 4ACE885298 for ; Sun, 20 Nov 2022 15:08:35 +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-qv1-xf2a.google.com with SMTP id e15so6501092qvo.4 for ; Sun, 20 Nov 2022 06:08:35 -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=hlP411MVyudiuWnmUhk7u/62DZnf7navKWQ6Gpn+wfs=; b=Qn1e5dwkPyMt0yuGjL7jVk1O6hJOYFqqa0nX5iwE7o9JZvC67xm4k9Ky9LIbXy50XU KWKN6K9gx73GOnmoASzPMDjTTfkgvO82SL5zNcYqlS4i7UwEvnOI065KgAYmVMqFPtX1 4VnhsICzIJ49wVKRhcp0mnYmjYdojhrPqiu9w= 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=hlP411MVyudiuWnmUhk7u/62DZnf7navKWQ6Gpn+wfs=; b=tMueXZl/7InQYFiH/nbvRPbizkTn4f2dKqWzSu/+8aT3LRqVpcIPXuPz0G6y9GINB0 9+cjAnxDFXkyoIzi99HZG2jJIDmCSjvlm/qUVWzhi0TfgYws4LxDUGgy6YGF0axVCwCg wUGcXBteshsy6fbmlwSWKFBFc+8pf01F5PrNAFiFkfBslQpQAf0Q1ljracH9EXpWHxws wCIskWBDotobCljaiZbRTgrxJX9T0ekPaxjsfKivWsxB6V+XP6oJynik0SliQfCm3rZ6 AY5i3YchJru0JW8nii5aPqaIkbjKht+Y6SFghIyaeHTeJFEosF4vTRcxbr7d5xu3pdAJ 9n2A== X-Gm-Message-State: ANoB5pl4ZZ2dtb7wzqLHlzv3NiWOzQqj7LMl36KZ7lsd31Vql3iF8znL bn4e1Dti38Mf6UbAo6tEKviZiSWly/aDkQ== X-Google-Smtp-Source: AA0mqf5gyBSqIVX/7xkhdwQiLLHHApiwB6OTNI9d0dLpk2oIXRZwWoYirf2bgO6FuyiVUG77fM65Vw== X-Received: by 2002:a0c:d611:0:b0:4c6:84cb:4e33 with SMTP id c17-20020a0cd611000000b004c684cb4e33mr13831627qvj.72.1668953313571; Sun, 20 Nov 2022 06:08:33 -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.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 115/241] global: Migrate CONFIG_MEM_INIT_VALUE to CFG Date: Sun, 20 Nov 2022 09:07:05 -0500 Message-Id: <20221120140829.3057894-6-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/ddr/fsl/ctrl_regs.c | 6 +++--- drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +- drivers/dma/fsl_dma.c | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1043aqds.h | 2 +- include/configs/ls1043ardb.h | 2 +- include/configs/ls1046aqds.h | 2 +- include/configs/ls1046ardb.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080aqds.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/socrates.h | 2 +- scripts/config_whitelist.txt | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index df7ec484651a..684975eebc2d 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -938,7 +938,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num, #if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) /* Use the DDR controller to auto initialize memory. */ d_init = popts->ecc_init_using_memctl; - ddr->ddr_data_init = CONFIG_MEM_INIT_VALUE; + ddr->ddr_data_init = CFG_MEM_INIT_VALUE; debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init); #else /* Memory will be initialized via DMA, or not at all. */ @@ -1847,8 +1847,8 @@ static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr) { unsigned int init_value; /* Initialization value */ -#ifdef CONFIG_MEM_INIT_VALUE - init_value = CONFIG_MEM_INIT_VALUE; +#ifdef CFG_MEM_INIT_VALUE + init_value = CFG_MEM_INIT_VALUE; #else init_value = 0xDEADBEEF; #endif diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index 0f1e99eeb039..ec8c79199b29 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -73,7 +73,7 @@ ddr_enable_ecc(unsigned int dram_size) struct ccsr_ddr __iomem *ddr = (struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR); - dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size); + dma_meminit(CFG_MEM_INIT_VALUE, dram_size); /* * Enable errors for ECC. diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index cd78e45d888a..8620c8f45d6f 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -142,7 +142,7 @@ void dma_meminit(uint val, uint size) if (((uint)p & 0x1f) == 0) ppcDcbz((ulong)p); - *p = (uint)CONFIG_MEM_INIT_VALUE; + *p = (uint)CFG_MEM_INIT_VALUE; if (((uint)p & 0x1c) == 0x1c) ppcDcbf((ulong)p); diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 5f2fc5516d5e..28315eef765d 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -31,7 +31,7 @@ /* DDR Setup */ -#define CONFIG_MEM_INIT_VALUE 0xDeadBeef +#define CFG_MEM_INIT_VALUE 0xDeadBeef #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 794289627fe8..a486fb7d6bd5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -104,7 +104,7 @@ /* DDR Setup */ #define SPD_EEPROM_ADDRESS 0x52 -#define CONFIG_MEM_INIT_VALUE 0xDeadBeef +#define CFG_MEM_INIT_VALUE 0xDeadBeef #ifndef __ASSEMBLY__ extern unsigned long get_sdram_size(void); diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 36ae8394d5d6..c61d086dbe57 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -95,7 +95,7 @@ */ #define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 7a31e8bcdc0a..bae6742928e3 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -65,7 +65,7 @@ */ #define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 8e2566dd2175..d9841397fb6b 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -63,7 +63,7 @@ * These can be toggled for performance analysis, otherwise use default. */ #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 6a215557104f..9e38d5e9f3a2 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -63,7 +63,7 @@ * These can be toggled for performance analysis, otherwise use default. */ #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index bf0c3ac1318b..f1ee131aaa98 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -45,7 +45,7 @@ * These can be toggled for performance analysis, otherwise use default. */ #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 0a1df4ad4bd0..0029499ea3c0 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -16,7 +16,7 @@ #endif /* DDR */ -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 69f9bacad97c..9d2622a7d69f 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -23,7 +23,7 @@ #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index dab57382eddf..35662f65502f 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -13,7 +13,7 @@ #define SPD_EEPROM_ADDRESS 0x51 #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 12c4853ea963..80214e069cb1 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -12,7 +12,7 @@ /* Physical Memory Map */ #ifndef CONFIG_SPL -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif /* diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index e67ded55da6b..c4fbef7e7f9a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -13,7 +13,7 @@ #define SPD_EEPROM_ADDRESS 0x51 #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index f3904e7b3f7b..1209f16619f9 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -13,7 +13,7 @@ #define SPD_EEPROM_ADDRESS 0x51 -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #if defined(CONFIG_QSPI_BOOT) #define CFG_SYS_UBOOT_BASE 0x40100000 diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 0582a4568dc7..52a6a2768384 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -14,7 +14,7 @@ #define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index ee796facc06c..542495956c32 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -15,7 +15,7 @@ #define COUNTER_FREQUENCY_REAL 25000000 /* 25MHz */ -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index d029d841d51e..db7e422336fe 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -16,7 +16,7 @@ #define CFG_SYS_I2C_FPGA_ADDR 0x66 #define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 #define SPD_EEPROM_ADDRESS3 0x53 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 73477978be46..e4c9b2c44ca6 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -21,7 +21,7 @@ #define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 #define SPD_EEPROM_ADDRESS3 0x53 diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a469c83fa4eb..0fc32efabc7f 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -19,7 +19,7 @@ #define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL #define CFG_SYS_SDRAM_SIZE 0x200000000UL #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 #define SPD_EEPROM_ADDRESS3 0x53 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 9eee8de41644..eb5c14fff28e 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -51,7 +51,7 @@ /* DDR Setup */ -#define CONFIG_MEM_INIT_VALUE 0xDeadBeef +#define CFG_MEM_INIT_VALUE 0xDeadBeef #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6461fc20d698..1adb99f49ec7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -123,7 +123,7 @@ CFG_MAX_DSP_CPUS CFG_MAX_MEM_MAPPED CFG_MAX_RAM_BANK_SIZE CFG_MEMSIZE_IN_BYTES -CONFIG_MEM_INIT_VALUE +CFG_MEM_INIT_VALUE CONFIG_MFG_ENV_SETTINGS CONFIG_MII_DEFAULT_TSEC CONFIG_MIU_2BIT_21_7_INTERLEAVED From patchwork Sun Nov 20 14:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706828 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=H7qiUbW6; 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 4NFXTh11Jwz23lt for ; Mon, 21 Nov 2022 01:10:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 08479852C9; Sun, 20 Nov 2022 15:08:52 +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="H7qiUbW6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9BC82852AA; Sun, 20 Nov 2022 15:08:39 +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-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 8BA5285297 for ; Sun, 20 Nov 2022 15:08:35 +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-qv1-xf30.google.com with SMTP id c8so6482469qvn.10 for ; Sun, 20 Nov 2022 06:08:35 -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=xYLhg7qxCep6niutajzBGWqYDJiQ59zSGDcluLoFIas=; b=H7qiUbW692SNVACG5Me7mI9mSIuSVzxj2Wo88Y3/+uQV6PiLi1Rprbc4jlbPXl4Qv/ xpgLmhMLvOgpff3k5Us/7AU/xJ77HLirK2sr84oQEZVj94K9iAT7X0qd0/mOBm5R+V10 z54gBIemdviTjaLG8txbsZZHMgtbI2gwpwZYA= 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=xYLhg7qxCep6niutajzBGWqYDJiQ59zSGDcluLoFIas=; b=icDIPBywvpls95+mglvudjcdAe+7Qi9uRDNG7vSWs5EDY//t7MRTc8LdT75XBt+PJN ysQ5T5voQjlQd+xbEazN/6keqn8sdA6BSM5roM6jfzTd9stM0EySKSsSWY1Y0VbUCvZv +mQXNrEai+0iVslkzFZ6PbU/WNmkz6pJn+l8q//K8EsXhdxVXe/Ugekn9xgYqb2NuGTn 7d1zOUZ6a/cjklUNBTXYIItlB3IgZtqEyrG1qRZaC9nqP4TvkVlXxEZgGwizmbsPu7OW BFgecgE/555Q/qjIP7dUZR80QbgM/0Fv4cmFTWw+EMuLPjlmf4SyQ4JcRi+Ysmqa9Y+m ijfg== X-Gm-Message-State: ANoB5pnhckxdG6AeEOepL/DE7z3lsvjWVuQa3RayALxRIGeX25wvskLX LOix1jSp0AD38KOklxzN0zhDlTK0KpdkRg== X-Google-Smtp-Source: AA0mqf5EeEQ5PXAXt80V7pushj6IGVMZDrBWx0rNp9dKUgrs9QZBZLHolanUsRIxk+4/0u1PkIbrcg== X-Received: by 2002:a05:6214:4288:b0:4c6:a305:2419 with SMTP id og8-20020a056214428800b004c6a3052419mr4472248qvb.45.1668953314137; Sun, 20 Nov 2022 06:08:34 -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.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 116/241] global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG Date: Sun, 20 Nov 2022 09:07:06 -0500 Message-Id: <20221120140829.3057894-7-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/capricorn-common.h | 4 ++-- include/configs/cgtqmx8.h | 4 ++-- include/configs/colibri-imx8x.h | 4 ++-- include/configs/imx8mq_phanbell.h | 4 ++-- include/configs/imx8qm_rom7720.h | 4 ++-- include/configs/mx7dsabresd.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 9e7322cdb937..9dcacad2fc00 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -60,7 +60,7 @@ "${loadaddr} ${m4_0_image}\0" \ "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83100000\0" \ "initrd_high=0xffffffffffffffff\0" \ @@ -68,7 +68,7 @@ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ AHAB_ENV \ ENV_COMMON \ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index a63325973846..91454df19720 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -42,7 +42,7 @@ #define FEC0_RESET IMX_GPIO_NR(2, 5) #define FEC0_PDOMAIN "conn_enet0" -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ @@ -56,7 +56,7 @@ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 35f29da0c351..0e8e24dd7bd2 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -47,7 +47,7 @@ #undef BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START "" -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs ${consoleargs} " \ "rdinit=/linuxrc g_mass_storage.stall=0 " \ "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \ @@ -63,7 +63,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ BOOTENV \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 5158f2cc605a..6d0c45311183 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -24,13 +24,13 @@ #define CFG_FEC_MXC_PHYADDR 0 #endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffff\0" \ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc0,115200\0" \ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 5692e3d00007..df2cb8d9ced1 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -33,7 +33,7 @@ #define MFG_NAND_PARTITION "" #endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ @@ -48,7 +48,7 @@ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 183e67857ca1..a9722967f396 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -32,7 +32,7 @@ #define UPDATE_M4_ENV "" #endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ @@ -52,7 +52,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1adb99f49ec7..a1b88d29cb15 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -124,7 +124,7 @@ CFG_MAX_MEM_MAPPED CFG_MAX_RAM_BANK_SIZE CFG_MEMSIZE_IN_BYTES CFG_MEM_INIT_VALUE -CONFIG_MFG_ENV_SETTINGS +CFG_MFG_ENV_SETTINGS CONFIG_MII_DEFAULT_TSEC CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED From patchwork Sun Nov 20 14:07:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706829 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=mgAmRIUT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXTv2x6zz23mR for ; Mon, 21 Nov 2022 01:10:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9376852C7; Sun, 20 Nov 2022 15:08:54 +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="mgAmRIUT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F184D852C7; Sun, 20 Nov 2022 15:08:39 +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-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (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 5CA6D852AD for ; Sun, 20 Nov 2022 15:08:36 +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-qv1-xf2e.google.com with SMTP id d18so2978119qvs.6 for ; Sun, 20 Nov 2022 06:08:36 -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=0PQK5bNUZ3Gb0ggL7jTyjXF59H7V5Vn68oplKkdTrqE=; b=mgAmRIUTYGRWn+JRmVUXmBOh69eika/iJuSJ5nBUHCrj66Zjv1km2iz63MCz3SxJXE Ejb+8MJAOXFvnJnaY8fVLtd+qqWmU+lMpmzVPWmPQFUIJToEX25loG4043edLVr+PUw1 f7GqZ1adLIlBonQs5zYpbvx2p7tqL8qsM0egw= 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=0PQK5bNUZ3Gb0ggL7jTyjXF59H7V5Vn68oplKkdTrqE=; b=QYTVqKxaV2Rx7qTQ9Q9st2FS4oi5LJnb6iZeMqW5bOsxDoixhjvxZ1B14IaYZksKQa lkWiyHqEtfHFSPANZLMeZlMhOatb16t9yMcRTi4hu4Q+cdpiWyP5+tcEvftpellwsKLh EriBmDiquvzFE2ReijIhOLtcOHZ+XsIN876hjJloel4Aqif+S1R8aqZTFF/B+IzmNRyy cCzw5jJpwYjcA6rUl6ZA6pXcD8/7tFtBg87L6Q8VUkbxPGqKqEhzew973gRidAf2iB4F EBTnCE+aKUNHhrgb/8Tmuk7nxYjaECsSi6aiWixT3juJPWRIa5bup/0C1wAOnA0TZliX Wutw== X-Gm-Message-State: ANoB5pnkxo5TK3NTtnl4d4upoBYoCfQLWa2xs0L8wV9DLljZ7PbWhyJ3 quX+zywutIhTAHumaeRbsbOCYygsBg2e4g== X-Google-Smtp-Source: AA0mqf6Y4VFfx2mTkW7CtIzOFR3lFRQOpUCKSGOoK/fUXItGdxU65YoZxGDouTcEjOgoBp/RC2E7lA== X-Received: by 2002:ad4:588a:0:b0:4b8:c334:7d81 with SMTP id dz10-20020ad4588a000000b004b8c3347d81mr14299357qvb.18.1668953314943; Sun, 20 Nov 2022 06:08:34 -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.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:34 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 117/241] global: Migrate CONFIG_MII_DEFAULT_TSEC to CFG Date: Sun, 20 Nov 2022 09:07:07 -0500 Message-Id: <20221120140829.3057894-8-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/P1010RDB.h | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index a486fb7d6bd5..a75e1b8f7a8a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -350,7 +350,7 @@ extern unsigned long get_sdram_size(void); #endif #if defined(CONFIG_TSEC_ENET) -#define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ +#define CFG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 0a08619384b6..7a9a89d02390 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -71,7 +71,7 @@ */ #ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 1 +#define CFG_MII_DEFAULT_TSEC 1 #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 9d2622a7d69f..be05ab9de8cb 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -252,7 +252,7 @@ */ #ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 3 +#define CFG_MII_DEFAULT_TSEC 3 #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a1b88d29cb15..0380ebb2a6e8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -125,7 +125,7 @@ CFG_MAX_RAM_BANK_SIZE CFG_MEMSIZE_IN_BYTES CFG_MEM_INIT_VALUE CFG_MFG_ENV_SETTINGS -CONFIG_MII_DEFAULT_TSEC +CFG_MII_DEFAULT_TSEC CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV From patchwork Sun Nov 20 14:07:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706830 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=ZE4LxcbT; 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 4NFXV73hLFz23n6 for ; Mon, 21 Nov 2022 01:10:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A9DD88528E; Sun, 20 Nov 2022 15:08:56 +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="ZE4LxcbT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DF9C6852B2; Sun, 20 Nov 2022 15:08:40 +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-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 CA4EB852B7 for ; Sun, 20 Nov 2022 15:08:36 +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-qk1-x72b.google.com with SMTP id g10so6524769qkl.6 for ; Sun, 20 Nov 2022 06:08:36 -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=hpRP/A80pKgE4mU3hTrCk9GOM//JhJWGxx4ePpdJ14o=; b=ZE4LxcbTxxCajeZTPEroREr1RDj1imVP4663TuxQiwoilqDUe0VOOz0D1yqS41FUbr k17c4LTeAoHrBOA7adAar0z0yAQQE4zzNtzChVNeBvOYwpgvfgwlIIavY/oVZ1YPfsxu JS8jZnwPNhyPWKV3OPd/9RKy9EGfb+6c7jgL8= 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=hpRP/A80pKgE4mU3hTrCk9GOM//JhJWGxx4ePpdJ14o=; b=x2a3het7amF+4ecBzSwnev/R5fH0skzRRfgDYRIwvgB3hMwpkgQzuvFS9BuHfwdZDN go8VofdyCJddekHijChcb+kR481vCaC6+6Gmrf6eYRvF55SKnWNfSwTME5xlZ3bWyPRW M8L19/ZoVX8mHkICuTq++nfrBRic/h9zqGZIkI2q/N0rxZbttmqpXo5BWqP4qJv4u6Pz Mmdqwxyq45WVxTUqWh/XUFSwhYcjhqF6ioxLS9N/noqBr0qPSBJwwglu/Etwj8M2rFMC TKR3csgJizwsB+qUZ/2haN2M6x5MIfZaSPugBNnjG5m++BlCukpEE0rz7yphNcXUOm0E pKcg== X-Gm-Message-State: ANoB5pnA/O5tcCMx6GNpesJEbYhPu2cp+zi/ScDWSIfbBtjx368IHUb9 7MRBmQL/E0MhoJIUo6/jD11bgGJIGJ5xAw== X-Google-Smtp-Source: AA0mqf6qSIkSULOgVJPQPY/qPHqv2ZBTL9jr3RE7+fJHHOCkWbsIgvJgB8+ytSLiC/gyFNmqvU1qOA== X-Received: by 2002:a05:620a:16b1:b0:6fa:34ba:ec48 with SMTP id s17-20020a05620a16b100b006fa34baec48mr12717931qkj.321.1668953315498; Sun, 20 Nov 2022 06:08:35 -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.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:35 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 118/241] global: Migrate CONFIG_MIU_2BIT_21_7_INTERLEAVED to CFG Date: Sun, 20 Nov 2022 09:07:08 -0500 Message-Id: <20221120140829.3057894-9-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/origen.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/origen.h b/include/configs/origen.h index d4ba599d72a4..a85fee4a0d84 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -39,7 +39,7 @@ "source ${loadaddr}\0" /* MIU (Memory Interleaving Unit) */ -#define CONFIG_MIU_2BIT_21_7_INTERLEAVED +#define CFG_MIU_2BIT_21_7_INTERLEAVED #define RESERVE_BLOCK_SIZE (512) #define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0380ebb2a6e8..8d6af14c3667 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -126,7 +126,7 @@ CFG_MEMSIZE_IN_BYTES CFG_MEM_INIT_VALUE CFG_MFG_ENV_SETTINGS CFG_MII_DEFAULT_TSEC -CONFIG_MIU_2BIT_21_7_INTERLEAVED +CFG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV CONFIG_MMC_SUNXI_SLOT From patchwork Sun Nov 20 14:07:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706831 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=OZUvrLoZ; 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 4NFXVP0Ks6z23n6 for ; Mon, 21 Nov 2022 01:10:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B4DB5852C5; Sun, 20 Nov 2022 15:08:57 +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="OZUvrLoZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5190F852BA; Sun, 20 Nov 2022 15:08:41 +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-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 614618528F for ; Sun, 20 Nov 2022 15:08:37 +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-qk1-x733.google.com with SMTP id d7so6528483qkk.3 for ; Sun, 20 Nov 2022 06:08:37 -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=GvHUghWujQkPV6Bh1mOrkCnj1EXGft4wKYSIBV2pkdk=; b=OZUvrLoZZwHzf9Cjs4OTlJkyggz+bRL0mbbcHyI3b/H2UbF70CZTl6UDUP7xel7mFj RpToWtcPpp1GhJkKmjKF5mI9Z/0ECYkJ+EM8cd7SmQrHoyevu58xAUEQ8kSYYwOOp3Fl 686e9nzOamc9NYd/tzZKn/QbKDss76PDV1LYY= 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=GvHUghWujQkPV6Bh1mOrkCnj1EXGft4wKYSIBV2pkdk=; b=cyxCQvhgmHYI9QRlWraQ1cZDGEhg0fA1hX3UOOWIwI142by1+miRwxUUjs6CvYzaHI eTOBjHs79EWUxeuPYMIoU+V9yNTcZZWwXDxviukaheAlZ8OXD42ozX27L5Md4YT14cBf 4mxrjiv74BsNKQ2GTDXveVI/pa633FRsHNERLPVBzxH7TjR48st7DCCPMTeKJWtZU+LM uxXK2c4cv3pPDf+FRw3Nr+XPlVYZ+Z3U7ZACyiFFtPMipvqGsTWr5gCmmb2zOg2x6LnI R+8kGy1IBJkY00qrqy7ObALTtkBUQKdwcGosYRrkPMp7OV+kZJx64k0KHsbp/P+xdaYp G8NA== X-Gm-Message-State: ANoB5pmcnSdIIzeFacu3lyCqzlYeZeOn9XNQLNwAYALjqlzzhR2mXRKg pZvbMSxaZr3Wc6BkaeZ5D4rj/Ww+sdkYag== X-Google-Smtp-Source: AA0mqf7kFr2KsxK8xP3aala5q2YQk8zSi++HyMzKEE3Q4FUFlsv8k94rnbJZZWknIa2iicM/GkNjhw== X-Received: by 2002:a37:ba82:0:b0:6ee:c002:1f64 with SMTP id k124-20020a37ba82000000b006eec0021f64mr12814318qkf.165.1668953316026; Sun, 20 Nov 2022 06:08:36 -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.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:35 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 119/241] global: Migrate CONFIG_MIU_2BIT_INTERLEAVED to CFG Date: Sun, 20 Nov 2022 09:07:09 -0500 Message-Id: <20221120140829.3057894-10-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-exynos/exynos4_setup.h | 2 +- include/configs/smdkv310.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h index fbb45eb897e3..b696206cc855 100644 --- a/arch/arm/mach-exynos/exynos4_setup.h +++ b/arch/arm/mach-exynos/exynos4_setup.h @@ -434,7 +434,7 @@ struct mem_timings { /* Interleave_bit0: 0xC*/ #define APB_SFR_INTERLEAVE_CONF_VAL 0x0000000c #endif -#ifdef CONFIG_MIU_2BIT_INTERLEAVED +#ifdef CFG_MIU_2BIT_INTERLEAVED /* Interleave: 2Bit, Interleave_bit1: 0x15, Interleave_bit0: 0xc */ #define APB_SFR_INTERLEAVE_CONF_VAL 0x2000150c #endif diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 1f137dba90f7..00dd929d90e6 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -35,7 +35,7 @@ /* FLASH and environment organization */ /* MIU (Memory Interleaving Unit) */ -#define CONFIG_MIU_2BIT_INTERLEAVED +#define CFG_MIU_2BIT_INTERLEAVED #define RESERVE_BLOCK_SIZE (512) #define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d6af14c3667..b2686806c5c4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -127,7 +127,7 @@ CFG_MEM_INIT_VALUE CFG_MFG_ENV_SETTINGS CFG_MII_DEFAULT_TSEC CFG_MIU_2BIT_21_7_INTERLEAVED -CONFIG_MIU_2BIT_INTERLEAVED +CFG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV CONFIG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM From patchwork Sun Nov 20 14:07:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706832 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=JSaOVeHs; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXVc6w2Xz23n6 for ; Mon, 21 Nov 2022 01:10:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B11F852E5; Sun, 20 Nov 2022 15:08:59 +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="JSaOVeHs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9502585298; Sun, 20 Nov 2022 15:08:42 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 108E2852BD for ; Sun, 20 Nov 2022 15:08:38 +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-qv1-xf2a.google.com with SMTP id h7so5905475qvs.3 for ; Sun, 20 Nov 2022 06:08:37 -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=ceMFptNk38o0rmtPNlRtU7Y+sSgZh5T47YRcE1c+jNA=; b=JSaOVeHsOgOyAWUfLxEkEXqtNEICXPHtEC7sbNiMXKkhbwQfcVtYJ5LhcUp7rZWXcb L/v5QspnmbxftTJQ07fXFMPqiO0hbt18PtRvh4GwKJpihoBcnq25bBkbjC96hdKQ/t1u CqVKFLN6xTfRZTPMjs9dqhO1UcjIl8GElwtPo= 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=ceMFptNk38o0rmtPNlRtU7Y+sSgZh5T47YRcE1c+jNA=; b=2AMmTyZd2+W9NOyXip4NGNYu2Q8VDQA0mdbYAT3SfknDn4KPpRkTcAaSe87heueJKE ftAcN2ISAwavXEbGngd7Hz4CHYZ7AyZClWSjHH05TWPa281aC2pTmwiDzna0681ImeYp 5vPjBx31NmdD5qkvfIGDXi8Qvys6cD4NT2wtdAhAXkhxImYW3u616HpLbL7QiFvTInq3 h94bm5U0eCQOcLu2Wc4WMClwJTXzto4erTX1G0MtRSoMGgR4eO+tSzG1aEz5WPzQDJz0 2oh6ejgmYU3GCEqFaKZYlTyAoCk3xoJHbVssOjJp9/2Rr3mQn760AZ6e3mJWQRWVZvh+ XanA== X-Gm-Message-State: ANoB5pnLHJUikIXqi4yDu06ol4OtImW17qQS0+ku11Owms5xD4CZG1Qj lxEE028TRA+K8YQ86ii7wd77aUKgKrETPQ== X-Google-Smtp-Source: AA0mqf497Nfk46ng33zGpETG1EOzOrjJLL0xkRVM8rrxBl1JAgdzwYychaAFq4f9fo1BZAuqtWi9oQ== X-Received: by 2002:a05:6214:3788:b0:4bb:658f:c81b with SMTP id ni8-20020a056214378800b004bb658fc81bmr13899102qvb.56.1668953316612; Sun, 20 Nov 2022 06:08:36 -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.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:36 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 120/241] global: Migrate CONFIG_MMC_DEFAULT_DEV to CFG Date: Sun, 20 Nov 2022 09:07:10 -0500 Message-Id: <20221120140829.3057894-11-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/exynos4-common.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/trats2.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 63e26687dbce..6a48fe9103ff 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -11,7 +11,7 @@ #include "exynos-common.h" /* SD/MMC configuration */ -#define CONFIG_MMC_DEFAULT_DEV 0 +#define CFG_MMC_DEFAULT_DEV 0 #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 1e211eccee7b..85e24caa5107 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -120,7 +120,7 @@ #define PHYS_SDRAM_3_SIZE (128 << 20) /* 128 MB in Bank #2 */ /* FLASH and environment organization */ -#define CONFIG_MMC_DEFAULT_DEV 0 +#define CFG_MMC_DEFAULT_DEV 0 #define CFG_SYS_ONENAND_BASE 0xB0000000 diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 21372243bbc8..d5f17e3b7802 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -81,7 +81,7 @@ "${kernelname}\0" \ "loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \ "${fdtfile}\0" \ - "mmcdev=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \ + "mmcdev=" __stringify(CFG_MMC_DEFAULT_DEV) "\0" \ "mmcbootpart=2\0" \ "mmcrootpart=5\0" \ "opts=always_resume=1\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b2686806c5c4..a31178b8b6e7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -128,7 +128,7 @@ CFG_MFG_ENV_SETTINGS CFG_MII_DEFAULT_TSEC CFG_MIU_2BIT_21_7_INTERLEAVED CFG_MIU_2BIT_INTERLEAVED -CONFIG_MMC_DEFAULT_DEV +CFG_MMC_DEFAULT_DEV CONFIG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM CONFIG_MTD_NAND_VERIFY_WRITE From patchwork Sun Nov 20 14:07:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706833 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=OuLotbBN; 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 4NFXVq6M7Hz23n6 for ; Mon, 21 Nov 2022 01:10:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A8E1852EB; Sun, 20 Nov 2022 15:09:00 +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="OuLotbBN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D815852C7; Sun, 20 Nov 2022 15:08:42 +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-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (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 9E9A285298 for ; Sun, 20 Nov 2022 15:08:38 +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-qv1-xf31.google.com with SMTP id cz18so172508qvb.13 for ; Sun, 20 Nov 2022 06:08:38 -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=5gVzBU8aJ6QSiWacMBWkG+4M2ouL5NyjKJZ2Z8msOPI=; b=OuLotbBNorXWHgYxAMfn7zWPDi+HpFEBGuNdoRgq+qcaS6TKWtto4La2ffZSK7LTGt +q9QBpuOHSqj/1ImMt4uAfAqEhXKEeS4Z3gRysFjKnQGX+VAQnGDicaolwdE4ydPIgj6 tdiKbMCiQAcgsBhPcb0O0p31C8evlzdzg1j/M= 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=5gVzBU8aJ6QSiWacMBWkG+4M2ouL5NyjKJZ2Z8msOPI=; b=QqHjfHr8nYUc0NiVPB04nE5J6wmal960cFq051zpqGGJqTHLCJqDJXZ7T55o/Xe94K nRfmk3f0wNPHeQPaj+Q8tOfe75b0Mp26JhVbCDi0zhfIH6G2xjhVnWVHHhey7RD/7uWd /2M1gV1ONgd92shG+0plYfhuVBVervHH1oST7FfepzxJIOUajVfv2Lx+TEqGRlVX7Lux ZZEvzOTcHuwTBXGsSf7uW/Ia5HUno4xHW1kkVa/q0FctD6n7WPTNgkRUu5+B9hNhI/oJ zdK8hYDF7mJBba5pbLK8RqwBl9uJ9tsOEKkKzghAPoEb9Qp/3+By6gOleekjQHtN6Evv PF5w== X-Gm-Message-State: ANoB5pmeEyQlSjaLnc+TZHlwK0Lv4ZfRmnSF7ovkWcVUhAJFFL8l8ypy 0zDGiAeabAdrFnugifw+tciv/FFGVccDkg== X-Google-Smtp-Source: AA0mqf7gefSxv0ll8qNQb6DzdwLxisusF87Y0ljnEQLwuHGF3k2NX8U76C108j3+GjlUFX59OBm8fg== X-Received: by 2002:a05:6214:3113:b0:4bb:7436:49de with SMTP id ks19-20020a056214311300b004bb743649demr13717875qvb.27.1668953317190; Sun, 20 Nov 2022 06:08:37 -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.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:36 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 121/241] global: Migrate CONFIG_MMC_SUNXI_SLOT to CFG Date: Sun, 20 Nov 2022 09:07:11 -0500 Message-Id: <20221120140829.3057894-12-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/sunxi/board.c | 4 ++-- include/configs/sunxi-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 21a2407e062f..356e5f07f688 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -526,8 +526,8 @@ static void mmc_pinmux_setup(int sdc) int board_mmc_init(struct bd_info *bis) { if (!IS_ENABLED(CONFIG_UART0_PORT_F)) { - mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT); - if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT)) + mmc_pinmux_setup(CFG_MMC_SUNXI_SLOT); + if (!sunxi_mmc_init(CFG_MMC_SUNXI_SLOT)) return -1; } diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index f3c8f7002342..1be4cde2b70e 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -70,7 +70,7 @@ #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */ /* mmc config */ -#define CONFIG_MMC_SUNXI_SLOT 0 +#define CFG_MMC_SUNXI_SLOT 0 /* * Miscellaneous configurable options diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a31178b8b6e7..4185a1b9c003 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -129,7 +129,7 @@ CFG_MII_DEFAULT_TSEC CFG_MIU_2BIT_21_7_INTERLEAVED CFG_MIU_2BIT_INTERLEAVED CFG_MMC_DEFAULT_DEV -CONFIG_MMC_SUNXI_SLOT +CFG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS From patchwork Sun Nov 20 14:07:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706834 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=uDhEpQTu; 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 4NFXW24pMbz23n6 for ; Mon, 21 Nov 2022 01:11:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 487C6852F0; Sun, 20 Nov 2022 15:09:22 +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="uDhEpQTu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 53EA785297; Sun, 20 Nov 2022 15:08:44 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 82251852A8 for ; Sun, 20 Nov 2022 15:08:39 +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-x833.google.com with SMTP id e15so5937299qts.1 for ; Sun, 20 Nov 2022 06:08:39 -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=20vxv4KrSxDo2qqVGHKQr1ijHiILQSZS2TexvZBLsdI=; b=uDhEpQTuIa7WF4Jh3790awSXsZMXHZYGeC3FJF768qk1faUhrSQ4FVgwHfwhF6lru2 sDOuk87W2ePO5yqsYv9V8pVYDQhfnmhZ1uOMPWg5QTsxdEPxU6OMA1EByF2xkYDJpAmu 9/of609q028LgrRM9d5WhUDE3lfggTAc/EaCM= 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=20vxv4KrSxDo2qqVGHKQr1ijHiILQSZS2TexvZBLsdI=; b=Ck7qr6DQ3i3h//XLxqwKarrlP227b9D1dWLku3JZeTcEhimFUId/uBMhzD2qdrzGAQ 8SiL6I1k7ehDGFVHcFa/0dx/Zdbmuwx8XhSMBTYobrjy/Y7pN7zEoXkL5aau7dX5p4XH UTGOsNHMHusYbKXZDdbeu/ul2mYZyawaJb+jnMKwn1bz47mI5d2KvkGRmAwcuv/Teu6A LaY+LcXKKWEcmoNX5X+oW5ffZWFSKIHrBnKapnEqQvxBEUkYtQPYu1JeLjwMaz5PYlQP 3tvf7heGFaeGnQibeXobNwVhBimNztjqMQ2s6R420v/1McNMc5Unywpg5v8Lv/m04UeI 8qFw== X-Gm-Message-State: ANoB5pmzJxkMoO1nR7q6u9sdePnnQZJb1h5rYx2SyIC99FPmPXhtWwVa Ni3AWH2/bPLkNfOHLqQi8ZDOSlA20Dt3ZA== X-Google-Smtp-Source: AA0mqf7Puy+8ydRqIFmAbZyYu9o3utWEp0E5vrJws0uiLaWjncLhFfUyqa4vYxFYaP8GsBIj0B1k3Q== X-Received: by 2002:a05:622a:429a:b0:3a1:e533:23a7 with SMTP id cr26-20020a05622a429a00b003a1e53323a7mr13626117qtb.197.1668953317789; Sun, 20 Nov 2022 06:08:37 -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.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:37 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 122/241] global: Migrate CONFIG_MONITOR_IS_IN_RAM to CFG Date: Sun, 20 Nov 2022 09:07:12 -0500 Message-Id: <20221120140829.3057894-13-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/m68k/cpu/mcf52x2/cpu_init.c | 12 ++++++------ arch/m68k/cpu/mcf52x2/start.S | 4 ++-- arch/m68k/cpu/mcf530x/start.S | 4 ++-- arch/m68k/cpu/mcf532x/speed.c | 4 ++-- arch/m68k/cpu/mcf532x/start.S | 6 +++--- board/astro/mcf5373l/mcf5373l.c | 2 +- board/cobra5272/README | 8 ++++---- board/freescale/m53017evb/README | 2 +- board/freescale/m5373evb/README | 2 +- doc/arch/m68k.rst | 2 +- drivers/mtd/cfi_flash.c | 2 +- include/configs/10m50_devboard.h | 2 +- include/configs/3c120_devboard.h | 2 +- include/configs/M5249EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/astro_mcf5373l.h | 12 +----------- include/configs/cobra5272.h | 21 --------------------- include/configs/eb_cpu5282.h | 2 +- scripts/config_whitelist.txt | 2 +- 20 files changed, 32 insertions(+), 63 deletions(-) diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 99eb61f16758..1d6e39a2ce5e 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -334,7 +334,7 @@ void cpu_init_f(void) /* if we come from RAM we assume the CPU is * already initialized. */ -#ifndef CONFIG_MONITOR_IS_IN_RAM +#ifndef CFG_MONITOR_IS_IN_RAM sysctrl_t *sysctrl = (sysctrl_t *) (CFG_SYS_MBAR); gpio_t *gpio = (gpio_t *) (MMAP_GPIO); csctrl_t *csctrl = (csctrl_t *) (MMAP_FBCS); @@ -390,7 +390,7 @@ void cpu_init_f(void) out_be32(&csctrl->cs_or7, CONFIG_SYS_OR7_PRELIM); #endif -#endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */ +#endif /* #ifndef CFG_MONITOR_IS_IN_RAM */ /* enable instruction cache now */ icache_enable(); @@ -460,7 +460,7 @@ void cpu_init_f(void) * already initialized. */ -#ifndef CONFIG_MONITOR_IS_IN_RAM +#ifndef CFG_MONITOR_IS_IN_RAM wdog_t *wdog_reg = (wdog_t *) (MMAP_WDOG); gpio_t *gpio_reg = (gpio_t *) (MMAP_GPIO); @@ -469,7 +469,7 @@ void cpu_init_f(void) /* FlexBus Chipselect */ init_fbcs(); -#endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */ +#endif /* #ifndef CFG_MONITOR_IS_IN_RAM */ #ifdef CONFIG_SYS_I2C_FSL CFG_SYS_I2C_PINMUX_REG &= CFG_SYS_I2C_PINMUX_CLR; @@ -557,7 +557,7 @@ void cpu_init_f(void) MCFWTM_WCR = 0; #endif -#ifndef CONFIG_MONITOR_IS_IN_RAM +#ifndef CFG_MONITOR_IS_IN_RAM /* Set speed /PLL */ MCFCLOCK_SYNCR = MCFCLOCK_SYNCR_MFD(CFG_SYS_MFD) | @@ -614,7 +614,7 @@ void cpu_init_f(void) /* FlexBus Chipselect */ init_fbcs(); -#endif /* CONFIG_MONITOR_IS_IN_RAM */ +#endif /* CFG_MONITOR_IS_IN_RAM */ /* defer enabling cache until boot (see do_go) */ /* icache_enable(); */ diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S index d48d0192eea2..47d935d3d9f0 100644 --- a/arch/m68k/cpu/mcf52x2/start.S +++ b/arch/m68k/cpu/mcf52x2/start.S @@ -25,7 +25,7 @@ /* If we come from a pre-loader we don't need an initial exception * table. */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) .text @@ -164,7 +164,7 @@ _after_flashbar_copy: * if we come from a pre-loader we have no exception table and * therefore no VBR to set */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) #if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE) move.l #CFG_SYS_INT_FLASH_BASE, %d0 #else diff --git a/arch/m68k/cpu/mcf530x/start.S b/arch/m68k/cpu/mcf530x/start.S index dbe2b54e4101..4d474576457e 100644 --- a/arch/m68k/cpu/mcf530x/start.S +++ b/arch/m68k/cpu/mcf530x/start.S @@ -27,7 +27,7 @@ /* If we come from a pre-loader we don't need an initial exception * table. */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) .text @@ -109,7 +109,7 @@ _start: * if we come from a pre-loader we have no exception table and * therefore no VBR to set */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) move.l #CFG_SYS_FLASH_BASE, %d0 movec %d0, %VBR #endif diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index 32ffac08135d..f58f84f976ce 100644 --- a/arch/m68k/cpu/mcf532x/speed.c +++ b/arch/m68k/cpu/mcf532x/speed.c @@ -192,7 +192,7 @@ int clock_pll(int fsys, int flags) #endif /* must not tamper with SDRAMC if running from SDRAM */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) /* * Check to see if the SDRAM has already been initialized. * If it has then the SDRAM needs to be put into self refresh @@ -244,7 +244,7 @@ int clock_pll(int fsys, int flags) /* wait for DQS logic to relock */ for (i = 0; i < 0x200; i++) ; -#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */ +#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */ return fout; } diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S index 72a2f99b7dd2..4e6f2b8621d7 100644 --- a/arch/m68k/cpu/mcf532x/start.S +++ b/arch/m68k/cpu/mcf532x/start.S @@ -24,7 +24,7 @@ addl #60,%sp; /* space for 15 regs */ \ rte; -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) .text @@ -86,7 +86,7 @@ vector192_255: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT -#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */ +#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */ .text @@ -96,7 +96,7 @@ _start: nop move.w #0x2700,%sr /* Mask off Interrupt */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) /* Set vector base register at the beginning of the Flash */ move.l #CFG_SYS_FLASH_BASE, %d0 movec %d0, %VBR diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c index 43563c412793..c6172365744a 100644 --- a/board/astro/mcf5373l/mcf5373l.c +++ b/board/astro/mcf5373l/mcf5373l.c @@ -32,7 +32,7 @@ int checkboard(void) int dram_init(void) { -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) sdram_t *sdp = (sdram_t *)(MMAP_SDRAM); /* diff --git a/board/cobra5272/README b/board/cobra5272/README index ac62e557a075..770b66327ef5 100644 --- a/board/cobra5272/README +++ b/board/cobra5272/README @@ -79,10 +79,10 @@ please first check: in ./include/configs/cobra5272.h - CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows: + CFG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows: #if 0 - #define CONFIG_MONITOR_IS_IN_RAM + #define CFG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ #endif @@ -118,10 +118,10 @@ please modify the settings: in ./include/configs/cobra5272.h - CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows: + CFG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows: #if 1 - #define CONFIG_MONITOR_IS_IN_RAM + #define CFG_MONITOR_IS_IN_RAM /*define if monitor is started from a pre-loader */ #endif diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README index 34f05f3fdc72..193ba9394ac3 100644 --- a/board/freescale/m53017evb/README +++ b/board/freescale/m53017evb/README @@ -98,7 +98,7 @@ CONFIG_SYS_IMMR -- define for MBAR offset CFG_SYS_MBAR -- define MBAR offset -CONFIG_MONITOR_IS_IN_RAM -- Not support +CFG_MONITOR_IS_IN_RAM -- Not support CFG_SYS_INIT_RAM_ADDR -- defines the base address of the MCF5301x internal SRAM diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README index 7240648796b5..807785cb4ff5 100644 --- a/board/freescale/m5373evb/README +++ b/board/freescale/m5373evb/README @@ -97,7 +97,7 @@ CONFIG_SYS_IMMR -- define for MBAR offset CFG_SYS_MBAR -- define MBAR offset -CONFIG_MONITOR_IS_IN_RAM -- Not support +CFG_MONITOR_IS_IN_RAM -- Not support CFG_SYS_INIT_RAM_ADDR -- defines the base address of the MCF5373 internal SRAM diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst index 770327fea21a..dc2a41d4e990 100644 --- a/doc/arch/m68k.rst +++ b/doc/arch/m68k.rst @@ -93,7 +93,7 @@ Configuration to use a pre-loader ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If U-Boot should be loaded to RAM and started by a pre-loader -CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the +CFG_MONITOR_IS_IN_RAM must be defined. If it is defined the initial vector table and basic processor initialization will not be compiled in. The start address of U-Boot must be adjusted in the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index f3abe7842b69..0461aa1adbed 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2360,7 +2360,7 @@ static void flash_protect_default(void) /* Monitor protection ON by default */ #if defined(CONFIG_SYS_MONITOR_BASE) && \ (CONFIG_SYS_MONITOR_BASE >= CFG_SYS_FLASH_BASE) && \ - (!defined(CONFIG_MONITOR_IS_IN_RAM)) + (!defined(CFG_MONITOR_IS_IN_RAM)) flash_protect(FLAG_PROTECT_SET, CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 3a4fbc6eab83..cc22a4724aaa 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -32,6 +32,6 @@ */ #define CFG_SYS_SDRAM_BASE 0xc8000000 #define CFG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_MONITOR_IS_IN_RAM +#define CFG_MONITOR_IS_IN_RAM #endif /* __CONFIG_H */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index ab889180eede..556f31efe59f 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -28,6 +28,6 @@ */ #define CFG_SYS_SDRAM_BASE 0xD0000000 #define CFG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_MONITOR_IS_IN_RAM +#define CFG_MONITOR_IS_IN_RAM #endif /* __CONFIG_H */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 0e38eeb4a365..4a9e9ed882ac 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -20,7 +20,7 @@ #define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM /* no pre-loader required!!! ;-) */ +#undef CFG_MONITOR_IS_IN_RAM /* no pre-loader required!!! ;-) */ /* * Clock configuration: enable only one of the following options diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 4b88cfc2cdd9..99f1df087e36 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -19,7 +19,7 @@ #define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ +#undef CFG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index f34985c47d4b..4b20da4a23eb 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -19,7 +19,7 @@ #define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ +#undef CFG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 8f4419f402f7..fe49b04609cf 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -45,7 +45,7 @@ * boards. */ #ifdef CONFIG_RAM -#define CONFIG_MONITOR_IS_IN_RAM +#define CFG_MONITOR_IS_IN_RAM #endif /* I2C */ @@ -74,16 +74,6 @@ * Environment is located in the last sector of the flash */ -#ifndef CONFIG_MONITOR_IS_IN_RAM -#else -/* - * environment in RAM - This is used to use a single PC-based application - * to load an image, load U-Boot, load an environment and then start U-Boot - * to execute the commands from the environment. Feedback is done via setting - * and reading memory locations. - */ -#endif - /* here we put our FPGA configuration... */ /* Define user parameters that have to be customized most likely */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 1b5115f7caf1..b0acdb2e7d62 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -42,27 +42,6 @@ #define CFG_SYS_UART_PORT (0) -/* --- - * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different - * bootloader residing in flash ('chainloading'); if you want to use - * chainloading or want to compile a u-boot binary that can be loaded into - * RAM via BDM set - * "#if 0" to "#if 1" - * You will need a first stage bootloader then, e. g. colilo or a working BDM - * cable (Background Debug Mode) - * - * Setting #if 0: u-boot will start from flash and relocate itself to RAM - * - * Please do not forget to modify the setting of CONFIG_TEXT_BASE - * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000) - * - * --- - */ - -#if 0 -#define CONFIG_MONITOR_IS_IN_RAM /* monitor is started from a preloader */ -#endif - /* --- * Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index a4370ca5c7cc..e8d85bdd78f2 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -14,7 +14,7 @@ #define CFG_SYS_UART_PORT (0) -#undef CONFIG_MONITOR_IS_IN_RAM /* starts uboot direct */ +#undef CFG_MONITOR_IS_IN_RAM /* starts uboot direct */ /*----------------------------------------------------------------------* * Options * diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4185a1b9c003..01f78d11afd8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -130,7 +130,7 @@ CFG_MIU_2BIT_21_7_INTERLEAVED CFG_MIU_2BIT_INTERLEAVED CFG_MMC_DEFAULT_DEV CFG_MMC_SUNXI_SLOT -CONFIG_MONITOR_IS_IN_RAM +CFG_MONITOR_IS_IN_RAM CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS CONFIG_MXC_GPT_HCLK From patchwork Sun Nov 20 14:07:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706844 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=eS9cc9ck; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXYY4NHPz23n6 for ; Mon, 21 Nov 2022 01:13:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 167688530D; Sun, 20 Nov 2022 15:09:40 +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="eS9cc9ck"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13D0C852CE; Sun, 20 Nov 2022 15:08:44 +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-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 AF90485297 for ; Sun, 20 Nov 2022 15:08:39 +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-x82c.google.com with SMTP id s4so5930838qtx.6 for ; Sun, 20 Nov 2022 06:08:39 -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=SSl9OCF22jt7HI7edGHFgJOeVnMIhcPCALN9PsJtwU4=; b=eS9cc9ckOMTjv+yQcQ8fsMqKFGjOwGSdNSWv4l8Sb1oCYjIMADVdvR10DG3rnfpo4h Rx1qSirZeRRrh+Jj5zU8j4kKSirZzBryRDodmo/UPiMNigaLfsaau+GVLlf08MV1nK1R HQDqnCOL+t5vrzvVZRUx4sn6vIqjBa25n5yFU= 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=SSl9OCF22jt7HI7edGHFgJOeVnMIhcPCALN9PsJtwU4=; b=MoGDGmwuZOT9cKcOeElr+vKuE7jZPzyBbW2lit2Q5yruYyqIRSsljopYMJJMEsNb7n fOwIPJ60xwjlJ4IPMn/V4im0oPD3Eoo3r5Z19KK9OwXAu0J7m2D52mfJJS1QGBuejOhT PXcuL2yND+aaPL38XH7XTA7GxZFQbncUpGZ9k9NsSrmpd+c3p3MDW7dOOy9Gy2D4se99 rw0vaQ3fV28Zj7h+LAFiLgvCb/1iD3oNdKRa/XwTErJ/y3RrhYSHngft49gqPuMmQeRL E8+B2keGv48AJaikoJoXqcxtFz1lhHon9s8WZugDrEvMVd9Ix3WqRdH3IlpoGFLKyg7+ FmtA== X-Gm-Message-State: ANoB5pkTtdTDdhlzrAE6d+haCspD7m0xWSvg2nNLgny61xi8ZzEKLQ11 3PWz8+ql8c+THHfflGH68eXcwmTDt9fy2Q== X-Google-Smtp-Source: AA0mqf6n6SrbnZlc4NUdBN85NKjP1sQYtENJeEW8SdKxXGIivzIF/R+8iWE2Nas4/8aznftsgcNPuw== X-Received: by 2002:ac8:5b56:0:b0:393:1482:bd1d with SMTP id n22-20020ac85b56000000b003931482bd1dmr355978qtw.519.1668953318297; Sun, 20 Nov 2022 06:08:38 -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.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 123/241] global: Migrate CONFIG_MTD_NAND_VERIFY_WRITE to CFG Date: Sun, 20 Nov 2022 09:07:13 -0500 Message-Id: <20221120140829.3057894-14-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/ls1043aqds.h | 2 +- include/configs/ls1043ardb.h | 2 +- include/configs/ls1046afrwy.h | 2 +- include/configs/ls1046aqds.h | 2 +- include/configs/ls1046ardb.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080aqds.h | 2 +- include/configs/ls2080ardb.h | 2 +- scripts/config_whitelist.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 35662f65502f..477e63ce0390 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -107,7 +107,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #endif #ifdef CONFIG_NAND_BOOT diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 80214e069cb1..ec81b3ca5b36 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -82,7 +82,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #ifdef CONFIG_NAND_BOOT #define CFG_SYS_NAND_U_BOOT_SIZE (1024 << 10) diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h index 1759d25f3a39..c876d3ee2719 100644 --- a/include/configs/ls1046afrwy.h +++ b/include/configs/ls1046afrwy.h @@ -45,7 +45,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE /* IFC Timing Params */ #define CFG_SYS_CSPR0_EXT CFG_SYS_NAND_CSPR_EXT diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index c4fbef7e7f9a..731fc1d35bb7 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -127,7 +127,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #endif #ifdef CONFIG_NAND_BOOT diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 1209f16619f9..13837e89d25b 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -50,7 +50,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE /* * CPLD diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 52a6a2768384..421965fc7974 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -99,7 +99,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #define CFG_SYS_I2C_FPGA_ADDR 0x66 #define QIXIS_LBMAP_SWITCH 6 diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 542495956c32..41d1666a3588 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -83,7 +83,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #define CFG_SYS_I2C_FPGA_ADDR 0x66 #define QIXIS_BRDCFG4_OFFSET 0x54 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index db7e422336fe..652f0b1b7760 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -100,7 +100,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #define QIXIS_LBMAP_SWITCH 0x06 #define QIXIS_LBMAP_MASK 0x0f diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index e4c9b2c44ca6..4ca7d51c990b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -97,7 +97,7 @@ #define CFG_SYS_NAND_FTIM3 0x0 #define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } -#define CONFIG_MTD_NAND_VERIFY_WRITE +#define CFG_MTD_NAND_VERIFY_WRITE #define QIXIS_LBMAP_SWITCH 0x06 #define QIXIS_LBMAP_MASK 0x0f diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 01f78d11afd8..24d09c1a4be2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -131,7 +131,7 @@ CFG_MIU_2BIT_INTERLEAVED CFG_MMC_DEFAULT_DEV CFG_MMC_SUNXI_SLOT CFG_MONITOR_IS_IN_RAM -CONFIG_MTD_NAND_VERIFY_WRITE +CFG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC From patchwork Sun Nov 20 14:07:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706837 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=pJFJbaWO; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXWd3rYkz23n6 for ; Mon, 21 Nov 2022 01:11:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAE5E8532E; Sun, 20 Nov 2022 15:09:25 +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="pJFJbaWO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9042852CE; Sun, 20 Nov 2022 15:08:44 +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-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 A7689852AA for ; Sun, 20 Nov 2022 15:08:40 +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-x834.google.com with SMTP id w4so5971630qts.0 for ; Sun, 20 Nov 2022 06:08:40 -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=xGP8/vt35sYIE/oWfJM17YIvF3z0tD29baZKT7YaV1o=; b=pJFJbaWOD5O+1rh/TThvvL1KWapZbcMa4BeD+IUBDK8TydH8lxgIKzU3XUU/alS70w Ph6GpcIRcMU4aCPNRbUMQlzDn2oM8/RCI7UevVz6ogt5CABGG4NKXtfhmxOVf8INvslp SqYG/UgsxjRd3lE2zBAC/08R1/3HPThS/pao8= 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=xGP8/vt35sYIE/oWfJM17YIvF3z0tD29baZKT7YaV1o=; b=DRJx8229ooVhExB0rcmnXH5JI93OfX+4nO3fp/kIZ4Y8KZBpStxVJAYjQnmcCBDFDb fliB0Nt8VSrCECY4Y49cU16tijZwFpcg0nZlnmxkwONg1F49djxSRUN/kIXLQ0S4tCug qR8FZAGw7x6Ua2IEPZ8m3UbUmvzp5NGHouOlZ9X4sOlqaEqYomFG/+WlTf2k8o6waR1x IeKie76QR+LmLLg0MGxXRB7NwOxYvb+mR4YHbKBRde/o3cPoXs4Kawxjv/4y+cnVrtm/ PFu1BC4FrZOsUhQNiLEG8nOqAUySaJOnMgdEP91yWqzBjtjWLKBeyjraK+0vJwDqdbGE uGwA== X-Gm-Message-State: ANoB5pnPht6En7ZKqLBEjlTL+H4biXoHhh2N/D9V4Q+ezIZCKqhZaHyz cjSW8lRlB7ItjHIhLvdKPQ0eDIMRYiyMnA== X-Google-Smtp-Source: AA0mqf5S6CBKkgD6KjMPFe5vW14XzS+Yml48eK5B5c7pwg6xUx6v3Y6hMcK78GHP5K65O8qXQKJGvQ== X-Received: by 2002:a05:622a:1b09:b0:3a5:92a5:4455 with SMTP id bb9-20020a05622a1b0900b003a592a54455mr14000859qtb.113.1668953319015; Sun, 20 Nov 2022 06:08:39 -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.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 124/241] global: Migrate CONFIG_MVGBE_PORTS to CFG Date: Sun, 20 Nov 2022 09:07:14 -0500 Message-Id: <20221120140829.3057894-15-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/net/mvgbe.c | 6 +++--- include/configs/SBx81LIFKW.h | 2 +- include/configs/SBx81LIFXCAT.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/openrd.h | 4 ++-- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/sheevaplug.h | 2 +- scripts/config_whitelist.txt | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index a77c05743262..373bb8b0d239 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -37,8 +37,8 @@ DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_MVGBE_PORTS -# define CONFIG_MVGBE_PORTS {0, 0} +#ifndef CFG_MVGBE_PORTS +# define CFG_MVGBE_PORTS {0, 0} #endif #define MV_PHY_ADR_REQUEST 0xee @@ -832,7 +832,7 @@ int mvgbe_initialize(struct bd_info *bis) struct eth_device *dev; int devnum; int ret; - u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS; + u8 used_ports[MAX_MVGBE_DEVS] = CFG_MVGBE_PORTS; for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) { /*skip if port is configured not to use */ diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index bad34d9771ec..861ae530336a 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -43,7 +43,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ +#define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 9a9663b34ba8..418221ca72b3 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -48,7 +48,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ +#define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 2a70db5e9382..8a9591ff29e1 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -20,7 +20,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #endif /* diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 07cec38b50d0..68afe96239e6 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -31,7 +31,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_DOCKSTAR_H */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 733020d3e261..2b312e52b135 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -27,7 +27,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +#define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index ede21a4e2c57..a5f62497a731 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -39,7 +39,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable one port */ +#define CFG_MVGBE_PORTS {1, 0} /* enable one port */ #define CONFIG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index bc517286b113..c10e991d6589 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -39,7 +39,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index c4f53e6e4004..b21151e312c9 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -34,7 +34,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +#define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ #define CONFIG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 242f92e6fd72..5eeaeadd4bec 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -28,7 +28,7 @@ * Ethernet driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index f719ecb5fe0b..12f8a3c933cc 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -22,7 +22,7 @@ * This board has PCIe Wifi card, so allow Ethernet to be disabled */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 11 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index db45585ba313..ea3a5215e8c9 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -18,7 +18,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #endif /* diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 9676ccc982f5..bfa132dbfe58 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -43,7 +43,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 76c4aed6fd91..85cbd0bab07d 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -47,7 +47,7 @@ #endif /* CONFIG_SPL_BUILD */ /* Ethernet driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 1 #endif /* _CONFIG_NSA310S_H */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index ec3a0e0676d7..1d1915a98520 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -38,9 +38,9 @@ */ #ifdef CONFIG_CMD_NET # ifdef CONFIG_BOARD_IS_OPENRD_BASE -# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +# define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ # else -# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +# define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ # endif # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE # define CONFIG_PHY_BASE_ADR 0x0 diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index af750e86ee98..c48590123bd2 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -26,7 +26,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_E02_H */ diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 016da6d04b0b..5d26a45f1426 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -72,7 +72,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_V4_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index a228dac2ee92..d4d968285fbd 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -24,7 +24,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 24d09c1a4be2..92dec899cad7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -132,7 +132,7 @@ CFG_MMC_DEFAULT_DEV CFG_MMC_SUNXI_SLOT CFG_MONITOR_IS_IN_RAM CFG_MTD_NAND_VERIFY_WRITE -CONFIG_MVGBE_PORTS +CFG_MVGBE_PORTS CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE From patchwork Sun Nov 20 14:07:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706835 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=ANZHunQY; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXWD5Dfwz23n6 for ; Mon, 21 Nov 2022 01:11:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 930A185306; Sun, 20 Nov 2022 15:09:23 +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="ANZHunQY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1772852D2; Sun, 20 Nov 2022 15:08:44 +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-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 0A613852BE for ; Sun, 20 Nov 2022 15:08:41 +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-x82d.google.com with SMTP id jr19so5928911qtb.7 for ; Sun, 20 Nov 2022 06:08:40 -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=EX31xQcmGaALlsOzOTi11C+Dy2d1dlIGS50IGr8TeiI=; b=ANZHunQYa7XmzTGTK60oZc630RaIJkEIOMOIfmVRi0cSsq3rEVVTYUiaJHdWZJZCWI zXV7Kc0ukNXEw3NJz9yDi4eYZKWZAL7FOkdh0VSQTOdPPiNunjudotwPP3jUQzUyclzH n0zDo8olhe8+z8mEIAc2f3tXMEmjp1bAqr6T8= 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=EX31xQcmGaALlsOzOTi11C+Dy2d1dlIGS50IGr8TeiI=; b=yQtdnkjjuKwjAWB9Ul0pqgo6oRrRjDC0vVbSVTEbrCDBiWXtNp89FNJedDdlPutp7E Vupb2tIZVElXDnlqNMegZDC7nEQWTrjfJns80GIsqEhhZcMnJxc4CpsxdFddM6VS/ogy 6RizAJoWL5aORJTHo3qBAUMP7zcv5y9d7l5a6KtiB5YRS2uNdAboZf2T2+ubm7yFDZXL FrxofeFLJD2FCsibSDTG6hmalKeY92lypO9hgFKQ+Mv7E1rUc4JAYjluriXhAHSRBUui BKYXeC+lH/mY+wCqNZ4gB+bof8zHWY+6BTyL71JCW7QYna3noga7Yfv1kJjL/wPFVGVk j9Og== X-Gm-Message-State: ANoB5plG5UO8sHN+suXOVyQLC+G8A71ruFGRHIZDin9Vl7ix/HMAGXoS ThTdkPoKsKNjZ9hWLSw6urXxr6dkx8epuA== X-Google-Smtp-Source: AA0mqf5Dj6DajSj3u8ZCltBsc9CaLIWPXoNhc2AeDavctutUt3iwzSxkZYRZ0fEzIbrwFiOmhRmNxA== X-Received: by 2002:ac8:13c1:0:b0:3a5:3ae2:ff14 with SMTP id i1-20020ac813c1000000b003a53ae2ff14mr14040518qtj.594.1668953319513; Sun, 20 Nov 2022 06:08:39 -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.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:39 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 125/241] global: Migrate CONFIG_MXC_GPT_HCLK to CFG Date: Sun, 20 Nov 2022 09:07:15 -0500 Message-Id: <20221120140829.3057894-16-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-imx/timer.c | 4 ++-- include/configs/brppt2.h | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx7_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index fcd45f09f181..792772b06473 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -54,7 +54,7 @@ static inline int gpt_has_clk_source_osc(void) static inline ulong gpt_get_clk(void) { -#ifdef CONFIG_MXC_GPT_HCLK +#ifdef CFG_MXC_GPT_HCLK if (gpt_has_clk_source_osc()) return MXC_HCLK >> 3; else @@ -78,7 +78,7 @@ int timer_init(void) i = __raw_readl(&cur_gpt->control); i &= ~GPTCR_CLKSOURCE_MASK; -#ifdef CONFIG_MXC_GPT_HCLK +#ifdef CFG_MXC_GPT_HCLK if (gpt_has_clk_source_osc()) { i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN; diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 92f34407b401..47a95c0b920a 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -16,7 +16,7 @@ #define CFG_SYS_PL310_BASE L2_PL310_BASE #endif /* !CONFIG_SYS_L2CACHE_OFF */ -#define CONFIG_MXC_GPT_HCLK +#define CFG_MXC_GPT_HCLK /* MMC */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 245530aa640b..1e99cdc7df4d 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -16,7 +16,7 @@ #endif #endif -#define CONFIG_MXC_GPT_HCLK +#define CFG_MXC_GPT_HCLK #include #include diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index d5af6990107d..3a5917fed4b8 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -14,7 +14,7 @@ #include /* Timer settings */ -#define CONFIG_MXC_GPT_HCLK +#define CFG_MXC_GPT_HCLK #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ /* Miscellaneous configurable options */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 92dec899cad7..8aa247c62448 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -133,7 +133,7 @@ CFG_MMC_SUNXI_SLOT CFG_MONITOR_IS_IN_RAM CFG_MTD_NAND_VERIFY_WRITE CFG_MVGBE_PORTS -CONFIG_MXC_GPT_HCLK +CFG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE CONFIG_MXC_NAND_REGS_BASE From patchwork Sun Nov 20 14:07:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706843 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=NRviF9K3; 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 4NFXYF4Cp8z23n6 for ; Mon, 21 Nov 2022 01:13:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0392085317; Sun, 20 Nov 2022 15:09:38 +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="NRviF9K3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 05C3B852DF; Sun, 20 Nov 2022 15:08:52 +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-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (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 8D70A852C9 for ; Sun, 20 Nov 2022 15:08:41 +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-x832.google.com with SMTP id cg5so5910678qtb.12 for ; Sun, 20 Nov 2022 06:08:41 -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=J2EpQsNVRx7ai9kUc1J5eau7mufeWnh0uPGyYcayYvs=; b=NRviF9K3nwywlU8PjErjy/m2eWtK6kias200A56WaehRpvQvmy3v2aMnZiNSaQJA/C aMsgHvws0OVSQvZYFObMOXugaL6x53XCkdES1asbbnjrh8u6B6nmeiU16zmKWDWfqFwh B1yM6/1lTp0f7ff6DQrvKbrOIXno5JxUM0r2k= 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=J2EpQsNVRx7ai9kUc1J5eau7mufeWnh0uPGyYcayYvs=; b=Et1JME0vhAVEthh+ix2/Fj1NCAB9WTpNBot4OTcIotVjON1ZoFdKKLegpmMU0M1eXN WzUjHB0qk+9na09AKWiAX7oO7+buNqoOngPVMT04d4v3kGfF3P9RwMwHyOpYf7eRzY8T JwRSWp3DlJM/cGrSaZhvd9sir7sRfUNGgaDsO7WKVBCSrWOQ7PwfKRaqCh6CU4i9P/eJ HupHtAImiLI0pInhoc1xuIOdjxXQAVMFdwIJZFyVjATpI5mjXxZobg2BkzGcbo06tPw/ bAIFp5peY684jY4yW74PGI5lsxeobHsy7gBxTHV8LVoHz/hm2XFH43kgvEtQ8KfKyaZ8 nhyA== X-Gm-Message-State: ANoB5pmG9GLx+3JPNtxPC7qqs7t791/YxyHH6pb+wmMEpSkeCd2Bo4IU huluhCM86t1bViahExkp6YtiqCt0YgbHTw== X-Google-Smtp-Source: AA0mqf5CLgcpr/6edFRjfA8DkA10zrP66qr0RRdkVegNdokOdz0pSHLTG2rGOtIZ71BhA3p0dsFPqQ== X-Received: by 2002:a05:622a:4886:b0:35b:af0c:6c9 with SMTP id fc6-20020a05622a488600b0035baf0c06c9mr4940709qtb.71.1668953320121; Sun, 20 Nov 2022 06:08:40 -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.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:39 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 126/241] global: Migrate CONFIG_MXC_NAND_HWECC to CFG Date: Sun, 20 Nov 2022 09:07:16 -0500 Message-Id: <20221120140829.3057894-17-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/mtd/nand/raw/mxc_nand.c | 4 ++-- include/configs/m53menlo.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 8aa5f7342131..78f5719bc6ef 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -372,7 +372,7 @@ static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on) #endif } -#ifdef CONFIG_MXC_NAND_HWECC +#ifdef CFG_MXC_NAND_HWECC static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode) { /* @@ -1179,7 +1179,7 @@ int board_nand_init(struct nand_chip *this) #endif host->clk_act = 1; -#ifdef CONFIG_MXC_NAND_HWECC +#ifdef CFG_MXC_NAND_HWECC this->ecc.calculate = mxc_nand_calculate_ecc; this->ecc.hwctl = mxc_nand_enable_hwecc; this->ecc.correct = mxc_nand_correct_data; diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 979fddab5e32..0684a9743a1c 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -48,7 +48,7 @@ #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CFG_SYS_NAND_LARGEPAGE -#define CONFIG_MXC_NAND_HWECC +#define CFG_MXC_NAND_HWECC #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8aa247c62448..2030e582de3f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -134,7 +134,7 @@ CFG_MONITOR_IS_IN_RAM CFG_MTD_NAND_VERIFY_WRITE CFG_MVGBE_PORTS CFG_MXC_GPT_HCLK -CONFIG_MXC_NAND_HWECC +CFG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE CONFIG_MXC_NAND_REGS_BASE CONFIG_MXC_UART_BASE From patchwork Sun Nov 20 14:07:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706836 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=BoXFFrcU; 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 4NFXWR2DCxz23n6 for ; Mon, 21 Nov 2022 01:11:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F3418532C; Sun, 20 Nov 2022 15:09:24 +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="BoXFFrcU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0401852BE; Sun, 20 Nov 2022 15:08:44 +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-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 4D302852C5 for ; Sun, 20 Nov 2022 15:08:41 +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-qv1-xf29.google.com with SMTP id p8so5844294qvn.5 for ; Sun, 20 Nov 2022 06:08:41 -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=BKQie98MjHJE0imNmYFrF5Sm5VCQV3XXoBh/PLzGigg=; b=BoXFFrcUbaTKsjj4xIC6UbfYLjSrtUS5u8CAzIGUAdfG8TYSII72G+rYb0F9o5bj73 987kK1EBvhXnBhDUZUIyGAH3pxlvUtT5P0bqDZFq4Sjs0jteNXq1LFb+5k96rP2ELtKK hi1Z0aYjn20bqyuasqq7vY4zq3+LU1TAXcKsQ= 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=BKQie98MjHJE0imNmYFrF5Sm5VCQV3XXoBh/PLzGigg=; b=KDJHovQ+ovD8+5L7E31yziGAAjLkkDS5jYaJmykBX8d6zWEYb2DYThQkO823qVvvg0 +bpo266ll+V2vHaHQnw1naCSA0j1gfH7HVQv10JOdF6OacXHBKte5tuyUqheHEhCIIuF i6KDCAsbdLXbHC84aFyiJMQvF3wAleIN5iwvumSdriA7pfsN3Kz/EJ7E78dZ7+jtSYYG 4y4bCkziCB+1s4An8+Pw8nmOpeaHDPlOU4qtKcnptqgb6CaBV8/4YUfYgFwE1eaEUyIf lv/1Fc33BgyCmo01rkoR/W2kCP8MqlbTWV5hDVZ5IJpq6hWoMxIrTA3nhwVsYyRYkKxz i0QQ== X-Gm-Message-State: ANoB5pnQ4xZpCUiHeO03Y9OAfvk/eHEY5gu+FqM4diJF80hXpnOSkmGc IOhjkEOJ3lGt8Owynyza7xOLN9HMhgfkPA== X-Google-Smtp-Source: AA0mqf4QmYHYKdtbxGHJDeACegZQsT92zIMHQuteD9RyieSF5nFrOifoKTLy3wrlpfBjv85wIpXC7A== X-Received: by 2002:a0c:fec3:0:b0:4c6:86be:a0c9 with SMTP id z3-20020a0cfec3000000b004c686bea0c9mr13021443qvs.123.1668953320753; Sun, 20 Nov 2022 06:08:40 -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.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:40 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 127/241] global: Migrate CONFIG_MXC_NAND_IP_REGS_BASE to CFG Date: Sun, 20 Nov 2022 09:07:17 -0500 Message-Id: <20221120140829.3057894-18-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/mtd/nand/raw/mxc_nand.c | 2 +- include/configs/m53menlo.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 78f5719bc6ef..36c61c2eb8cf 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1175,7 +1175,7 @@ int board_nand_init(struct nand_chip *this) host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE; #ifdef MXC_NFC_V3_2 host->ip_regs = - (struct mxc_nand_ip_regs __iomem *)CONFIG_MXC_NAND_IP_REGS_BASE; + (struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE; #endif host->clk_act = 1; diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 0684a9743a1c..6d0f43999681 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -46,7 +46,7 @@ #ifdef CONFIG_CMD_NAND #define CFG_SYS_NAND_BASE NFC_BASE_ADDR_AXI #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI -#define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR +#define CFG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CFG_SYS_NAND_LARGEPAGE #define CFG_MXC_NAND_HWECC #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2030e582de3f..c83a676a330a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -135,7 +135,7 @@ CFG_MTD_NAND_VERIFY_WRITE CFG_MVGBE_PORTS CFG_MXC_GPT_HCLK CFG_MXC_NAND_HWECC -CONFIG_MXC_NAND_IP_REGS_BASE +CFG_MXC_NAND_IP_REGS_BASE CONFIG_MXC_NAND_REGS_BASE CONFIG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS From patchwork Sun Nov 20 14:07:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706838 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=V4aIBKbp; 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 4NFXWr0b3jz23n6 for ; Mon, 21 Nov 2022 01:11:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE2F28533E; Sun, 20 Nov 2022 15:09:26 +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="V4aIBKbp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D0BD3852A3; Sun, 20 Nov 2022 15:08:46 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 B5C5A8529D for ; Sun, 20 Nov 2022 15:08:42 +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-x833.google.com with SMTP id cg5so5910696qtb.12 for ; Sun, 20 Nov 2022 06:08:42 -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=EdRJQWeZaUXikatY/rE4sPcA2Ybvek3WU6RGDAc7+cY=; b=V4aIBKbpO8O7xZpRRR8DCpkMdeuRV4IcIawaUU0tA2fRINQIevKZs7Hw0mV6ZLImAq EEqHwbjb0ufjqiItWISKex5rf86mvSGFDsS6hqd6pH7WY8I1jkXPk0m5CsmYy1BfneYw eLjG6/rRd06hfCDPlP75MvUfaELKsQeUkg6Sg= 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=EdRJQWeZaUXikatY/rE4sPcA2Ybvek3WU6RGDAc7+cY=; b=F4HnUrTAKtrJ7LRlqe+tntRIlzoa5CuuMoIjNLBH/own+TYobM0o2VjNk3vrAkG98T g+K2xBR1YV7YrElr1aVKnzybLBWtKWAtYk4Aw3qJpswkyKX+aVPJH7b+V3bSMZ2WmFMB 469AE2cSJzoBA0t8zhwSMqGXrLg4+vMLNG2P1c8xKjfqIC6Zas0ySLHP6NSyyA34itPe ExbDwjlD4RoPmlpzagKdNeqKd5NeM17alJ8+6TyrHXE+CvgQeGrzZRu1gh64iZydcJrn ZSgo7gMbQtfqPq/0+oTE/O40bUW05mIO6MTTs2DHla5vag/aqmQxDVcqbeBxNHMDqMZu rXNw== X-Gm-Message-State: ANoB5pkguRsWF+5BYZ7/zMMCrq3fklymTFMAZkC9UWFhf1sQudoMpOWu oBOvL6DWxAhJGASX16c1SZ82/zZ4K/PCUQ== X-Google-Smtp-Source: AA0mqf7JX/WgyA8I/HoGxhO5HyzPJJYBrm8vETAVtrlmtV4gTRP9ytZCQkpGOLnihbP9QeqC1tgYIA== X-Received: by 2002:ac8:1084:0:b0:3a5:2a3d:a953 with SMTP id a4-20020ac81084000000b003a52a3da953mr14334365qtj.231.1668953321324; Sun, 20 Nov 2022 06:08:41 -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.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:41 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 128/241] global: Migrate CONFIG_MXC_NAND_REGS_BASE to CFG Date: Sun, 20 Nov 2022 09:07:18 -0500 Message-Id: <20221120140829.3057894-19-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/mtd/nand/raw/mxc_nand.c | 2 +- include/configs/m53menlo.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 36c61c2eb8cf..3116356f6915 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1172,7 +1172,7 @@ int board_nand_init(struct nand_chip *this) this->write_buf = mxc_nand_write_buf; this->read_buf = mxc_nand_read_buf; - host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE; + host->regs = (struct mxc_nand_regs __iomem *)CFG_MXC_NAND_REGS_BASE; #ifdef MXC_NFC_V3_2 host->ip_regs = (struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE; diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 6d0f43999681..88be79462e66 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -45,7 +45,7 @@ */ #ifdef CONFIG_CMD_NAND #define CFG_SYS_NAND_BASE NFC_BASE_ADDR_AXI -#define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI +#define CFG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI #define CFG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CFG_SYS_NAND_LARGEPAGE #define CFG_MXC_NAND_HWECC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c83a676a330a..e041df9b887a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -136,7 +136,7 @@ CFG_MVGBE_PORTS CFG_MXC_GPT_HCLK CFG_MXC_NAND_HWECC CFG_MXC_NAND_IP_REGS_BASE -CONFIG_MXC_NAND_REGS_BASE +CFG_MXC_NAND_REGS_BASE CONFIG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT From patchwork Sun Nov 20 14:07:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706846 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=djvYLrJW; 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 4NFXYw1yFNz23n6 for ; Mon, 21 Nov 2022 01:13:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0CE3E852CC; Sun, 20 Nov 2022 15:09:43 +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="djvYLrJW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4E3CB852C5; Sun, 20 Nov 2022 15:08:53 +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-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (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 D0B43852BD for ; Sun, 20 Nov 2022 15:08:42 +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-x832.google.com with SMTP id cg5so5910719qtb.12 for ; Sun, 20 Nov 2022 06:08:42 -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=rBlqA725sE3gE25/8MhTUE17fWEn1LoRbP0VtV5Du6Q=; b=djvYLrJW5SGCr3p47t/kx/YNNXn8TahOb6i/8Hnh3RN+ldkREzwmXGcTJEwt80Hq0T m4+WZip2bb0pQMj5f292XsEjgUWi+1JCU9LAiK3umH+5VR9i5kL84bH2i7Pu+tUgTPUs CuA0VrboP3rvvB/aKoJlklvKClF56XTiswTdQ= 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=rBlqA725sE3gE25/8MhTUE17fWEn1LoRbP0VtV5Du6Q=; b=U4t/ymS4waQ+6thEHPpktRK34yB1pKoBOdeXcF8RX+5cMhaOerinYnR5oRl4E9OBza MCNy0b8jTNdgqNqigir+mEKVb5SXAPNzGL817qzpE/gIYHLktRNVurBqJnmuQIGKvTw6 QqpUGiGmXwY8LIeOyuOnveklzs6YwlEeUxeoOMqO6azaRLiTuENZ3ryjVFUsTz2XlO+d uJzeBoWPI9hOlKX82FfhtnBCzucv5VGb+A3a6hbWW6tO7fHdHAx9FjsDHS5tBder+HmK hilWeTtInCFdjcKuUm6sNmzII64z84dBB9ea0MGRUtr2XCXIMU+HBjzikra16h9tcT8s jqkA== X-Gm-Message-State: ANoB5pnHVBkHmxTLkseIx0BpZiWgOeDFRtv2gHDpI0M9O98CbyT8npCA TpI3JCfixaW2uavrEGvDVaxqyMfMShohmg== X-Google-Smtp-Source: AA0mqf5vAgB6syTsP29w9Xv0OgTIeMu59WwxC+F/R2XyszEw4w/+uRWbYHU6q8nvfZPg+xSuUFOmgQ== X-Received: by 2002:ac8:7c96:0:b0:3a5:15dd:c912 with SMTP id y22-20020ac87c96000000b003a515ddc912mr14077307qtv.553.1668953321942; Sun, 20 Nov 2022 06:08:41 -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.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:41 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 129/241] global: Migrate CONFIG_MXC_UART_BASE to CFG Date: Sun, 20 Nov 2022 09:07:19 -0500 Message-Id: <20221120140829.3057894-20-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/ge/b1x5v2/spl.c | 4 ++-- drivers/serial/serial_mxc.c | 6 +++--- include/configs/apalis_imx6.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_b1x5v2.h | 4 ++-- include/configs/gw_ventana.h | 2 +- include/configs/imx6-engicam.h | 4 ++-- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/librem5.h | 10 +++++----- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 6 +++--- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 63 files changed, 74 insertions(+), 74 deletions(-) diff --git a/board/ge/b1x5v2/spl.c b/board/ge/b1x5v2/spl.c index 52c80f792d3c..460d3be1d834 100644 --- a/board/ge/b1x5v2/spl.c +++ b/board/ge/b1x5v2/spl.c @@ -565,9 +565,9 @@ void board_init_f(ulong dummy) timer_init(); /* iomux */ - if (CONFIG_MXC_UART_BASE == UART2_BASE) + if (CFG_MXC_UART_BASE == UART2_BASE) SETUP_IOMUX_PADS(uart2_pads); - else if (CONFIG_MXC_UART_BASE == UART3_BASE) + else if (CFG_MXC_UART_BASE == UART3_BASE) SETUP_IOMUX_PADS(uart3_pads); /* UART clocks enabled and gd valid - init serial console */ diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 82c0d84628d5..8bcbbf2bbfcb 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk, #if !CONFIG_IS_ENABLED(DM_SERIAL) -#ifndef CONFIG_MXC_UART_BASE -#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver" +#ifndef CFG_MXC_UART_BASE +#error "define CFG_MXC_UART_BASE to use the MXC UART driver" #endif -#define mxc_base ((struct mxc_uart *)CONFIG_MXC_UART_BASE) +#define mxc_base ((struct mxc_uart *)CFG_MXC_UART_BASE) static void mxc_serial_setbrg(void) { diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 8db2909c96b2..b1355d637538 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -15,7 +15,7 @@ #include #include -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index cde7d3c891ab..b7920c7b3057 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -10,7 +10,7 @@ #include "mx7_common.h" -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* Network */ #define CFG_FEC_MXC_PHYADDR 0 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 47b76c9371e8..90ebec4a94ca 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -26,7 +26,7 @@ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE /* Serial console */ -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE /* Environment */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 2f30322bb4f8..5f098fab940e 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -15,7 +15,7 @@ #include #include -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index c2ed9c7c56af..fb619105a760 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -28,7 +28,7 @@ #define MMC_ROOTFS_PART 2 /* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 1fbdebb64511..e9c36cdb80e9 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -28,7 +28,7 @@ #define CFG_SYS_FSL_USDHC_NUM 3 /* UART */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/display5.h b/include/configs/display5.h index 191c8fb8ab46..9a6fb72377c1 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -34,7 +34,7 @@ #define CFG_SYS_SPI_ARGS_OFFS 0x140000 #define CFG_SYS_SPI_ARGS_SIZE 0x10000 -#define CONFIG_MXC_UART_BASE UART5_BASE +#define CFG_MXC_UART_BASE UART5_BASE /* I2C Configs */ #define CFG_I2C_MULTI_BUS diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index a5e2dc063a74..6913a91c4c19 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -21,7 +21,7 @@ /* Commands */ -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE #define CFG_EXTRA_ENV_SETTINGS \ "board=EL6Q\0" \ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 8f03c2ff3c0d..9b772d2bd367 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -12,7 +12,7 @@ #ifndef __RIOTBOARD_CONFIG_H #define __RIOTBOARD_CONFIG_H -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 9dc1d7394afd..703d63bd20bc 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -13,9 +13,9 @@ #include "mx6_common.h" /* UART */ -#define CONFIG_MXC_UART_BASE UART3_BASE +#define CFG_MXC_UART_BASE UART3_BASE -#if CONFIG_MXC_UART_BASE == UART2_BASE +#if CFG_MXC_UART_BASE == UART2_BASE /* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */ #define CONSOLE_DEVICE "ttymxc1" /* System on Module debug connector */ #else diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index e71f10a24fa1..3713ba4dbceb 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -16,7 +16,7 @@ #include "mx6_common.h" /* Serial */ -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE /* NAND */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 4208ba95915e..786b70fe064d 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -116,9 +116,9 @@ /* UART */ #ifdef CONFIG_MXC_UART # ifdef CONFIG_MX6UL -# define CONFIG_MXC_UART_BASE UART1_BASE +# define CFG_MXC_UART_BASE UART1_BASE # else -# define CONFIG_MXC_UART_BASE UART4_BASE +# define CFG_MXC_UART_BASE UART4_BASE # endif #endif diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 121b34ae96db..f9544cd430ca 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -8,7 +8,7 @@ #ifndef __IMX6LOGIC_CONFIG_H #define __IMX6LOGIC_CONFIG_H -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #define CONSOLE_DEV "ttymxc0" #include "mx6_common.h" diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 162b0b8a69bb..db08e43f0d86 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -35,7 +35,7 @@ #include /* UART */ -#define CONFIG_MXC_UART_BASE UART3_BASE +#define CFG_MXC_UART_BASE UART3_BASE /* MMC */ diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h index c95038eaa537..9da98d0af277 100644 --- a/include/configs/imx6ulz_smm_m2.h +++ b/include/configs/imx6ulz_smm_m2.h @@ -12,7 +12,7 @@ #include #include -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 438e79df3cc1..87262a97877e 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -10,7 +10,7 @@ #include "mx7_common.h" -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR #undef CFG_EXTRA_ENV_SETTINGS diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 0723d27ab703..f7d2b660c1f3 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -25,7 +25,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x40000000 /* Minimum 1 GiB DDR */ -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR +#define CFG_MXC_UART_BASE UART3_BASE_ADDR /* PHY needs a longer autonegotiation timeout after reset */ #define PHY_ANEG_TIMEOUT 20000 diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h index b8fdedefa21f..d022faaa91a4 100644 --- a/include/configs/imx8mp_dhcom_pdk2.h +++ b/include/configs/imx8mp_dhcom_pdk2.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x20000000 /* Minimum 512 MiB DDR */ -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_BASE_ADDR /* PHY needs a longer autonegotiation timeout after reset */ #define PHY_ANEG_TIMEOUT 20000 diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index e4e24b522fdb..495ca313db28 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -148,7 +148,7 @@ #define PHYS_SDRAM_2_SIZE 0x80000000 /* 2 GB */ #endif -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR +#define CFG_MXC_UART_BASE UART3_BASE_ADDR #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index f7ae1b47d063..828bd6723727 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -54,7 +54,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x40000000 /* 1 GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1) #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 4b46321e8512..a7a51907f5c9 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -59,7 +59,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1) #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 6d0c45311183..bfde15e6240f 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -92,7 +92,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1) #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index e57ae20a74ea..523cb5a07fd0 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -22,7 +22,7 @@ #define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* Board and environment settings */ -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE #define CFG_HOSTNAME "kontron-mx6ul" #ifdef CONFIG_USB_EHCI_HCD diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 5a3c9f76a431..bf590efb4348 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -67,7 +67,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(3) #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/librem5.h b/include/configs/librem5.h index 1818a57e49c5..4725be264a9b 100644 --- a/include/configs/librem5.h +++ b/include/configs/librem5.h @@ -32,23 +32,23 @@ #define CONSOLE_ON_UART1 #ifdef CONSOLE_ON_UART1 -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_BASE_ADDR #define CONSOLE_UART_CLK 0 #define CONSOLE "ttymxc0" #elif defined(CONSOLE_ON_UART2) -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR +#define CFG_MXC_UART_BASE UART2_BASE_ADDR #define CONSOLE_UART_CLK 1 #define CONSOLE "ttymxc1" #elif defined(CONSOLE_ON_UART3) -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR +#define CFG_MXC_UART_BASE UART3_BASE_ADDR #define CONSOLE_UART_CLK 2 #define CONSOLE "ttymxc2" #elif defined(CONSOLE_ON_UART4) -#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR +#define CFG_MXC_UART_BASE UART4_BASE_ADDR #define CONSOLE_UART_CLK 3 #define CONSOLE "ttymxc3" #else -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_BASE_ADDR #define CONSOLE_UART_CLK 0 #define CONSOLE "ttymxc0" #endif diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 0b8781d7bf34..63e5dbfab775 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -13,7 +13,7 @@ #include #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #ifdef CONFIG_FSL_USDHC diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 88be79462e66..2ffee5b2e930 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -31,7 +31,7 @@ /* * Serial Driver */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* * MMC Driver diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 9b2777339a10..9b4a1ab7f62f 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -17,7 +17,7 @@ * mode from SD card (SD2) */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configuration */ #define CFG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index 1cd0b3cf7374..c1c1fd5a7843 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -55,7 +55,7 @@ #define PHYS_SDRAM_2 0xc0000000 #define PHYS_SDRAM_2_SIZE 0x0 -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR +#define CFG_MXC_UART_BASE UART2_BASE_ADDR #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 740e357e00e9..123b7a533b17 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -18,7 +18,7 @@ * Hardware drivers */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0 diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index baffe65c3697..1a3ec6e0cdb8 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -14,7 +14,7 @@ #include -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 0ac93d6e0432..d87f9e942c51 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -11,7 +11,7 @@ #include -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index d4af96b51ea4..871d52c343f5 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -19,7 +19,7 @@ /* Command definition */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #define CFG_EXTRA_ENV_SETTINGS \ "som_rev=undefined\0" \ diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index f6d3b2eeb9cf..b664962a26a5 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -14,12 +14,12 @@ #ifdef CONFIG_SERIAL_CONSOLE_UART1 #if defined(CONFIG_MX6SL) -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR #else -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #endif #elif defined(CONFIG_SERIAL_CONSOLE_UART2) -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE #else #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx) #endif diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 888da7ce365f..274c14bbd383 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -8,7 +8,7 @@ #ifndef __MX6SABREAUTO_CONFIG_H #define __MX6SABREAUTO_CONFIG_H -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE #define CONSOLE_DEV "ttymxc3" /* USB Configs */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 78a554d0ccba..af9978e02c89 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -8,7 +8,7 @@ #ifndef __MX6SABRESD_CONFIG_H #define __MX6SABRESD_CONFIG_H -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #define CONSOLE_DEV "ttymxc0" #include "mx6sabre_common.h" diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 4fbd06783a6d..f6d9ac20821f 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -10,7 +10,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index cf4871cbae39..aec3e51bff87 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -10,7 +10,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #define CFG_EXTRA_ENV_SETTINGS \ "epdc_waveform=epdc_splash.bin\0" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 3399cdd16fa8..3d0f6e452d65 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -10,7 +10,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index c99d99abc179..8c39e6d6cf4d 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -12,7 +12,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #ifdef CONFIG_IMX_BOOTAUX diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 5e3695ecc971..3f8a90b626d1 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -15,7 +15,7 @@ #define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #ifdef CONFIG_FSL_USDHC diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 58d1a744ae99..2c3cd32cefa7 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -16,7 +16,7 @@ #define PHYS_SDRAM_SIZE SZ_512M -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #ifdef CONFIG_FSL_USDHC diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index 43261824d3cf..0c0235b42984 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -13,7 +13,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 /* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 811688ae82af..fabd82d6c9c6 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -13,7 +13,7 @@ #define CONFIG_USBD_HS -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/novena.h b/include/configs/novena.h index af99ba4f193c..dd82c04440ec 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -53,7 +53,7 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 /* UART */ -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 664d4f11c867..ae5e566d3fb0 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -13,7 +13,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 /* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 146f87e9ce33..e8c48cf83652 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -22,7 +22,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 /* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 0890c115700c..bd04268a3ef3 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -22,7 +22,7 @@ #define MMC_ROOTFS_PART 2 /* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index e1f7b7003194..a1d0dd93c526 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -10,7 +10,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configuration */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 6148a343117d..4064a34f191b 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -17,7 +17,7 @@ #define CFG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR +#define CFG_MXC_UART_BASE UART6_BASE_ADDR /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 7fc6211ff732..dbeaeea77f7d 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -10,7 +10,7 @@ #include "mx7_common.h" -#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART5_IPS_BASE_ADDR /* MMC Config */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 37ade717ae99..4b602ea03022 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -71,7 +71,7 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2 GiB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1) #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index a5f14dc42679..b5871424bc64 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -11,7 +11,7 @@ #define CFG_FEC_MXC_PHYADDR 0x03 -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" #endif /* __CONFIG_TQMA6_MBA6_H */ diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 34c9b6a2f97c..e06fc7fe1559 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -10,7 +10,7 @@ #define CFG_FEC_MXC_PHYADDR 0x01 /* UART */ -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE #define CONSOLE_DEV "ttymxc3" /* Watchdog */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index f0092eff1494..d85cf7808c7e 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -10,7 +10,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE /* MMC Configuration */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 5d7d734daa2d..842abb7b7a22 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -16,7 +16,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR /* Command definition */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* Linux only */ #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index b2153b441142..854875adc4b7 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -17,7 +17,7 @@ /* U-Boot general configurations */ /* UART */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* SD/MMC */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index cdd2eeef0ac9..7954ed9910c7 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -50,7 +50,7 @@ #endif #ifdef CONFIG_SPL_BUILD -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE #endif #endif /* __CONFIG_H */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 1e765439fabe..8853bcd7be28 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -10,7 +10,7 @@ #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE /* MMC Configuration */ #define CFG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index ce6ca175363b..602fd4595e77 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -10,7 +10,7 @@ #include "mx6_common.h" #include -#define CONFIG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR +#define CFG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e041df9b887a..2f3241289842 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -137,7 +137,7 @@ CFG_MXC_GPT_HCLK CFG_MXC_NAND_HWECC CFG_MXC_NAND_IP_REGS_BASE CFG_MXC_NAND_REGS_BASE -CONFIG_MXC_UART_BASE +CFG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT CONFIG_MXC_USB_PORTSC From patchwork Sun Nov 20 14:07:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706847 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=RMxzAJay; 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 4NFXZ674vhz23n6 for ; Mon, 21 Nov 2022 01:13:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1C7A8535B; Sun, 20 Nov 2022 15:09:43 +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="RMxzAJay"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 20E89852CC; Sun, 20 Nov 2022 15:08:54 +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-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 4644185298 for ; Sun, 20 Nov 2022 15:08:43 +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-x82d.google.com with SMTP id jr19so5928952qtb.7 for ; Sun, 20 Nov 2022 06:08:43 -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=hktDHH/RSaG0FzC3ctg+BP8XsRjlWhBuYTht7fIV/V4=; b=RMxzAJayqehH+sh/MqqHmiOdE0LoCUsdLc3N7I5fRFBTh6GxnooxQZ01de/eh7m0TI oD9p6Mf3hzfEhxUj34WGflgf1bEJnnU/IdcBEoZrZTPy0MRTA0Uxhsrkeh2s4Omi0Cxe keBcS8+t+NMik/Lc2QhSJD5LG7U+r4hz9qJw4= 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=hktDHH/RSaG0FzC3ctg+BP8XsRjlWhBuYTht7fIV/V4=; b=DCfd1ru27t5Mm+MXw2nndPK5kxFz12EXCMufDNPldPjZclxrblIHu49Oi8NebOdfHN WouWNjMe2KAoCz9XWVUjCz7EmwE6RCTeIOra3rGtG1jN5on2TyNjwNZOnCC5ADkM+UNu K+PudKL+cviECnJleQQbnxRyAlg5B14LodnC7tx0bPbSPzvgw9iClNEvB3jG18JFlklE u1ZxbnU0zu/NgTb6/6c+rbP4TZcKdaO9ocnQtH+6ZKTjf+TrJZAtKavThEXchptCG9AX /LyJiPfVmBLlzAd4cu5teLyAhQ/tUnioiJcnP7jAxD25r6hv65usGDFfzAdTpm6yBkjM JYdw== X-Gm-Message-State: ANoB5png7ABYgxkeini4EPMXda/+Os6Xnaq4ypQEpfVcLrafZMcXNru3 JzGmu7eN+8wUDr9s/WntEXvu57Ahysdaog== X-Google-Smtp-Source: AA0mqf443h76Dvj3YgKR4czFdjsQ5279nfE2ZLw2yWXrZev2TT6Y0/NOeZatZa8B0MyuoA4Y9dmGkA== X-Received: by 2002:ac8:75c2:0:b0:39c:e98b:ea12 with SMTP id z2-20020ac875c2000000b0039ce98bea12mr14033567qtq.151.1668953322428; Sun, 20 Nov 2022 06:08:42 -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.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:42 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 130/241] global: Migrate CONFIG_MXC_USB_FLAGS to CFG Date: Sun, 20 Nov 2022 09:07:20 -0500 Message-Id: <20221120140829.3057894-21-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/usb/host/ehci-mx5.c | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_b1x5v2.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kp_imx53.h | 2 +- include/configs/kp_imx6q_tpc.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53ppd.h | 2 +- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index 964a53bb7c0e..bdfc1283e4aa 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -302,7 +302,7 @@ static int ehci_usb_probe(struct udevice *dev) __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); setbits_le32(&ehci->portsc, USB_EN); - mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS); + mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS); mdelay(10); return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0, diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index b1355d637538..fd2a0e3d82d3 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -27,7 +27,7 @@ /* USB Configs */ /* Host */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Client */ #define CONFIG_USBD_HS diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 271d15dc5e50..19906db5966f 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -416,7 +416,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* UBI support */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index b7920c7b3057..e38d2844c803 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -97,6 +97,6 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* __CONFIG_H */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 90ebec4a94ca..479feae77240 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -136,7 +136,7 @@ /* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Boot */ #define CFG_SYS_BOOTMAPSZ (8 << 20) diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 4f5287b6bcfb..92dff580f601 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -128,7 +128,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 5f098fab940e..419c919bbecd 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -24,7 +24,7 @@ /* USB Configs */ /* Host */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Client */ #define CONFIG_USBD_HS diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 0da7553e0245..2b2b17f2c7b9 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -172,7 +172,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index fb619105a760..93ee004b009c 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -48,7 +48,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index e9c36cdb80e9..90f8ce0fd57f 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -33,7 +33,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* USB Gadget (DFU, UMS) */ #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE) diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 9b772d2bd367..f73b1ec63de6 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -19,7 +19,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 703d63bd20bc..f7e9dd16b26f 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -25,7 +25,7 @@ /* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS /* Memory */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 3713ba4dbceb..cc21e93a7beb 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -37,7 +37,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS /* Miscellaneous configurable options */ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index f9544cd430ca..215ed75deaf3 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -118,7 +118,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* Falcon Mode */ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index db08e43f0d86..ca89f72f8a21 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -44,7 +44,7 @@ /* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Falcon */ diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index e28185f24dd3..4209d9d7ab28 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -111,6 +111,6 @@ #endif #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* __IMX6Q_ACC_H */ diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 523cb5a07fd0..3479b0b2bf4d 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -27,7 +27,7 @@ #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* Boot order for distro boot */ diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 657124cc725d..89f5c6f46faf 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -27,7 +27,7 @@ #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* GUID for capsule updatable firmware image */ diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index da8a67b4ab63..baf7779026fb 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -12,7 +12,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Command definition */ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 99321b320f5f..07497d063fb8 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -19,7 +19,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 63e5dbfab775..75ff2d9db93c 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -96,7 +96,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #ifdef CONFIG_CMD_NET diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 2ffee5b2e930..d7b303b6ac05 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -73,7 +73,7 @@ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* LVDS display */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 123b7a533b17..e82e7547a3f6 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -35,7 +35,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI -#define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED +#define CFG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED /* Framebuffer and LCD */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 1a3ec6e0cdb8..5710fe90708a 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -25,7 +25,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Command definition */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index d87f9e942c51..cd7fa7c8cd96 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -19,7 +19,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* PMIC Controller */ #define CFG_SYS_DIALOG_PMIC_I2C_ADDR 0x48 diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 94d2191af91d..57dffbf6e40c 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -14,7 +14,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Command definition */ diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 274c14bbd383..1d96ecfa46cb 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -13,7 +13,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CFG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} } diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index af9978e02c89..b2266025efcf 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -30,7 +30,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #endif /* __MX6SABRESD_CONFIG_H */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index f6d9ac20821f..5d5fc8f792de 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -91,7 +91,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #define CFG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 3d0f6e452d65..ff5ef7306611 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -97,7 +97,7 @@ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #define CFG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8c39e6d6cf4d..82dbf0f949c5 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -119,7 +119,7 @@ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #ifdef CONFIG_CMD_PCI diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 3f8a90b626d1..2d26d9b045af 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -117,7 +117,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #ifdef CONFIG_CMD_NET diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index 0c0235b42984..a8a14600cc2d 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -31,7 +31,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index fabd82d6c9c6..c634cb203b36 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -24,7 +24,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_MMC #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) diff --git a/include/configs/novena.h b/include/configs/novena.h index dd82c04440ec..6088b2823412 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -58,7 +58,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Gadget part */ #define CONFIG_USBD_HS #endif diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index ae5e566d3fb0..490328d516f2 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -32,7 +32,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_NET #define CFG_FEC_MXC_PHYADDR 0x1 diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index e42a736136bc..5587237743c9 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -21,7 +21,7 @@ /* USB */ #ifdef CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif /* LCD */ diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index e8c48cf83652..c95507b25fe9 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -43,7 +43,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index bd04268a3ef3..688afe674591 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -45,7 +45,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define ENV_MMC \ "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \ diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index a1d0dd93c526..473f476aa470 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -17,7 +17,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 4064a34f191b..ba37e6765eed 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -24,7 +24,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index dbeaeea77f7d..5995ce66ec8b 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -108,6 +108,6 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 3418d4e2b559..1e3ae0398c1a 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -62,7 +62,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #endif #ifdef CONFIG_CMD_NET diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 854875adc4b7..8cea69416df2 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -25,7 +25,7 @@ /* USB */ #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 /* Linux boot */ #define CFG_HOSTNAME "usbarmory" diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 7954ed9910c7..193706e46fa5 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -37,7 +37,7 @@ #define CFG_FEC_MXC_PHYADDR 0x0 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_PCI #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 8853bcd7be28..64dbf93d05d0 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -18,7 +18,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 602fd4595e77..c17f0de7ede3 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -29,7 +29,7 @@ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 +#define CFG_MXC_USB_FLAGS 0 #define CFG_FEC_ENET_DEV 0 #define CFG_FEC_MXC_PHYADDR 0x0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2f3241289842..7c3c4bca17b7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -138,7 +138,7 @@ CFG_MXC_NAND_HWECC CFG_MXC_NAND_IP_REGS_BASE CFG_MXC_NAND_REGS_BASE CFG_MXC_UART_BASE -CONFIG_MXC_USB_FLAGS +CFG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT CONFIG_MXC_USB_PORTSC CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC From patchwork Sun Nov 20 14:07:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706850 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=L/eGB6sU; 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 4NFXZn3cZ4z23n6 for ; Mon, 21 Nov 2022 01:14:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D416853EB; Sun, 20 Nov 2022 15:09:47 +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="L/eGB6sU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FFC2852B7; Sun, 20 Nov 2022 15:08:56 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 18A4E852D7 for ; Sun, 20 Nov 2022 15:08:49 +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-qk1-x734.google.com with SMTP id s20so6541236qkg.5 for ; Sun, 20 Nov 2022 06:08:49 -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=ByENXtEPkAcqwJo+zXsppQtnl/0WWgQJZvgEyKldW5o=; b=L/eGB6sU7eB6Vij4Z6MM1JaZQRn/Z5z/F/uP2S+5+BzMCY3AMHumAzW7sWQvgU93BO kZOZP69CXmqcr7o+IMJu2UKs4pCEcyA3HaaHf05ixtZsu+k9TRiWJMPnx23Q7sHZtwri fw2no96ycnu1cKn/VbH4M7OdKxk91X8rl9RnI= 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=ByENXtEPkAcqwJo+zXsppQtnl/0WWgQJZvgEyKldW5o=; b=2Nwvd68Luf0/KIBQ/j/nwiS1j5fWESH0hBN22tYDTl/BFwNsf4O0XEeDEvLwKtcFG8 fCi5Q5QvimMTIVzAWKKRVKMCeBrHoRtJs6Y8Yz2FZi+K+zWilBjT011dht+6tNcuZ+22 Ch8As13YqgWl0aMxVMhiL4OENCgTs4y0s7khd+bmiP8J+YD1DiP05YHttrVbVEQK4Kek Dn3UAW4Bp6sOABOSPZFPXRUyYvdk5MteiPou9t/Hq70ROPgCPnd7j/2urr2PgdMdqx3P hlb9ZBDnwYSxJR0lns8Qlp/ROfxsWGkD2KXgLOrY/BAjsSOw0FbrPEc/iQisi4OxaCZb qMtA== X-Gm-Message-State: ANoB5pmE/FxtjEKT3Z9UsgrwntBNe6ca4PaRVn7FqdKWBn9vhF/tkHUQ i+h1h70Q/SlYcrMPmCcU9DZgvs+p9r8dQQ== X-Google-Smtp-Source: AA0mqf7GzvuCB8e5UeXB8j/iGjDHn/zb2YVPz245Y4AABXGLt9DTTKACe4hc+abltw+ugSUsWeg/Cg== X-Received: by 2002:a37:6316:0:b0:6fa:d7d5:3f85 with SMTP id x22-20020a376316000000b006fad7d53f85mr12704618qkb.532.1668953323024; 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.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:42 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 131/241] global: Migrate CONFIG_MXC_USB_PORT to CFG Date: Sun, 20 Nov 2022 09:07:21 -0500 Message-Id: <20221120140829.3057894-22-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/usb/host/ehci-mx5.c | 2 +- drivers/usb/host/ehci-mx6.c | 8 ++++---- include/configs/apalis_imx6.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/brppt2.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_b1x5v2.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kp_imx53.h | 2 +- include/configs/kp_imx6q_tpc.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 4 ++-- include/configs/meerkat96.h | 2 +- include/configs/mx51evk.h | 4 ++-- include/configs/mx53cx9020.h | 4 ++-- include/configs/mx53loco.h | 4 ++-- include/configs/mx53ppd.h | 4 ++-- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 2 +- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/usbarmory.h | 4 ++-- include/configs/verdin-imx8mm.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/warp7.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 4 ++-- 64 files changed, 74 insertions(+), 74 deletions(-) diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index bdfc1283e4aa..c11279867c7c 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -299,7 +299,7 @@ static int ehci_usb_probe(struct udevice *dev) HC_LENGTH(ehci_readl(&(hccr)->cr_capbase))); setbits_le32(&ehci->usbmode, CM_HOST); - __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); + __raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc); setbits_le32(&ehci->portsc, USB_EN); mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS); diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index fa2ca2a1d912..0a12db614ff4 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR; #define UCMD_RESET (1 << 1) /* controller reset */ /* If this is not defined, assume MX6/MX7/MX8M SoC default */ -#ifndef CONFIG_MXC_USB_PORTSC -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#ifndef CFG_MXC_USB_PORTSC +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* Base address for this IP block is 0x02184800 */ @@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, return 0; setbits_le32(&ehci->usbmode, CM_HOST); - writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); + writel(CFG_MXC_USB_PORTSC, &ehci->portsc); setbits_le32(&ehci->portsc, USB_EN); mdelay(10); @@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type) case USBPHY_INTERFACE_MODE_HSIC: return PORT_PTS_HSIC; default: - return CONFIG_MXC_USB_PORTSC; + return CFG_MXC_USB_PORTSC; } } diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index fd2a0e3d82d3..88505885ca85 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -26,7 +26,7 @@ /* USB Configs */ /* Host */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Client */ #define CONFIG_USBD_HS diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 19906db5966f..e0f1ec7e11a7 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -415,7 +415,7 @@ /* DMA stuff, needed for GPMI/MXS NAND support */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* UBI support */ diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 47a95c0b920a..50aedae8794f 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -84,6 +84,6 @@ BUR_COMMON_ENV \ #define CFG_FEC_FIXED_SPEED _1000BASET /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* __CONFIG_BRPP2_IMX6_H */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index e38d2844c803..0a667c60b61b 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -96,7 +96,7 @@ #endif /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif /* __CONFIG_H */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 479feae77240..7d0f2b6dc13a 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -135,7 +135,7 @@ #define CFG_FEC_MXC_PHYADDR 0 /* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Boot */ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 92dff580f601..7e718b48e423 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -127,7 +127,7 @@ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 419c919bbecd..b8418373abae 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -23,7 +23,7 @@ /* USB Configs */ /* Host */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Client */ #define CONFIG_USBD_HS diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 2b2b17f2c7b9..061c445bd9db 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -171,7 +171,7 @@ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 93ee004b009c..c5781670864b 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -47,7 +47,7 @@ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define ENV_MMC \ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 90f8ce0fd57f..db76b458a593 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -32,7 +32,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* USB Gadget (DFU, UMS) */ diff --git a/include/configs/display5.h b/include/configs/display5.h index 9a6fb72377c1..6900baa84545 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -293,5 +293,5 @@ /* The 0x120000 value corresponds to above SPI-NOR memory MAP */ #endif -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* __CONFIG_H */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index f73b1ec63de6..c7a55c5c9266 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* MMC Configs */ diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index f7e9dd16b26f..dd3c56c480be 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -24,7 +24,7 @@ #endif /* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index cc21e93a7beb..4741d399590c 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -36,7 +36,7 @@ /* Various command support */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 215ed75deaf3..85c054451f35 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -117,7 +117,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index ca89f72f8a21..6c61b3f44801 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -43,7 +43,7 @@ #define CFG_FEC_MXC_PHYADDR 1 /* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Falcon */ diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 4209d9d7ab28..2c998cdcfc72 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -110,7 +110,7 @@ #endif #endif -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif /* __IMX6Q_ACC_H */ diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 87262a97877e..4202c5928c2f 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -79,7 +79,7 @@ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USBD_HS diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 64cdc401d039..2641d7bc960b 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -139,6 +139,6 @@ #define CFG_FEC_MXC_PHYADDR 0 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /*__IMX8MM_CL_IOT_GATE_H*/ diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 3479b0b2bf4d..d0644cd1396b 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -26,7 +26,7 @@ #define CFG_HOSTNAME "kontron-mx6ul" #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 89f5c6f46faf..8a7709a00b60 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -26,7 +26,7 @@ #define CFG_HOSTNAME "kontron-mx8mm" #ifdef CONFIG_USB_EHCI_HCD -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index baf7779026fb..6e383cbe75f7 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -11,7 +11,7 @@ #include /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Command definition */ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 07497d063fb8..1aa4b8ab5987 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -18,7 +18,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 75ff2d9db93c..5811059c8e2b 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -95,7 +95,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index d7b303b6ac05..a54ece9ac828 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -71,8 +71,8 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index 9e480fe0558e..6ffc1282411a 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -24,6 +24,6 @@ /* Environment configs */ /* USB configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index e82e7547a3f6..dff54d04a678 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -33,8 +33,8 @@ #define CFG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR /* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC PORT_PTS_ULPI #define CFG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED /* Framebuffer and LCD */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 5710fe90708a..e995776d30d5 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -23,8 +23,8 @@ /* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Command definition */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index cd7fa7c8cd96..7398804e6b54 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -17,8 +17,8 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* PMIC Controller */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 57dffbf6e40c..df65dbeea41c 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -12,8 +12,8 @@ #include /* USB Configs */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Command definition */ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 871d52c343f5..f0d6405d3012 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -15,7 +15,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR /* USB */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) /* Command definition */ diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index b664962a26a5..f2edd13eb881 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -31,6 +31,6 @@ #define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE -#define CONFIG_MXC_USB_PORTSC PORT_PTS_UTMI +#define CFG_MXC_USB_PORTSC PORT_PTS_UTMI #endif /* __CONFIG_H */ diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 1d96ecfa46cb..da98139d7d77 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -12,7 +12,7 @@ #define CONSOLE_DEV "ttymxc3" /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CFG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} } diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index b2266025efcf..2b028e3aa2b1 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -29,7 +29,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 5d5fc8f792de..39c8ef060c7f 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -90,7 +90,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index aec3e51bff87..290996b51bc7 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -94,7 +94,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif #include diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index ff5ef7306611..1c14a6beb0ac 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -96,7 +96,7 @@ #define CFG_FEC_MXC_PHYADDR 0x0 #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 82dbf0f949c5..8b02c3b63101 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -118,7 +118,7 @@ #define CFG_FEC_MXC_PHYADDR 0x1 #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 2d26d9b045af..635ae78abcb5 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -116,7 +116,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index a9722967f396..5392f38074ed 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -99,7 +99,7 @@ #endif /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USBD_HS diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 5ee5129801d2..a310c64e7948 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -51,5 +51,5 @@ #define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CFG_SYS_INIT_RAM_SIZE SZ_256K -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* __CONFIG_H */ diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index a8a14600cc2d..2571098d06c6 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -30,7 +30,7 @@ #define CFG_SYS_NAND_BASE 0x40000000 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c634cb203b36..d35650a66e13 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -23,7 +23,7 @@ #define CFG_FEC_MXC_PHYADDR 6 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_MMC diff --git a/include/configs/novena.h b/include/configs/novena.h index 6088b2823412..5176c6d1c48c 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -57,7 +57,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Gadget part */ #define CONFIG_USBD_HS diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 490328d516f2..62e74de8aea3 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -31,7 +31,7 @@ #define CFG_SYS_NAND_BASE 0x40000000 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_NET diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h index 0e1083a2130c..9050da8738b1 100644 --- a/include/configs/o4-imx6ull-nano.h +++ b/include/configs/o4-imx6ull-nano.h @@ -12,7 +12,7 @@ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE #if IS_ENABLED(CONFIG_CMD_USB) -# define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +# define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* CONFIG_CMD_USB */ #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index 5587237743c9..cfa708ff5e55 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -20,7 +20,7 @@ /* USB */ #ifdef CONFIG_USB_EHCI_MX6 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index c95507b25fe9..38dcee053596 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -42,7 +42,7 @@ #define CFG_SYS_NAND_BASE 0x40000000 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 688afe674591..d742201ce43b 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -44,7 +44,7 @@ #define CFG_SYS_NAND_BASE 0x40000000 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define ENV_MMC \ diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 473f476aa470..d806d7d9c57d 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -16,7 +16,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index ba37e6765eed..531e462485d8 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -23,7 +23,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 5995ce66ec8b..fd8962e9f751 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -107,7 +107,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 1e3ae0398c1a..041a83b057d4 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -61,7 +61,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 61f252cb638c..1e22ecfdc556 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -27,7 +27,7 @@ /* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS #endif /* CONFIG_CMD_USB_MASS_STORAGE */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index cb5f7fc25af9..af5a474cf31e 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -39,7 +39,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #if defined(CONFIG_TQMA6X_MMC_BOOT) diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 8cea69416df2..011a4610474e 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -23,8 +23,8 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 /* USB */ -#define CONFIG_MXC_USB_PORT 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORT 1 +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 /* Linux boot */ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 27d7efb883de..8cb1f1aff353 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -67,6 +67,6 @@ #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* __VERDIN_IMX8MM_H */ diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 193706e46fa5..6db68c1e7001 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -36,7 +36,7 @@ /* Network */ #define CFG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_PCI diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 64dbf93d05d0..7b8c5cbe7a8f 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -17,7 +17,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 709bb046d018..ebc5f4aa6c91 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -93,7 +93,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USBD_HS diff --git a/include/configs/xpress.h b/include/configs/xpress.h index c17f0de7ede3..f8ee40a9543b 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -28,7 +28,7 @@ /* Environment is in stored in the eMMC boot partition */ /* USB Configs */ -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 #define CFG_FEC_ENET_DEV 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7c3c4bca17b7..8fdece74ef1e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -139,8 +139,8 @@ CFG_MXC_NAND_IP_REGS_BASE CFG_MXC_NAND_REGS_BASE CFG_MXC_UART_BASE CFG_MXC_USB_FLAGS -CONFIG_MXC_USB_PORT -CONFIG_MXC_USB_PORTSC +CFG_MXC_USB_PORT +CFG_MXC_USB_PORTSC CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CONFIG_NAND_CS_INIT CONFIG_NETDEV From patchwork Sun Nov 20 14:07:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706864 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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 ; 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 ; 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 ; 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 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:43 -0800 (PST) From: Tom Rini 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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- 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(-) 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 From patchwork Sun Nov 20 14:07:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706839 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=XHZp1/jf; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXX20WnQz23n6 for ; Mon, 21 Nov 2022 01:12:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1779B8532A; Sun, 20 Nov 2022 15:09:28 +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="XHZp1/jf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CFDBA852D4; Sun, 20 Nov 2022 15:08:49 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 99F2D85297 for ; Sun, 20 Nov 2022 15:08:44 +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-x833.google.com with SMTP id e15so5937386qts.1 for ; Sun, 20 Nov 2022 06:08:44 -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=IZTBUgi+qxTFa7cr7Tk1Caqle0ZAE/twx5aphfifoW0=; b=XHZp1/jfgFUWsSGpqhjT85C4OSCzgrkGbt2kEbNNQP86y+XDP+/FUCpEvnVJYk3z1f ublq/P5UExdXPZW3kP0wYcu8YyceuLUINYNMDHFfN3e6ysBYnEc+cKJzE3og+AT7/46v upJ65OqrySB1AdByP6pTpwTfPbJl6mBQew4i0= 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=IZTBUgi+qxTFa7cr7Tk1Caqle0ZAE/twx5aphfifoW0=; b=ODz+CW+H69TmpDbyO+eGeBobhDKMhCbQRGMKyohBMEzdsV8QoTmaBzYXE5bpgDWdxV Q55jqy9PCrAzSqBz2EbMaPPN8YLXtDgsD0uFSlew4B9VHnpQn1bJZTx+lri0ND9vI4Jw zLCIofXa4cdE4bhTi8laym3+QIKCd3CXukaPvIxZD8WmuvCwD7rVVwvmipYveXxct5T/ Fjsg8yQiO50yqe/wiv4XvsY6cYE3MTsBHpidGHgzpH1GW4i7f62ycG8SFYAoS2ARcA+w Vo7y+EaZGJtQhHKU3f/Wdd8oN8LtOjMyuenxkWBqcWmoP97l4szTLAUFSyqm4Aa3map7 0DVw== X-Gm-Message-State: ANoB5pmK6y4nbMSR1PsZi1u5DXU/WXWd1SSALaH0EYS0+9CoKzrJa85A waE3vKw6wwTbUmDLpkpz8nd5aa+zOCbBJA== X-Google-Smtp-Source: AA0mqf5fso1sUGhwzp0ydhXyJsLzZv62JlO8t9nNjBrkEXMZ0MzcqKvc3XiPIA6uwFP4LuMbCuV3rg== X-Received: by 2002:ac8:7542:0:b0:3a5:c5c1:43ff with SMTP id b2-20020ac87542000000b003a5c5c143ffmr361226qtr.312.1668953324118; Sun, 20 Nov 2022 06:08:44 -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 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:43 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 133/241] global: Migrate CONFIG_NAND_CS_INIT to CFG Date: Sun, 20 Nov 2022 09:07:23 -0500 Message-Id: <20221120140829.3057894-24-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/siemens/common/board.c | 2 +- board/siemens/draco/board.c | 2 +- include/configs/etamin.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index 2efede62aa5d..1b3c06d13e55 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -93,7 +93,7 @@ int board_init(void) gpmc_init(); -#ifdef CONFIG_NAND_CS_INIT +#ifdef CFG_NAND_CS_INIT board_nand_cs_init(); #endif diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index f898bba4b0ee..fb81f40abceb 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -370,7 +370,7 @@ U_BOOT_CMD( #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */ #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ -#ifdef CONFIG_NAND_CS_INIT +#ifdef CFG_NAND_CS_INIT /* GPMC definitions for second nand cs1 */ static const u32 gpmc_nand_config[] = { ETAMIN_NAND_GPMC_CONFIG1, diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 8b2745ea96e4..861070866923 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -129,7 +129,7 @@ #ifndef CONFIG_SPL_BUILD -#define CONFIG_NAND_CS_INIT +#define CFG_NAND_CS_INIT #define ETAMIN_NAND_GPMC_CONFIG1 0x00000800 #define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00 #define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a7409a7f4978..e7d5f9ba57ca 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -142,7 +142,7 @@ CFG_MXC_USB_FLAGS CFG_MXC_USB_PORT CFG_MXC_USB_PORTSC CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC -CONFIG_NAND_CS_INIT +CFG_NAND_CS_INIT CONFIG_NETDEV CONFIG_NETMASK CONFIG_NORBOOT From patchwork Sun Nov 20 14:07:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706868 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=iFOYDTuB; 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 4NFXfQ5k0Lz23mR for ; Mon, 21 Nov 2022 01:17:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3592F85439; Sun, 20 Nov 2022 15:10:14 +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="iFOYDTuB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D0BA852BA; Sun, 20 Nov 2022 15:09:28 +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-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 9DC748530F for ; 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-x830.google.com with SMTP id c15so5924880qtw.8 for ; 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=+OYOG6rp/94pMxJ3MARxkDCiENxf/jGvIenoaSHKacs=; b=iFOYDTuBGQfY2Oqyms4lim63wron0guKjKKfh1Ugm3HGHnTyyDEoA076kn89uxgbBg STSR0He2jE5P4/jkJbG1dT0fFDLzc4uRNiCV8tFOxqk1CxmhZAbrRvVjNd2S2iR7e/Oj LDnCFOvxbHxqvg2l8+n2pl1MHpPJI4JiGStts= 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=+OYOG6rp/94pMxJ3MARxkDCiENxf/jGvIenoaSHKacs=; b=b0TBEppq22lqT6EHuI7qPaO9BHHMd04GWjQtCHJcHAzUaJ/A5YswrkoI33MBIGRHZL ORP3DTsRge2FzHgDw4OST/Gd+QIKEkCRdys9Jo8gLSflv2P/ediSLyEZplepdqeyddI5 5bffy4CrbK/GAEDZKTELFdiTbQlplctP65O/OJZMi1kD2h+isvuYNOv9rzQGG8Ox2b7P GLzPHRgzNt90vV/GzxhOptyKXF6ScsstlBi8hvTqg5zhqTfritHXWIbHe7Q0sGnCLI0q NFblRZBMG56mo2kk1r3Ly2yHy/Jg3AxyfRoELlEz4D1UamkzAXNAkROTxl5Q0zkVs3/u k50w== X-Gm-Message-State: ANoB5pneviOg+4s9I7XH86PRUVaoGOQ2aU6HfnVM80ew8MoVVrXdbIZ9 NFB0u1jtS/5vyqs0CX/QIIubRK+q4F9Zhg== X-Google-Smtp-Source: AA0mqf5DOZSw92cSBT7QLQb9jYt4SoAvq/ly01PNF8vIeOnfQY36Q/6H7jZOv1cPW76MMEDDlahAmQ== X-Received: by 2002:a05:622a:5a0c:b0:3a5:1dde:dcee with SMTP id fy12-20020a05622a5a0c00b003a51ddedceemr13716819qtb.639.1668953324706; Sun, 20 Nov 2022 06:08:44 -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.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:44 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 134/241] global: Migrate CONFIG_NETDEV to CFG Date: Sun, 20 Nov 2022 09:07:24 -0500 Message-Id: <20221120140829.3057894-25-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/MPC837XERDB.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 4c3acd5b013b..1f6efd7e098f 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -223,7 +223,7 @@ * Environment Configuration */ -#define CONFIG_NETDEV "eth1" +#define CFG_NETDEV "eth1" #define CFG_HOSTNAME "mpc837x_rdb" #define CONFIG_ROOTPATH "/nfsroot" @@ -232,7 +232,7 @@ #define CFG_FDTFILE "mpc8379_rdb.dtb" #define CFG_EXTRA_ENV_SETTINGS \ - "netdev=" CONFIG_NETDEV "\0" \ + "netdev=" CFG_NETDEV "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ "protect off " __stringify(CONFIG_TEXT_BASE) \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e7d5f9ba57ca..c8e0a85c124c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -143,7 +143,7 @@ CFG_MXC_USB_PORT CFG_MXC_USB_PORTSC CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CFG_NAND_CS_INIT -CONFIG_NETDEV +CFG_NETDEV CONFIG_NETMASK CONFIG_NORBOOT CONFIG_NUM_DSP_CPUS From patchwork Sun Nov 20 14:07:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706840 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=YKrdSReK; 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 4NFXXD2xYvz23n6 for ; Mon, 21 Nov 2022 01:12:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 238A285346; Sun, 20 Nov 2022 15:09:29 +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="YKrdSReK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EBEA7852DB; Sun, 20 Nov 2022 15:08:50 +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-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 095C28528E for ; Sun, 20 Nov 2022 15:08:46 +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-x834.google.com with SMTP id w4so5971714qts.0 for ; Sun, 20 Nov 2022 06:08:45 -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=PxV3fB9/N4oGf/iXb0fZhtp+JDhEZlzle+NpPH/0I0o=; b=YKrdSReKrkW7hlqhZB4xIdPY0w6Ol3cq+ML7LQeCyMVzF+tiIgCzS9pgIXfbwwTjEk ViQn8uOwLe/XLHXvVUcJlHlwVmcMy/AGUxBBET/tzp5FE1yUtgQfF462RDIarjufLwMJ x8qjwQF7hWkU75Ix8ypUce5/CpYdUS5OU+mYE= 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=PxV3fB9/N4oGf/iXb0fZhtp+JDhEZlzle+NpPH/0I0o=; b=4yu9s1cUuKSRL3GdMeWrWzlYnxQ50+PPwMyD5uSY1q+Pwzux0DOyEy28B2icPAyXfJ Bnz/F5K7sgiSVTMHpwdBOK7/fk19cFPyJWvZ9mKGX71VjjqQSL2WF3d+h3Kh1IoDPti/ yHAjsgiPO6yompTR+sixa06fVDLjTslXisHaiBm4MaZQ3Z5wIJl4HGbF0lINOBcNne2u Yk0/6aq4rFA0Fexg3EkkYIVArSeEJ3KwlkHl8J/eRYXdtlFoCX3lcJl71wH4+sGZQ3Ni U/fpwuRpntBVTf+N0Sf8CN91Knsz3d4vzXsqlAuE1BivmOrIGF1GGIm4Xnsd/0y68jxk iCog== X-Gm-Message-State: ANoB5pk9nSASGRTtgmw0+p2hdk/FXOOITNQlVPD2k77IspSPRwcdrIOS BsTIS7N3qytvZlycShDQmnEaW15hzArV4Q== X-Google-Smtp-Source: AA0mqf6X++JFpFQ4j3AHA+Yg7QRqfStIoFrDWAs5rYdB8irCSVyVH8208VX9ifzsoozCdLbV9i5xPA== X-Received: by 2002:a05:622a:4816:b0:3a5:f994:78c6 with SMTP id fb22-20020a05622a481600b003a5f99478c6mr13894040qtb.2.1668953325378; Sun, 20 Nov 2022 06:08:45 -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.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 135/241] global: Migrate CONFIG_NETMASK to CFG Date: Sun, 20 Nov 2022 09:07:25 -0500 Message-Id: <20221120140829.3057894-26-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MCR3000.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/poleg.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README b/README index 8ab897f09641..f5b4669b97c7 100644 --- a/README +++ b/README @@ -758,7 +758,7 @@ The following options need to be configured: (Environment variable "gatewayip") - Subnet mask: - CONFIG_NETMASK + CFG_NETMASK Defines a default value for the subnet mask (or routing prefix) which is used to determine if an IP diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 647e23f380b8..1357d682c7f7 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -19,7 +19,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 7bc86eb8b5f6..535b5064f193 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -28,7 +28,7 @@ /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 99f1df087e36..043e188189e1 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -31,7 +31,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 4b20da4a23eb..88e3d72ef67f 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -31,7 +31,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 5afd8383c1bd..014405779fee 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -32,7 +32,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 9d5f0e1c0964..364eaa448dce 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -24,7 +24,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 807d591c9f12..cc67a268a8fe 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -26,7 +26,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index d61ed82ab3bf..1248b367ae62 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -54,7 +54,7 @@ #define CFG_IPADDR 192.168.0.3 #define CONFIG_SERVERIP 192.168.0.1 -#define CONFIG_NETMASK 255.0.0.0 +#define CFG_NETMASK 255.0.0.0 /* Miscellaneous configurable options */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 28315eef765d..f1287844486b 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -333,7 +333,7 @@ #define CONFIG_SERVERIP 192.168.1.1 #define CFG_GATEWAYIP 192.168.1.1 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 0258a70d923b..8f7841163936 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -15,7 +15,7 @@ /* Networking */ #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 4db3465cd9b7..387fb3f69c83 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -35,7 +35,7 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 88505885ca85..4f2addd42d8b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -37,7 +37,7 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7e718b48e423..3cf56e98faf8 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -21,7 +21,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 0e8e24dd7bd2..0c879cc06bc7 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -15,7 +15,7 @@ #define USDHC2_BASE_ADDR 0x5b020000 #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index b8418373abae..c0d5e6f0aa06 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -32,7 +32,7 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 061c445bd9db..fdaeb6588146 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -22,7 +22,7 @@ #endif #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 808d69d0c865..3da98a5165e4 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -17,7 +17,7 @@ /* NAND support */ #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #define CFG_FDTADDR 0x84000000 diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 0d38645c0e60..1f923c2d4834 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -17,7 +17,7 @@ /* Default Env vars */ #define CFG_IPADDR 0.0.0.0 /* In order to cause an error */ #define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */ -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CFG_GATEWAYIP 0.0.0.0 #define CONFIG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */ diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 62e74de8aea3..be295e73caa7 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -18,7 +18,7 @@ /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 3e4309512cc1..e824af8273a1 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -16,7 +16,7 @@ /* Default environemnt variables */ #define CONFIG_SERVERIP 192.168.0.1 #define CFG_IPADDR 192.168.0.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ "stdout=serial\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 3ec3caade49c..02a091ee0369 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -49,7 +49,7 @@ #define CONFIG_SERVERIP 192.168.11.1 #define CFG_IPADDR 192.168.11.10 #define CFG_GATEWAYIP 192.168.11.1 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #if defined(CONFIG_ARM64) /* ARM Trusted Firmware */ diff --git a/include/env_default.h b/include/env_default.h index 5ee28a54960d..0a8ccaf52c3a 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -71,8 +71,8 @@ const char default_environment[] = { #ifdef CFG_GATEWAYIP "gatewayip=" __stringify(CFG_GATEWAYIP) "\0" #endif -#ifdef CONFIG_NETMASK - "netmask=" __stringify(CONFIG_NETMASK) "\0" +#ifdef CFG_NETMASK + "netmask=" __stringify(CFG_NETMASK) "\0" #endif #ifdef CFG_HOSTNAME "hostname=" CFG_HOSTNAME "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c8e0a85c124c..41312519749c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -144,7 +144,7 @@ CFG_MXC_USB_PORTSC CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CFG_NAND_CS_INIT CFG_NETDEV -CONFIG_NETMASK +CFG_NETMASK CONFIG_NORBOOT CONFIG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN From patchwork Sun Nov 20 14:07:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706841 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=n0BByx69; 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 4NFXXV0sMSz23n6 for ; Mon, 21 Nov 2022 01:12:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F2E785305; Sun, 20 Nov 2022 15:09:33 +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="n0BByx69"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 617CD852C5; Sun, 20 Nov 2022 15:08:51 +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-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 B308E852D3 for ; Sun, 20 Nov 2022 15:08:46 +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-qk1-x733.google.com with SMTP id d7so6528646qkk.3 for ; Sun, 20 Nov 2022 06:08:46 -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=fhUsKv7PKA18Iarg9wQeti2r/F2djAUYko3cpq1R3Lo=; b=n0BByx69TK3SRmgKxC54NPPz7BAxW6Ay3iNbGZoDkPn3exd/IsUYBNj9/4l+GTOV5S XhUxOEkcCpr1N0JzD3vO+FIwV6uDbopJTZ/eOsjtY2mzlNtHBdodzEiQSxnoAsaIy9On 5MI0IW+prEmJUNkAcZHzWcqNtQFbYk/8YByMk= 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=fhUsKv7PKA18Iarg9wQeti2r/F2djAUYko3cpq1R3Lo=; b=EgCza31bZVbeoS0Cyc7ghqmvGthwY20aH23yTG+ksQphlwMsZvZrpkLJZpA6dNY0+X hz9lPL+BRBlQI7Z0+v70rn6ylWJaiATNtNeiu2WJIv5dq5VkztkejddHTjCceF2+bacZ qUreXnvT+FE30gYEym4mYJC+qAQxtei4APjN/Jpm4VTsnF4GjaeE4ENa/5GRprBW3f79 /qH2ux9FIdkLMCIee125HL6BWGUzeRk17TLlWBod4tFTo5DPWLTVOnMTlr28dZklMHFp ssPJemyR5tUHNilAQBmX0Xdny3twTYfZu2SOojfGHyFyeb5KkLYEGUhSnj4rd4mXWroP NYbg== X-Gm-Message-State: ANoB5pnFI5osTG3hb/KGDdQf3JJMlJzVbaXUhiPPzxfxrrRstup9FRA/ 7BqmOADBxvfkSKRPGcNE/aj07NrbXXZq/g== X-Google-Smtp-Source: AA0mqf4wrl+qwR5ywz6F3tGVfctUX59aNQ4mdx74TU5p+YtOpfGCMlXLv9MWxSkfATgRKM4mMG5UCg== X-Received: by 2002:a05:620a:13d7:b0:6fb:57cb:47ce with SMTP id g23-20020a05620a13d700b006fb57cb47cemr13051498qkl.452.1668953326125; Sun, 20 Nov 2022 06:08:46 -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.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 136/241] global: Migrate CONFIG_NORBOOT to CFG Date: Sun, 20 Nov 2022 09:07:26 -0500 Message-Id: <20221120140829.3057894-27-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/p1_p2_rdb_pc.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index c8ecd2dc0fca..1e66d609d68d 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -482,7 +482,7 @@ RST_DEF_CMD(defboot) \ "ext2load usb 0:4 $ramdiskaddr $ramdiskfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr" -#define CONFIG_NORBOOT \ +#define CFG_NORBOOT \ "setenv bootargs root=/dev/$jffs2nor rw " \ "console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;" \ "bootm $norbootaddr - $norfdtaddr" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 41312519749c..31d50b5ab580 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -145,7 +145,7 @@ CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CFG_NAND_CS_INIT CFG_NETDEV CFG_NETMASK -CONFIG_NORBOOT +CFG_NORBOOT CONFIG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN CONFIG_OTHBOOTARGS From patchwork Sun Nov 20 14:07:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706865 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=uTw3vyr1; 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 4NFXdw6Wyqz23mR for ; Mon, 21 Nov 2022 01:17:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB2ED85430; Sun, 20 Nov 2022 15:10:09 +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="uTw3vyr1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 761BA852BA; 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-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 598B885309 for ; 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-qk1-x736.google.com with SMTP id x18so6534712qki.4 for ; 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=8TXFk/WJzNgND0qG4ZcoWSuE74IU75DyLTPsuX7+gnY=; b=uTw3vyr1zeABxE2Do+o9IUfTFajU446VJHI/FjJzENeIXp7b4cQm9fxXrbKazitQ4o XFQsalG8zIeRgmXi6W2sHRCWkhchg+z7uaUtyxiRXkmi/CJUa9W/gigqg3C2sc2egkqP 73qCCxkZDVnitdT44laD1QoCJLzRjT9NBOUvw= 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=8TXFk/WJzNgND0qG4ZcoWSuE74IU75DyLTPsuX7+gnY=; b=1PdheO2drnvYIiBKMRv4XBzgRibQfRIUCmwU79p6/IpmY0+QR8a9h04c8DUCt5VCCd TdggnxUIfTFktKFolEmIiwZtMcAGZgGIMXq5NwTOFgjPIJl39puzQP1WCuOo2+81psYh t0wjxZKDtb/mDlno5PmQbLrLES6J7NBjNQgZgiFFj39wbIMKHmP5laW3FNEbaRUnFz9O NiYzptZHj5lJq8DV9z2+wXf2mO2d3fjZ2HwyDNGp81uzZzaTxy7ucYc15mjGFN079cJS yl+jEQc5LL2sQKdGSnP2iIDV5l2REryaNLT8/DmBZFRL8QsAvKXX5v/cCCXVEl28IaY+ q8dw== X-Gm-Message-State: ANoB5pnRD1aRwdwWWGxK0WToWA62eAlEbB3L7ZKvLF9xmkgQXJeno2kJ XtxrzMs6Ho0M70DK0r/wlGEzzhp6X71K9g== X-Google-Smtp-Source: AA0mqf57fAgDJhFXkZHce0tXGnXuiiW5AajxshpAdKOId+hCWVnMaNU6H5lu4GPG5Xfx7lk7hcEiIQ== X-Received: by 2002:a37:5846:0:b0:6fa:566f:eb1e with SMTP id m67-20020a375846000000b006fa566feb1emr13000480qkb.616.1668953326756; Sun, 20 Nov 2022 06:08:46 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:46 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 137/241] global: Migrate CONFIG_NUM_DSP_CPUS to CFG Date: Sun, 20 Nov 2022 09:07:27 -0500 Message-Id: <20221120140829.3057894-28-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 9738c573452b..24259f6470ae 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -153,7 +153,7 @@ #ifdef CONFIG_ARCH_B4860 #define CFG_MAX_DSP_CPUS 12 -#define CONFIG_NUM_DSP_CPUS 6 +#define CFG_NUM_DSP_CPUS 6 #define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 } #define CFG_SYS_NUM_FM1_DTSEC 6 #define CFG_SYS_NUM_FM1_10GEC 2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 31d50b5ab580..9021044470ae 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -146,7 +146,7 @@ CFG_NAND_CS_INIT CFG_NETDEV CFG_NETMASK CFG_NORBOOT -CONFIG_NUM_DSP_CPUS +CFG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE From patchwork Sun Nov 20 14:07:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706842 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=AEU/HFCd; 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 4NFXXt2y7rz23n6 for ; Mon, 21 Nov 2022 01:12:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10243852F1; Sun, 20 Nov 2022 15:09:36 +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="AEU/HFCd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC6A9852C5; Sun, 20 Nov 2022 15:08:51 +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-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 06316852BE for ; Sun, 20 Nov 2022 15:08:48 +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-qk1-x72f.google.com with SMTP id i9so6515763qki.10 for ; Sun, 20 Nov 2022 06:08:47 -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=MhPY7A9KnPWlYS0idx2NAbjQsb2fTTKmnrmDLOqqcXQ=; b=AEU/HFCd/5a5MqzmG3SyjQ1ou6OL2f/p2gpVEg+8CSHv515nOxpLGoE5eidl8fn19T w/gPdFeki6/YEBFFdbS2Ap48GKyElIyW6uPbZ3zfKle3SY5iGnVm4UUWCsLGDPhq7N3O c4uS9XPWZBMjRpGLdy5SNoFSAdPhwQXdl7WG0= 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=MhPY7A9KnPWlYS0idx2NAbjQsb2fTTKmnrmDLOqqcXQ=; b=Qs0rVl8sLyP0Aeq80TGtHwuoovwbXCnVVXUfRLcvQWyUPNHqwMfUemss9sbItwBNak xF9rDen/HfhcLMe7sJ/YG6pCa5+btJq9FSxlcCaHNZmljclBUVpyEDnAvXml2MjgM9GE cgkFQ+JMLKkyHGrQgfI8ITSQzi1gDPMAL5+D0Y50uTfuaIEJwvpsOsEM9gBNDCZSe0tu 5ebPB9VmLa9Cq3YSUlC29lnU+UHr3IzwbGqBoJX+mOyHlvcNzvuiydzbU8+XfxRtRp/d mqNC6vnfrrfeXOxIFUNp8rDQDCNxLyZE8m2f7B8QztCUwwtl1VRAXjqzHbA0cUa4GVZ5 DnfQ== X-Gm-Message-State: ANoB5pmaZYepZY+32oNxYSmm/79uQs5imqF6Kes+BTesjLsFhIAk9m26 3QI0fJwp7HKlJ3pAQ2+xj3tUiNUiuur47w== X-Google-Smtp-Source: AA0mqf6anGaEtEB35uw2Y8rC03s5xfR2liEwQd/cPamgjAJGvozJLawQXiKZqCMtTJ8kO5TxWKEiTg== X-Received: by 2002:a05:620a:797:b0:6f8:3f8f:e63d with SMTP id 23-20020a05620a079700b006f83f8fe63dmr13003590qka.32.1668953327467; Sun, 20 Nov 2022 06:08:47 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:47 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 138/241] global: Migrate CONFIG_ODROID_REV_AIN to CFG Date: Sun, 20 Nov 2022 09:07:28 -0500 Message-Id: <20221120140829.3057894-29-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/samsung/common/exynos5-dt-types.c | 4 ++-- include/configs/odroid_xu3.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index 554fc91cc1a3..9294d36ba358 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -57,7 +57,7 @@ static int odroid_get_adc_val(unsigned int *adcval) unsigned int adcval_prev = 0; int ret, retries = 20; - ret = adc_channel_single_shot("adc@12D10000", CONFIG_ODROID_REV_AIN, + ret = adc_channel_single_shot("adc@12D10000", CFG_ODROID_REV_AIN, &adcval_prev); if (ret) return ret; @@ -66,7 +66,7 @@ static int odroid_get_adc_val(unsigned int *adcval) mdelay(5); ret = adc_channel_single_shot("adc@12D10000", - CONFIG_ODROID_REV_AIN, adcval); + CFG_ODROID_REV_AIN, adcval); if (ret) return ret; diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 50213a383528..93f88ef53eba 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -60,7 +60,7 @@ #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ -#define CONFIG_ODROID_REV_AIN 9 +#define CFG_ODROID_REV_AIN 9 /* * Need to override existing one (smdk5420) with odroid so set_board_info will diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9021044470ae..d8e9be8a82ef 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -147,7 +147,7 @@ CFG_NETDEV CFG_NETMASK CFG_NORBOOT CFG_NUM_DSP_CPUS -CONFIG_ODROID_REV_AIN +CFG_ODROID_REV_AIN CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_PCIE_IMX_PERST_GPIO From patchwork Sun Nov 20 14:07:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706845 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=nP7cFo6e; 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 4NFXYk4cmDz23n6 for ; Mon, 21 Nov 2022 01:13:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FABC8534A; Sun, 20 Nov 2022 15:09:41 +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="nP7cFo6e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 69F37852DD; Sun, 20 Nov 2022 15:08:52 +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-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 9C9F5852A8 for ; Sun, 20 Nov 2022 15:08:48 +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-qv1-xf30.google.com with SMTP id c8so6482692qvn.10 for ; Sun, 20 Nov 2022 06:08:48 -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=tQc38T6hN+AGW+Zf/lXbVkgp3jk2mJkd33xSwxJORx0=; b=nP7cFo6euIrhbnNhO38ZphMD1p6ggsp1VB2v1d3mKVNRChiq1zsczhQTOihC3o3KTN cGQ7pOU63WMAgreTO8wny0Odh4X5h3/v4Bm8xg6UImAF5QjhiQbYMcajEQARZ8Az1sfP ++6xCDPS7hOGu9EXi10/MUtY92M9vqyWgWRZg= 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=tQc38T6hN+AGW+Zf/lXbVkgp3jk2mJkd33xSwxJORx0=; b=PEWq3+QHFqS8Pu64K6/17SKvRpgWhy2I5EQoVPxJ4gmZsjlG7WD5ps9xk/gCv4e9uj 2YPximRYPesAvSLdqHWaAUtxC5ctujm+DwUCp6kuCRB2KVdmZnp2euou6e8Ql/JTifF2 A5PU/4dwTk47bYXK/LyiSgEZXh5mrSkrXEIcbWniJqP8EiLKuwX6/s1RBI+mrwn4D19u mIFwqqtmMVu1zJ9EM2Wns+kKhQBWz5z/nrnoYczC64Qsun+qJyBWJqyYT9/mYSZGAQF0 WRJsWb2Xp9VE+3l2crYXFQObIPeb1ZYCqGWaiXnXFFrZmNcZMx5Q+//82iEZIB32AusX IIPA== X-Gm-Message-State: ANoB5pnlHGdVNR9xJzLRjpE86YjtNhcP4ZIFnXzMo4jWyR5PCgPBdv27 5oeH0hRkAqM/v7sFySBAokKKbfJUB6YyXQ== X-Google-Smtp-Source: AA0mqf53WvtLNTpGCNOYJPzUCPV2gbBIpUcg1EbCQsg5UEQ5Pg9+z+jS15hm7sKmcnJk4ZAUezgcFg== X-Received: by 2002:a0c:aa5a:0:b0:4bb:7583:957f with SMTP id e26-20020a0caa5a000000b004bb7583957fmr3565674qvb.10.1668953328112; Sun, 20 Nov 2022 06:08:48 -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.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:47 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 139/241] global: Migrate CONFIG_OTHBOOTARGS to CFG Date: Sun, 20 Nov 2022 09:07:29 -0500 Message-Id: <20221120140829.3057894-30-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/x86-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index fdd7dba9a6f2..df75deedf583 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -45,9 +45,9 @@ #define CFG_HOSTNAME "x86" #define CONFIG_RAMDISK_ADDR 0x4000000 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) -#define CONFIG_OTHBOOTARGS "othbootargs=\0" +#define CFG_OTHBOOTARGS "othbootargs=\0" #else -#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" +#define CFG_OTHBOOTARGS "othbootargs=acpi=off\0" #endif #if defined(CONFIG_DISTRO_DEFAULTS) @@ -67,7 +67,7 @@ "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ - CONFIG_OTHBOOTARGS \ + CFG_OTHBOOTARGS \ "scriptaddr=0x7000000\0" \ "kernel_addr_r=0x1000000\0" \ "ramdisk_addr_r=0x4000000\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d8e9be8a82ef..a5c5644e65dd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -148,7 +148,7 @@ CFG_NETMASK CFG_NORBOOT CFG_NUM_DSP_CPUS CFG_ODROID_REV_AIN -CONFIG_OTHBOOTARGS +CFG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO From patchwork Sun Nov 20 14:07:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706861 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=Aq9PT1Yg; 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 4NFXd42Chnz23mR for ; Mon, 21 Nov 2022 01:16:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A9FEC85422; Sun, 20 Nov 2022 15:09:59 +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="Aq9PT1Yg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A1D88532E; Sun, 20 Nov 2022 15:09:25 +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-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (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 0BBC085304 for ; 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-qk1-x729.google.com with SMTP id p18so6536703qkg.2 for ; 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=3MywX0VuD45WO7xSR5c+HZaQf4z1rY528LxrZOapDQo=; b=Aq9PT1Ygmyx125q3hrm2uCYBOgmMogzAr/+lv5Q8n5z6eaKQSCDBUuSvEgKK10pkG5 BjvTd1dXKmed/gDegV160CTeaH2DYXMsW+ymbNSQNdH50f0JH/Lzmba8GIXDm/KKcXIQ BaAzT96HuL9NZROO2YE9uasjGQ58V8Mo41pTc= 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=3MywX0VuD45WO7xSR5c+HZaQf4z1rY528LxrZOapDQo=; b=E5puIEtHyNLUFCtx4eV1YmohX1JmoXZE6zWCfvfBObGunuAU0jXwD6xocNLDDfYC7k e7NLI0bA+nQJKMNNTl1dXzpv9jymxnNrbTiJvO0SvZLBNSVnQFuGOHvw/42rJcX6mIA8 T/5uEcxbEyr17G0JytGb4PozN7ewtAKDCNOUK30XBRFBDoLTAS0g5nHxqXvicJceS1Ou Dju/AF9VshnHHOEz51UK7L0a2aqodNld5+TigNXEwa1BlLABCmpToISGYv7qDuJhr7s3 Dj4LEXrd8+NISMAT/OoWMpI+6fkJxRKGFpVn8CMt5rBxwpGr6Xpk7D8rr8Cdy2SqI8n0 GFwA== X-Gm-Message-State: ANoB5pkozszp8TGhZB1xr0NvbBFeTeVhIJxAPa95gkKZhO6BQQz/azXw zBamQILj9sMoeqKBVzEb7P5DpMKydAVosw== X-Google-Smtp-Source: AA0mqf6gEKRDGEP+ETA3E397Y0qCk9BA6vaDZ7sKBY5vTXFUv0QZMLvMqlzz9KpyxxtUsAEQVSaXlQ== X-Received: by 2002:a37:6ca:0:b0:6fa:d53f:d404 with SMTP id 193-20020a3706ca000000b006fad53fd404mr12890299qkg.353.1668953328653; Sun, 20 Nov 2022 06:08:48 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:48 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 140/241] global: Migrate CONFIG_OVERWRITE_ETHADDR_ONCE to CFG Date: Sun, 20 Nov 2022 09:07:30 -0500 Message-Id: <20221120140829.3057894-31-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/M5275EVB.h | 2 +- include/configs/eb_cpu5282.h | 2 +- include/env_flags.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index f5b4669b97c7..d3659e7b54a2 100644 --- a/README +++ b/README @@ -1123,7 +1123,7 @@ The following options need to be configured: these parameters. Alternatively, if you define _both_ an ethaddr in the - default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default + default env _and_ CFG_OVERWRITE_ETHADDR_ONCE, a default Ethernet address is installed in the environment, which can be changed exactly ONCE by the user. [The serial# is unaffected by this, i. e. it remains diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index bf31d203e664..3bb22b8d50cd 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -26,7 +26,7 @@ # undef CONFIG_DM9000_DEBUG # define CFG_DM9000_BYTE_SWAPPED -# define CONFIG_OVERWRITE_ETHADDR_ONCE +# define CFG_OVERWRITE_ETHADDR_ONCE # define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 951209fbd750..9f73237749aa 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -39,7 +39,7 @@ #define CFG_SYS_I2C_PINMUX_SET (0x000F) #ifdef CONFIG_MCFFEC -# define CONFIG_OVERWRITE_ETHADDR_ONCE +# define CFG_OVERWRITE_ETHADDR_ONCE #endif /* FEC_ENET */ #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index e8d85bdd78f2..49bf6fa4a280 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -45,7 +45,7 @@ *----------------------------------------------------------------------*/ #ifdef CONFIG_MCFFEC -#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CFG_OVERWRITE_ETHADDR_ONCE #endif /*------------------------------------------------------------------------- diff --git a/include/env_flags.h b/include/env_flags.h index e4e40169aed0..de1cdd013cda 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -48,7 +48,7 @@ enum env_flags_varaccess { #ifdef CONFIG_ENV_OVERWRITE #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma," #else -#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE +#ifdef CFG_OVERWRITE_ETHADDR_ONCE #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc," #else #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo," diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a5c5644e65dd..cb85e39ad2cd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -149,7 +149,7 @@ CFG_NORBOOT CFG_NUM_DSP_CPUS CFG_ODROID_REV_AIN CFG_OTHBOOTARGS -CONFIG_OVERWRITE_ETHADDR_ONCE +CFG_OVERWRITE_ETHADDR_ONCE CONFIG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO CONFIG_PEN_ADDR_BIG_ENDIAN From patchwork Sun Nov 20 14:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706866 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=qudzZO4U; 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 4NFXf93ZHFz23mR for ; Mon, 21 Nov 2022 01:17:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0137885435; Sun, 20 Nov 2022 15:10:12 +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="qudzZO4U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B60A852BA; Sun, 20 Nov 2022 15:09:28 +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-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 477A78530D for ; 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-qv1-xf33.google.com with SMTP id d13so787714qvj.8 for ; 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=AWKlFmQ4IPbvyyNd6L0eMJX0Ak+MgYlVzQ6JvQ+VC6o=; b=qudzZO4UpRdmSXrdcx010QSk9wygv4cpHRuMYoP4YsjtX+BOH/cXc3S/P92Op/9/80 aHIOR8THIrgNVwwy0CCqJ1xdHB6BOf5hppBImboie8sj4veeuV/2GCW7UXuY2WsTNPbi W+puE/oj92ju6V17pgRl8x55z2sLpS6uUJwbM= 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=AWKlFmQ4IPbvyyNd6L0eMJX0Ak+MgYlVzQ6JvQ+VC6o=; b=0P/mn48tVVXkXaqfM18jqHQg/yYzoOzd3Hw23Q+JzwTSIDCyrDXT4vxSDAGcUmWEJH cXGWCHa7jrC9fZtFNNVEQ1dm5PHEACKUxNul1BhkMgCNYWzQiNBFHtPA/1NxHtqu99vi npy5tdJhpcF+5bfGD2Yq/E8eoA11pN9Flb/khPaLJQ/he+CcgDN0/Rc/n1Ckzklh0GQD YVXX5d4NXjz8iGAH1Gw36uQXWMJe1UiHoeyUQw0noZk2jJ7Z3zae+YAC/ctAEUIcXt/3 +RIXw0UMbjRVSvTBI+thfBe0d8GCNHhFtK0FQa6NyXGGvrlQFVzbSy0CYf2PBZ2Ri5h/ 1Fmg== X-Gm-Message-State: ANoB5pmIUdvRsc9Gw0ZpbGd8zIxDM7FpZW2GBtCtHH9ybJ3C0bSoNEBV shfD4ZRM8dsxFw7Gx0wrgWO2mRf/ZuwIew== X-Google-Smtp-Source: AA0mqf45KFIEBd/PrxMqeelHT3bNbkRAS7VXeDJ8yj2erYRijtWeIGwLLEQjaaJjX2xSe6C2EQVFsg== X-Received: by 2002:ad4:4f51:0:b0:4b9:1466:ceb6 with SMTP id eu17-20020ad44f51000000b004b91466ceb6mr742227qvb.71.1668953329369; Sun, 20 Nov 2022 06:08:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:48 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 141/241] global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG Date: Sun, 20 Nov 2022 09:07:31 -0500 Message-Id: <20221120140829.3057894-32-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/pci/pcie_imx.c | 12 ++++++------ include/configs/mx6sabresd.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/novena.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/vining_2000.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 46ac01713ff7..902507aaae38 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high) * do self-initialisation. * * In case your #PERST pin is connected to a plain GPIO pin of the - * CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's + * CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's * configuration file and the condition below will handle the rest * of the reset toggling. * @@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high) * Linux at all in the first place since it's in some non-reset * state due to being previously used in U-Boot. */ -#ifdef CONFIG_PCIE_IMX_PERST_GPIO - gpio_request(CONFIG_PCIE_IMX_PERST_GPIO, "pcie_reset"); - gpio_direction_output(CONFIG_PCIE_IMX_PERST_GPIO, 0); +#ifdef CFG_PCIE_IMX_PERST_GPIO + gpio_request(CFG_PCIE_IMX_PERST_GPIO, "pcie_reset"); + gpio_direction_output(CFG_PCIE_IMX_PERST_GPIO, 0); mdelay(20); - gpio_set_value(CONFIG_PCIE_IMX_PERST_GPIO, 1); + gpio_set_value(CFG_PCIE_IMX_PERST_GPIO, 1); mdelay(20); - gpio_free(CONFIG_PCIE_IMX_PERST_GPIO); + gpio_free(CFG_PCIE_IMX_PERST_GPIO); #else if (dm_gpio_is_valid(gpio)) { /* Assert PERST# for 20ms then de-assert */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 2b028e3aa2b1..116a9c6abcf3 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_USDHC_NUM 3 #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19) #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8b02c3b63101..85e5cfbb58db 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -123,7 +123,7 @@ #endif #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) #endif diff --git a/include/configs/novena.h b/include/configs/novena.h index 5176c6d1c48c..1c695159dd8b 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -45,7 +45,7 @@ /* PCI express */ #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12) #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 1e22ecfdc556..7debc90205a8 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -22,7 +22,7 @@ /* PCI */ #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) #endif /* USB */ diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 6db68c1e7001..7bfc22c043fe 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -40,7 +40,7 @@ #define CFG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_PCI -#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) +#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) #endif #define CFG_IMX6_PWM_PER_CLK 66000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb85e39ad2cd..392756572f81 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -150,7 +150,7 @@ CFG_NUM_DSP_CPUS CFG_ODROID_REV_AIN CFG_OTHBOOTARGS CFG_OVERWRITE_ETHADDR_ONCE -CONFIG_PCIE_IMX_PERST_GPIO +CFG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO CONFIG_PEN_ADDR_BIG_ENDIAN CONFIG_PHY_BASE_ADR From patchwork Sun Nov 20 14:07:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706848 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=FIdY+l9w; 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 4NFXZK3zq6z23n6 for ; Mon, 21 Nov 2022 01:14:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C261885366; Sun, 20 Nov 2022 15:09:44 +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="FIdY+l9w"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9BD9C85298; Sun, 20 Nov 2022 15:08:54 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 730D6852D4 for ; Sun, 20 Nov 2022 15:08:50 +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-qk1-x734.google.com with SMTP id s20so6541336qkg.5 for ; Sun, 20 Nov 2022 06:08:50 -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=PxOklhdrcZxI+OftHofprkYTODE9CWRdFcwTa+nldsc=; b=FIdY+l9wgL/D99xKlaw3kTDqSkUy40UJLad6QQpk0t+5dqWk6OS5Zh0MPAHv+6+2i8 REsMENkF9o9GFArNSjPA5Njt1w/7XQjb5N2E3wXIkpGVW0NZGXjXIqqpBK9UUz3UcM1L 3UTjy+Y7IM9ejvxr31yQ9bc3goiw8qFVLP6gc= 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=PxOklhdrcZxI+OftHofprkYTODE9CWRdFcwTa+nldsc=; b=q3P1ayeCfnSYt2znSW+fyDGQteltBGt2mZyfq/hEMjZW1DkPRX9gKVWKJw3+Ipjw/O ksJWYbKL3cZA+3XbhGqL/sYSb0sP2vvVEOzZu/uIl1F4GOdJQQciVUllG2CELo0MRzuv Xamyhm3aJSHyYviMnjroyIHotekJBLaN9XSkxXttGXrVeVNPbdGiZYDRFiGAjaQZ6H27 qQRZgy+2/vU2jB9+GYsjY7TihCeYV2D0PZm/1T1bQ1m0OEmhMXzAIS4m3IaoSXdlyFlg 8HeIzBnl26zuQitEHQNjcOT2OAQ5kZ08Mv29zXkWffOvw71Ila7Obe59So1F0aNN+iDT pIcg== X-Gm-Message-State: ANoB5pnbAJrfp0PAh0+iSpTLj8ne/gUW4IPhOBO2n+aNlD3CE2FovqFh +xZNSNU3A0dUcpFVg4Mkq8gZe24G387DiQ== X-Google-Smtp-Source: AA0mqf6IQgBRhPi6Mzuc5TrLUqEukE8nlXnWYyqwapcKKJdlS4XChH6p3xfFyw481e0kD62skLcTLA== X-Received: by 2002:a05:620a:31d:b0:6fa:39f6:8c13 with SMTP id s29-20020a05620a031d00b006fa39f68c13mr12989839qkm.113.1668953329914; Sun, 20 Nov 2022 06:08:49 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:49 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 142/241] global: Migrate CONFIG_PCIE_IMX_POWER_GPIO to CFG Date: Sun, 20 Nov 2022 09:07:32 -0500 Message-Id: <20221120140829.3057894-33-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/pci/pcie_imx.c | 10 +++++----- include/configs/mx6sabresd.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/novena.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 902507aaae38..da48466480cb 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -534,13 +534,13 @@ static int imx6_pcie_init_phy(void) int imx6_pcie_toggle_power(struct udevice *vpcie) { -#ifdef CONFIG_PCIE_IMX_POWER_GPIO - gpio_request(CONFIG_PCIE_IMX_POWER_GPIO, "pcie_power"); - gpio_direction_output(CONFIG_PCIE_IMX_POWER_GPIO, 0); +#ifdef CFG_PCIE_IMX_POWER_GPIO + gpio_request(CFG_PCIE_IMX_POWER_GPIO, "pcie_power"); + gpio_direction_output(CFG_PCIE_IMX_POWER_GPIO, 0); mdelay(20); - gpio_set_value(CONFIG_PCIE_IMX_POWER_GPIO, 1); + gpio_set_value(CFG_PCIE_IMX_POWER_GPIO, 1); mdelay(20); - gpio_free(CONFIG_PCIE_IMX_POWER_GPIO); + gpio_free(CFG_PCIE_IMX_POWER_GPIO); #endif #if CONFIG_IS_ENABLED(DM_REGULATOR) diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 116a9c6abcf3..1aa8a56cceb6 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -21,7 +21,7 @@ #ifdef CONFIG_CMD_PCI #define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12) -#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19) +#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19) #endif /* PMIC */ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 85e5cfbb58db..fe0ad34ef9c1 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -124,7 +124,7 @@ #ifdef CONFIG_CMD_PCI #define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) -#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) +#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) #endif #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR diff --git a/include/configs/novena.h b/include/configs/novena.h index 1c695159dd8b..aecc75c050d8 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -46,7 +46,7 @@ /* PCI express */ #ifdef CONFIG_CMD_PCI #define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29) -#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12) +#define CFG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12) #endif /* PMIC */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 392756572f81..adf41306e819 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -151,7 +151,7 @@ CFG_ODROID_REV_AIN CFG_OTHBOOTARGS CFG_OVERWRITE_ETHADDR_ONCE CFG_PCIE_IMX_PERST_GPIO -CONFIG_PCIE_IMX_POWER_GPIO +CFG_PCIE_IMX_POWER_GPIO CONFIG_PEN_ADDR_BIG_ENDIAN CONFIG_PHY_BASE_ADR CONFIG_PHY_ET1011C_TX_CLK_FIX From patchwork Sun Nov 20 14:07:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706869 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=EVRYOLdc; 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 4NFXfg4Mg2z23mR for ; Mon, 21 Nov 2022 01:17:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64B6E8543D; Sun, 20 Nov 2022 15:10:15 +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="EVRYOLdc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E2E07852EA; Sun, 20 Nov 2022 15:09:28 +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-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 AA66D852F1 for ; 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-qv1-xf2c.google.com with SMTP id j6so6478243qvn.12 for ; 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=Ht0Z/BPjeH1DMWbBZ/WU/cExCqMNq6DuWnyHAezKvhA=; b=EVRYOLdcfbGtECMbG8elGi0PEP1y1oWXFQ+fiVpUwZxBuHhmQ9iDKvTxsBpT6sB1IZ yLFSGAmlh54o1UotedThOc5QBR7NCTNXSXvqFL0llg15DuI6hz8TyZz3QpCJBNLNl2sb Htz9DQeML7iO0qIQ8MFeKVbkpk0chcXB4MkpY= 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=Ht0Z/BPjeH1DMWbBZ/WU/cExCqMNq6DuWnyHAezKvhA=; b=3t8X1XG19DPonoCQTCrkHFUi1JSfLpT7MIzh6yUMM8lfRcdXqgeuVZHhpJZoSB746B Lk2lWgDhRN0QH8hqpellVXr08madzSgMucMNfRvImW75INIynlMmntCAh0u36xkvrrQo gNAvJN+yMT9MVTxtPCN96MCrZBRrmu5NcqmzNUHXPclgdvdCl5ieWdwdj0lmk98/u+X2 k4AasiQUF/6siMQG0Tv3Tdx+/7E9Xj4N8Ft5ai5DeTacQOTStxFWO9+bFg+BcjtCzPYG GNgUh3Dj6Qf3nzXHEFa0eTdLsIMqgrv2zoAq32xohVOwaWhksjQQy2gNXVLeVQuMddZd QLUg== X-Gm-Message-State: ANoB5pmg6QF8IpEJQ86smvbfU9P4A8qjhsIKcSIwFgcq5x7anXWVIjTr ORRJrx9lW7w22351xnZjWcklKqTdV1u/Lw== X-Google-Smtp-Source: AA0mqf7q+M1KIC1BpMQeqra+kikL7EPxTgejzLvEbCyExWL62HCgvgyyU1kJE7HKZhje+GYM+qXAAw== X-Received: by 2002:a05:6214:448e:b0:4bb:754f:e974 with SMTP id on14-20020a056214448e00b004bb754fe974mr14022165qvb.2.1668953330601; Sun, 20 Nov 2022 06:08:50 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:50 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 143/241] global: Migrate CONFIG_PEN_ADDR_BIG_ENDIAN to CFG Date: Sun, 20 Nov 2022 09:07:33 -0500 Message-Id: <20221120140829.3057894-34-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/nonsec_virt.S | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index b6d144f065d2..51beda79c967 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -211,7 +211,7 @@ ENTRY(smp_waitloop) wfi ldr r1, =CONFIG_SMP_PEN_ADDR @ load start address ldr r1, [r1] -#ifdef CONFIG_PEN_ADDR_BIG_ENDIAN +#ifdef CFG_PEN_ADDR_BIG_ENDIAN rev r1, r1 #endif cmp r0, r1 @ make sure we dont execute this code diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 7a9a89d02390..cc6d07b40620 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -89,7 +89,7 @@ #define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" -#define CONFIG_PEN_ADDR_BIG_ENDIAN +#define CFG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index be05ab9de8cb..ccbf7c2e70dc 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -273,7 +273,7 @@ #define TSEC3_PHYIDX 0 #endif -#define CONFIG_PEN_ADDR_BIG_ENDIAN +#define CFG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index da1e409e5c77..a554ee459042 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -154,7 +154,7 @@ /* GPIO */ -#define CONFIG_PEN_ADDR_BIG_ENDIAN +#define CFG_PEN_ADDR_BIG_ENDIAN #define CONFIG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index adf41306e819..ca5faaeea1a3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -152,7 +152,7 @@ CFG_OTHBOOTARGS CFG_OVERWRITE_ETHADDR_ONCE CFG_PCIE_IMX_PERST_GPIO CFG_PCIE_IMX_POWER_GPIO -CONFIG_PEN_ADDR_BIG_ENDIAN +CFG_PEN_ADDR_BIG_ENDIAN CONFIG_PHY_BASE_ADR CONFIG_PHY_ET1011C_TX_CLK_FIX CONFIG_PHY_ID From patchwork Sun Nov 20 14:07:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706849 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=QE/GlkAy; 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 4NFXZY1fW1z23n6 for ; Mon, 21 Nov 2022 01:14:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8C76853C2; Sun, 20 Nov 2022 15:09:45 +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="QE/GlkAy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C330E852CE; Sun, 20 Nov 2022 15:08:55 +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-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 B5E158529D for ; Sun, 20 Nov 2022 15:08:51 +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-qk1-x72f.google.com with SMTP id i9so6515802qki.10 for ; Sun, 20 Nov 2022 06:08:51 -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=IwLOFPeQ/sTF632iz/BwwxQ4VgbO9RpuEKZO8cbysKA=; b=QE/GlkAyueuoIhf/ohyLT6y2gkq+bVOxBsNeB9eg3uSGzZJntLYlEfJ+j6LQXt+TRY 17l5SebOQmevn4EddtzlQI3kPa2MEvcAHJQaqZhypOUb9q2vt0+xMq1pF6DAnBB7zLIs M3Q7ZbnGhehZea3ITokw+MMwt7zsvwyDFBEOw= 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=IwLOFPeQ/sTF632iz/BwwxQ4VgbO9RpuEKZO8cbysKA=; b=LyXKX07mK5gYxd2xgeiBgN1tQzfPyNb6mbSOjZIbonF/9WzbUYSTDa6z4G9Y8JODw9 6LC1PcXaYaNV8ObiqCF5KVGEE/NjyFkESoCXMDj/VMZbuwUt0pTIAHJrMiGL0hLk8De5 YBDw+VxdBL+mapsnoMC6rOVqZZ7GhOxtQTOmqSV5zE3KKmosRK8aKsYDlIrF7FCGSOZM VtkWPTcwgTtua0cOc4I+vZbdC2ZiSf6gtFgYbftSs4blkPnLX4BlT3Kyg5l4Ak4aDCYS rZNxKQ0m+6wre79FYG5o7q5EDrBJty5R/AhYOzTT04EPEHlEptUVoYr1C7C40LwWls7O 36Xw== X-Gm-Message-State: ANoB5pnc/ziA08IXiQj9tWCE5jcQPSad8l5edOCbCRqxceIkLpWdtmXE 66hN96B+6Z7ZeoVDU0Z8bibEDGxSbHfAog== X-Google-Smtp-Source: AA0mqf7dUYi2YaIwnwqCWc3tYs81/pvBMO3kO8pndbMMnEEud6S1gxoZqH8mTFGqaTzWnnaJoS//LA== X-Received: by 2002:a05:620a:15d2:b0:6fa:6c8f:a54b with SMTP id o18-20020a05620a15d200b006fa6c8fa54bmr13000063qkm.431.1668953331084; Sun, 20 Nov 2022 06:08:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:50 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 144/241] global: Migrate CONFIG_PHY_BASE_ADR to CFG Date: Sun, 20 Nov 2022 09:07:34 -0500 Message-Id: <20221120140829.3057894-35-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/net/mvgbe.h | 4 ++-- include/configs/SBx81LIFKW.h | 2 +- include/configs/SBx81LIFXCAT.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/openrd.h | 4 ++-- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/sheevaplug.h | 2 +- scripts/config_whitelist.txt | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 44541c0a85e3..bc0c32957204 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -12,8 +12,8 @@ #define __MVGBE_H__ /* PHY_BASE_ADR is board specific and can be configured */ -#if defined (CONFIG_PHY_BASE_ADR) -#define PHY_BASE_ADR CONFIG_PHY_BASE_ADR +#if defined (CFG_PHY_BASE_ADR) +#define PHY_BASE_ADR CFG_PHY_BASE_ADR #else #define PHY_BASE_ADR 0x08 /* default phy base addr */ #endif diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 861ae530336a..3585d5f1b021 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -44,7 +44,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ -#define CONFIG_PHY_BASE_ADR 0x01 +#define CFG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_SBX81LIFKW_H */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 418221ca72b3..4b1c9f995fb0 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -49,7 +49,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ -#define CONFIG_PHY_BASE_ADR 0x01 +#define CFG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_SBX81LIFXCAT_H */ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 68afe96239e6..bef274431261 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -32,6 +32,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_DOCKSTAR_H */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 2b312e52b135..c258eadd6d9b 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -28,6 +28,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index a5f62497a731..123ebf751f37 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -40,7 +40,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable one port */ -#define CONFIG_PHY_BASE_ADR 8 +#define CFG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_DS109_H */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index c10e991d6589..10f2715c8b2a 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -40,6 +40,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index b21151e312c9..f78981c5b4e6 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -35,7 +35,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_GURUPLUG_H */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 5eeaeadd4bec..3dab13863051 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -29,7 +29,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ /* diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 12f8a3c933cc..bb0813053256 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -23,7 +23,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 11 +#define CFG_PHY_BASE_ADR 11 #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_ICONNECT_H */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index bfa132dbfe58..149a1e20af40 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -44,7 +44,7 @@ */ #ifdef CONFIG_CMD_NET #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 8 +#define CFG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ /* diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 85cbd0bab07d..765268cba3ca 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -48,6 +48,6 @@ /* Ethernet driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 1 +#define CFG_PHY_BASE_ADR 1 #endif /* _CONFIG_NSA310S_H */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 1d1915a98520..413ca37e861d 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -43,10 +43,10 @@ # define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ # endif # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE -# define CONFIG_PHY_BASE_ADR 0x0 +# define CFG_PHY_BASE_ADR 0x0 # define PHY_NO "88E1121" # else -# define CONFIG_PHY_BASE_ADR 0x8 +# define CFG_PHY_BASE_ADR 0x8 # define PHY_NO "88E1116" # endif #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index c48590123bd2..17fb475f56a7 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -27,6 +27,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_E02_H */ diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 5d26a45f1426..9d6064f1e631 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -73,6 +73,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_V4_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index d4d968285fbd..9f78e1ac9a27 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -25,6 +25,6 @@ * Ethernet Driver configuration */ #define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0 +#define CFG_PHY_BASE_ADR 0 #endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ca5faaeea1a3..5788c297fc21 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -153,7 +153,7 @@ CFG_OVERWRITE_ETHADDR_ONCE CFG_PCIE_IMX_PERST_GPIO CFG_PCIE_IMX_POWER_GPIO CFG_PEN_ADDR_BIG_ENDIAN -CONFIG_PHY_BASE_ADR +CFG_PHY_BASE_ADR CONFIG_PHY_ET1011C_TX_CLK_FIX CONFIG_PHY_ID CONFIG_PHY_INTERFACE_MODE From patchwork Sun Nov 20 14:07:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706863 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=bOSGmW0v; 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 4NFXdT4XvPz23mR for ; Mon, 21 Nov 2022 01:16:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A151885426; Sun, 20 Nov 2022 15:10:05 +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="bOSGmW0v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C90CE8533D; Sun, 20 Nov 2022 15:09:26 +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-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 1361D85305 for ; 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-x830.google.com with SMTP id h21so5939218qtu.2 for ; 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=tgi5O2vSCiL2uu7BDuNl+qYFbeiUMX0dzpYbUkbQt2I=; b=bOSGmW0v7cmNwTph2TQnIw4SEBg1ORt26AeByIonEUyPCR3XftmKTUzfMG4qJaAbov qQEJNYUbc3ocIfjYA2tCbN2+Kuo5SXEPnPI2EKxaYdt7vHUa3573MfroeeTVUce5KTbC +neG54nSRpYi/foHVsAmWoUqddHjw3mvnhfOg= 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=tgi5O2vSCiL2uu7BDuNl+qYFbeiUMX0dzpYbUkbQt2I=; b=t9AOc9yuLi/xVsHlUNA9Csz1327o6Cbi2tzkmXCo5jSyldA6G68eopZ3QUNRY6h/z9 ms2VxEEJH/lRmsor/yhIOezyHtqKxhguLppEK5FJemKji/UDRHOY9ORnXl3PyJVm+vxL VJmRo7fOFONpc2f16eTu6YXMAIAAhBlvtHVB+Yd7hLbRyGkD3QWnl4eh1FWCFbuMIjI1 ZQ+BVT78IYTojNNIj6YvIVsVz+sglOMJkurOjthC9IrvrsspxmWON0Mpxls6F+AcD0u9 o/sejc4m62SOsYfVBg6As6AjkMJ4hOZKgsCrI2wcVl4fgs4TQEDhx40tCtbjEoooUj+J HLCA== X-Gm-Message-State: ANoB5pmDDw1f9rCzBk190eRbPX8XXDYxITr/ezRHJ5oIIMRgcqXWFXQ2 0MtkBqtwiIsSVxinicABq7R/OPQz7sA2JQ== X-Google-Smtp-Source: AA0mqf4yzA3nXLZjR+ug3ZH+Ses2oqYZiSBoldpKExiE8D7TdGv9MMe2douL5Z+HrzM7xfBN3sxDjQ== X-Received: by 2002:ac8:6055:0:b0:3a5:4106:64e with SMTP id k21-20020ac86055000000b003a54106064emr13749000qtm.321.1668953331835; Sun, 20 Nov 2022 06:08:51 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 145/241] global: Migrate CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG Date: Sun, 20 Nov 2022 09:07:35 -0500 Message-Id: <20221120140829.3057894-36-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/net/phy/et1011c.c | 2 +- include/configs/ti814x_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c index c243c5b72f81..7eff5ec7cacb 100644 --- a/drivers/net/phy/et1011c.c +++ b/drivers/net/phy/et1011c.c @@ -60,7 +60,7 @@ static int et1011c_parse_status(struct phy_device *phydev) mii_reg | ET1011C_GMII_INTERFACE | ET1011C_SYS_CLK_EN | -#ifdef CONFIG_PHY_ET1011C_TX_CLK_FIX +#ifdef CFG_PHY_ET1011C_TX_CLK_FIX ET1011C_TX_CLK_EN | #endif ET1011C_TX_FIFO_DEPTH_16); diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 11e1936c2562..e67f2a2287de 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -97,6 +97,6 @@ */ /* Ethernet */ -#define CONFIG_PHY_ET1011C_TX_CLK_FIX +#define CFG_PHY_ET1011C_TX_CLK_FIX #endif /* ! __CONFIG_TI814X_EVM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5788c297fc21..ebbc0b068611 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -154,7 +154,7 @@ CFG_PCIE_IMX_PERST_GPIO CFG_PCIE_IMX_POWER_GPIO CFG_PEN_ADDR_BIG_ENDIAN CFG_PHY_BASE_ADR -CONFIG_PHY_ET1011C_TX_CLK_FIX +CFG_PHY_ET1011C_TX_CLK_FIX CONFIG_PHY_ID CONFIG_PHY_INTERFACE_MODE CONFIG_PHY_IRAM_BASE From patchwork Sun Nov 20 14:07:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706870 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=GI7pbyLh; 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 4NFXfv2jmZz23mR for ; Mon, 21 Nov 2022 01:17:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 705DD85442; Sun, 20 Nov 2022 15:10:16 +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="GI7pbyLh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 62DBB85334; Sun, 20 Nov 2022 15:09:29 +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-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) (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 E782C85317 for ; Sun, 20 Nov 2022 15:09:18 +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-qv1-xf32.google.com with SMTP id i12so6517993qvs.2 for ; Sun, 20 Nov 2022 06:09:18 -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=J/ohh1bdjL6f2No3mceQgtbmuZNHBH6+zFCYssjOQpk=; b=GI7pbyLhCMnP6QkFWnIXIV1D2qz79A9PgEzwSPMBf8QI4tcvWW3uweyVPS/D5JOcyY S2xWyby1Rwu4JXuTC/Etl6PYwF1sv2M3ZilcQWMRk6bPBk58ELSzzJJ8bMxwl6i8WYvy eor7NZr4kxtotvr+Ix8cmS5CzyxT7t8Fb2N2A= 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=J/ohh1bdjL6f2No3mceQgtbmuZNHBH6+zFCYssjOQpk=; b=VeXrHGnTeWH0esfdg3CQG0RqXHfYOjIGkx9JH19fRi/MOiydNd7W8FqcTGO1gnubx7 NHSEpx62SphbbXZK9wSIdukptbHHbGb9oqCnJzywsOHKaoOYT+3EoC0ff/P1P087uxwJ TX8I+mfWkSUhU+3gN/VEPXi0630DfsxA3YV6+v4/ZaiGA2+rl7ZQMgSLuodfduZl1FIH bFRqGbgZ/c2T0vBIEceN8/uu0GYzN0j1OSfH+Erod5i/oB5h7v08H1NJUEQeuNs/p4ki DMTrjf8n2/yMFOoGLC4PPVHqTo0HixyrWOWSTUiO2jrwAdbMOGM0wD8e5D1k8Ll+ytq2 U3RA== X-Gm-Message-State: ANoB5plqKJqcLvPWlqDV39/+eUjvOP0rUokkRxCIWeLhg48bEjaOwzDX 7sYPu08RysTCgjQ/Xnrcsl35dD9MP5pK5Q== X-Google-Smtp-Source: AA0mqf5+iMqWq4/AEYeX2vp3qmVzhXk+feGkoKHwJJteQsE3QekruB5/RAxCuoFsc/rav7VS1J2HwQ== X-Received: by 2002:a0c:ea47:0:b0:4c6:9d1f:b250 with SMTP id u7-20020a0cea47000000b004c69d1fb250mr2671637qvp.99.1668953332462; Sun, 20 Nov 2022 06:08:52 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 146/241] global: Migrate CONFIG_PHY_ID to CFG Date: Sun, 20 Nov 2022 09:07:36 -0500 Message-Id: <20221120140829.3057894-37-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/egnite/ethernut5/ethernut5.c | 2 +- include/configs/ethernut5.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c index ceb0d2cf0aa3..9953df017e19 100644 --- a/board/egnite/ethernut5/ethernut5.c +++ b/board/egnite/ethernut5/ethernut5.c @@ -160,7 +160,7 @@ int board_eth_init(struct bd_info *bis) /* Set peripheral pins. */ at91_macb_hw_init(); /* Basic EMAC initialization. */ - if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CONFIG_PHY_ID)) + if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CFG_PHY_ID)) return -1; /* * Early board revisions have a pull-down at the PHY's MODE0 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 2859188e60c9..18c643478f76 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -48,7 +48,7 @@ /* JFFS2 */ /* Ethernet */ -#define CONFIG_PHY_ID 0 +#define CFG_PHY_ID 0 #define CFG_MACB_SEARCH_PHY /* MMC */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ebbc0b068611..664b59d44050 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -155,7 +155,7 @@ CFG_PCIE_IMX_POWER_GPIO CFG_PEN_ADDR_BIG_ENDIAN CFG_PHY_BASE_ADR CFG_PHY_ET1011C_TX_CLK_FIX -CONFIG_PHY_ID +CFG_PHY_ID CONFIG_PHY_INTERFACE_MODE CONFIG_PHY_IRAM_BASE CONFIG_PL011_CLOCK From patchwork Sun Nov 20 14:07:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706871 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=edXo9Buv; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXg811tKz23mR for ; Mon, 21 Nov 2022 01:18:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 75CDF85448; Sun, 20 Nov 2022 15:10: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=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="edXo9Buv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A378B85334; Sun, 20 Nov 2022 15:09:29 +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-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (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 331EC85315 for ; Sun, 20 Nov 2022 15:09:18 +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-qv1-xf34.google.com with SMTP id i12so6518004qvs.2 for ; Sun, 20 Nov 2022 06:09:18 -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=D8yKVfHPDVA729/CQMVdxG2mdRO7+9A34NvPstdnkuE=; b=edXo9BuvLT4p4uH5nFeldcRcWVZGtXhhM456Qd+CjISTP9gJGOxahw/xAopbej6TcG VUN9un9BhgwzUT3ZmiKvf+HDMPCFozoLbFcbB8u8djJNmS9B3BUBH+0wP3h7mlmUovG8 98BovxHI5wp3AeWlpzv8M96MwHSJ5Ltq8RaAc= 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=D8yKVfHPDVA729/CQMVdxG2mdRO7+9A34NvPstdnkuE=; b=Cbo9jySL2AWVqQUvgj8D1yorEg6KxRRMvURFua+r/0DpwjiHi3A0nPkw3V3c6PkfFt nc3hb0lss7NpHrvzR3DA/jUN7+LxzJYAdblHA9G1KP8pLhtzK5qLt5rDeF9E5DCOWA+x 8wr53UbC0I/tzXBmCKSjb3fVIyd7BrbDxtSmIvhuSXoG2am08AUSHsN3bTY8Bpb686PX SajYCltIDO4hvuufl/mvCwgzBqqrSQ9Wl/o8BCWe7bc4iPihxORdojlPkqpsWfTzkyRn SI2/NPp2Ia/mkXUp2oU4YRoe63mIo2EGINYJHuvVgCjEWmyoxpNec9zqrIng2XtTQzLN F16w== X-Gm-Message-State: ANoB5pm0dcL+hJ2wdLqZRxbSxcMPFdb9yPBDgcYxlaLk6kxRE0q6gdrp //O5wkuQxX6Q+fLbtyN2+Sh6Mb1PssUgbA== X-Google-Smtp-Source: AA0mqf4cEbXFY6Aqu/VUzLVzXRP1rsYpPA0C0RdPGXAI3Xdz/WthdIKKBJfftXHKNlYy+weNYMkmKw== X-Received: by 2002:a05:6214:a61:b0:4bb:746b:b643 with SMTP id ef1-20020a0562140a6100b004bb746bb643mr4378479qvb.19.1668953333297; Sun, 20 Nov 2022 06:08:53 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 147/241] global: Migrate CONFIG_PHY_INTERFACE_MODE to CFG Date: Sun, 20 Nov 2022 09:07:37 -0500 Message-Id: <20221120140829.3057894-38-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/socfpga_sr1500.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 432144cb40ce..70df27241ca6 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -11,7 +11,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */ /* Ethernet on SoC (EMAC) */ -#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII +#define CFG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII /* The PHY is autodetected, so no MII PHY address is needed here */ #define PHY_ANEG_TIMEOUT 8000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 664b59d44050..9438ee6afdd7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -156,7 +156,7 @@ CFG_PEN_ADDR_BIG_ENDIAN CFG_PHY_BASE_ADR CFG_PHY_ET1011C_TX_CLK_FIX CFG_PHY_ID -CONFIG_PHY_INTERFACE_MODE +CFG_PHY_INTERFACE_MODE CONFIG_PHY_IRAM_BASE CONFIG_PL011_CLOCK CONFIG_PL01x_PORTS From patchwork Sun Nov 20 14:07:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706877 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=YxUhMWFH; 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 4NFXhf2fWbz23mR for ; Mon, 21 Nov 2022 01:19:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 62FE485466; Sun, 20 Nov 2022 15:10:34 +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="YxUhMWFH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CA1A85334; Sun, 20 Nov 2022 15:09:39 +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-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (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 3AFED8530D for ; Sun, 20 Nov 2022 15:09:37 +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-x832.google.com with SMTP id h21so5939247qtu.2 for ; Sun, 20 Nov 2022 06:09:37 -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=PyzWbb8hkea2Tbk2YzIJdB7FDy+5xp/jN98tJie61gQ=; b=YxUhMWFH6yKdQyvETaSBgM+V40IX00vZxc10rFbiLW7Q86qzs2xqL3Ukx1o7H8wrFA W4dMGNG+hplke/bn93hrbdMDw/PY9gW/vYDFupgdgsV9AVVh+DFB/hBy7nD5nQ1Ks9Km mvJNP7IqKtqxFYHO8eEz3FtFwrPAhDWn75YTE= 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=PyzWbb8hkea2Tbk2YzIJdB7FDy+5xp/jN98tJie61gQ=; b=VcQQOtWV+vyUC6UwDKhPUkdyJCwgD2i82hVyj+DYQ/v/VxD/kf/g6dGrd6VVTNvR3C M9X8aUMsLZkiNyQ5q1a10emtJOu0kYyCgGQUmVLOiyiDtb/1xJUAiB+bVIJ42eZaXpYH LRJNVLw6jc6HRJ45E0pGWH0gCoA5PiQdSMyfAT47E++Vle9U5GxySTqaodtxsMC8jn/I uaLHuBh8kIebkjx7qCL1ddgGm5Xb7Zd1S+IGFzuFFrv/14CaESFZpj7jRGu67bH32rbq TO0rgEpTYJb7T5ykUUUKu8oaE6aj9DCx86Z5E7HPWfeNI5UZ41O27QQ9AxhosP7DU0kM HG1A== X-Gm-Message-State: ANoB5pl+d4d8ecAVfbgzHe+6T3GZCVuTUu9eaHpPltVXp/5zN5r1R0Nt 0BUvbh64X88uercBurla5A5P2Bg3F/VulA== X-Google-Smtp-Source: AA0mqf6lZNSfcVs4aD+4vwOb/0UoLy1ebUq8QSs01xq86BC93muKarTsE48gfnCNT+Phlm9NM8PZXg== X-Received: by 2002:ac8:7183:0:b0:3a5:1dcb:d22d with SMTP id w3-20020ac87183000000b003a51dcbd22dmr13849489qto.489.1668953333921; Sun, 20 Nov 2022 06:08:53 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:53 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 148/241] global: Migrate CONFIG_PHY_IRAM_BASE to CFG Date: Sun, 20 Nov 2022 09:07:38 -0500 Message-Id: <20221120140829.3057894-39-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-exynos/lowlevel_init.c | 6 +++--- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 243b5c80c90e..c57b8aee7989 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -77,10 +77,10 @@ static void low_power_start(void) branch_bx(0x0); } - reg_val = readl(CONFIG_PHY_IRAM_BASE + 0x4); + reg_val = readl(CFG_PHY_IRAM_BASE + 0x4); if (reg_val != (uint32_t)&low_power_start) { /* Store jump address as low_power_start if not present */ - writel((uint32_t)&low_power_start, CONFIG_PHY_IRAM_BASE + 0x4); + writel((uint32_t)&low_power_start, CFG_PHY_IRAM_BASE + 0x4); dsb(); sev(); } @@ -164,7 +164,7 @@ static void secondary_cores_configure(void) writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR); writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE); /* Store jump address for power down */ - writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4); + writel((uint32_t)&power_down_core, CFG_PHY_IRAM_BASE + 0x4); /* Need all core power down check */ dsb(); diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index b617c062881b..791ad154242e 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -12,7 +12,7 @@ #define CFG_IRAM_TOP 0x02074000 -#define CONFIG_PHY_IRAM_BASE 0x02020000 +#define CFG_PHY_IRAM_BASE 0x02020000 /* * Low Power settings diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9438ee6afdd7..3e9d0d66f56d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -157,7 +157,7 @@ CFG_PHY_BASE_ADR CFG_PHY_ET1011C_TX_CLK_FIX CFG_PHY_ID CFG_PHY_INTERFACE_MODE -CONFIG_PHY_IRAM_BASE +CFG_PHY_IRAM_BASE CONFIG_PL011_CLOCK CONFIG_PL01x_PORTS CONFIG_PME_PLAT_CLK_DIV From patchwork Sun Nov 20 14:07:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706851 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=WzPJBeDT; 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 4NFXb04yy7z23n6 for ; Mon, 21 Nov 2022 01:14:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D272A853ED; Sun, 20 Nov 2022 15:09:48 +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="WzPJBeDT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3588E852E5; Sun, 20 Nov 2022 15:08:58 +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-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 2B643852CC for ; Sun, 20 Nov 2022 15:08:55 +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-x82d.google.com with SMTP id jr19so5929104qtb.7 for ; Sun, 20 Nov 2022 06:08:55 -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=S1u/jRRY2T8VDQkA/VmN5H1lTCGJweutFFNBemiuRzs=; b=WzPJBeDTJ/AlpPRVdVW+JNXIKrkzv4R9ctjHFfqx+gQ9lSIyDim2/nSQZ7reKNPT3F GfgPSH6fjai+qZ+lEzElA//i8FdPVSZIyrNh6pP7yshNoV/QLFOqHvos1FbNfaVZPPaX tnt4+vEkzYUFUntCuU+4fL8Sv3ckbUfEqZLyE= 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=S1u/jRRY2T8VDQkA/VmN5H1lTCGJweutFFNBemiuRzs=; b=JYl/jjfWDeXyg0g5f6ctfN9Tzm0DETHwLNE1jS69cuEE+aq6z2Yj0u6TB93AWfKfij rfkJO2DfPWgaj0Xd4cev38jHkRScpWfpdXOq1u7OZDVLwtx5TIS82O0l0oo706+G/4Se DT1IShVCBtyw0u/wvOeTpAdTvAgvp6uCJ61TJbLr510wtmURLYJxXvwdwgkZ3dZtDknw bBYXiWDS0VsCSDVguxHYoGjZ4sE54HhGaRR+beGPhTcl9qJwWXBy+rAQBDy+x+HLU2IQ fc6rvYMRF2BmWLmyFXP9W6iZA7gTtzVCkhxF7CyLSai27auZAuId2Fx4/C9XeNM6SjcY XM4Q== X-Gm-Message-State: ANoB5pky+RZTd9oG2cq2xyp/hQKA8InBQ0LRcPqxtOacxSA/STbveVgB HhnvyHuZnwrUbWkbRAlagHFhWCMckeTDKg== X-Google-Smtp-Source: AA0mqf7Vsa23tYYIn/G+0uys5+D7Rmfh0YCfVmsiPliqq8iYW1eyRyPUwgQWKsi69zNU7ASH9E/syQ== X-Received: by 2002:ac8:53d7:0:b0:3a5:451d:2ca6 with SMTP id c23-20020ac853d7000000b003a5451d2ca6mr14240791qtq.88.1668953334481; Sun, 20 Nov 2022 06:08:54 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:54 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 149/241] global: Migrate CONFIG_PL011_CLOCK to CFG Date: Sun, 20 Nov 2022 09:07:39 -0500 Message-Id: <20221120140829.3057894-40-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- arch/arm/cpu/armv7/s5p4418/cpu.c | 2 +- board/armltd/total_compute/total_compute.c | 2 +- board/armltd/vexpress64/vexpress64.c | 2 +- drivers/serial/serial_pl01x.c | 8 ++++---- include/configs/corstone1000.h | 2 +- include/configs/highbank.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mxs.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/thunderx_88xx.h | 2 +- include/configs/total_compute.h | 2 +- include/configs/vexpress_aemv8.h | 4 ++-- include/configs/vexpress_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README b/README index d3659e7b54a2..1eda285312be 100644 --- a/README +++ b/README @@ -419,7 +419,7 @@ The following options need to be configured: controller register space - Serial Ports: - CONFIG_PL011_CLOCK + CFG_PL011_CLOCK If you have Amba PrimeCell PL011 UARTs, set this variable to the clock speed of the UARTs. diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c index 3baa761ec7a9..7ba9c0b03236 100644 --- a/arch/arm/cpu/armv7/s5p4418/cpu.c +++ b/arch/arm/cpu/armv7/s5p4418/cpu.c @@ -64,7 +64,7 @@ static void serial_device_init(void) /* set clock */ clk_disable(clk); - clk_set_rate(clk, CONFIG_PL011_CLOCK); + clk_set_rate(clk, CFG_PL011_CLOCK); clk_enable(clk); } #endif diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index b7772f79a31a..53941b5f5f28 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -13,7 +13,7 @@ static const struct pl01x_serial_plat serial_plat = { .base = UART0_BASE, .type = TYPE_PL011, - .clock = CONFIG_PL011_CLOCK, + .clock = CFG_PL011_CLOCK, }; U_BOOT_DRVINFO(total_compute_serials) = { diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 4ca544f1017d..99fb67ecedc2 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; static const struct pl01x_serial_plat serial_plat = { .base = V2M_UART0, .type = TYPE_PL011, - .clock = CONFIG_PL011_CLOCK, + .clock = CFG_PL011_CLOCK, }; U_BOOT_DRVINFO(vexpress_serials) = { diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index d3c3d3e2d188..dd2881931dfd 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -193,7 +193,7 @@ static void pl01x_serial_init_baud(int baudrate) #if defined(CONFIG_PL011_SERIAL) pl01x_type = TYPE_PL011; - clock = CONFIG_PL011_CLOCK; + clock = CFG_PL011_CLOCK; #endif base_regs = (struct pl01x_regs *)port[CONFIG_CONS_INDEX]; @@ -343,8 +343,8 @@ static const struct udevice_id pl01x_serial_id[] ={ {} }; -#ifndef CONFIG_PL011_CLOCK -#define CONFIG_PL011_CLOCK 0 +#ifndef CFG_PL011_CLOCK +#define CFG_PL011_CLOCK 0 #endif int pl01x_serial_of_to_plat(struct udevice *dev) @@ -359,7 +359,7 @@ int pl01x_serial_of_to_plat(struct udevice *dev) return -EINVAL; plat->base = addr; - plat->clock = dev_read_u32_default(dev, "clock", CONFIG_PL011_CLOCK); + plat->clock = dev_read_u32_default(dev, "clock", CFG_PL011_CLOCK); ret = clk_get_by_index(dev, 0, &clk); if (!ret) { ret = clk_enable(&clk); diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h index 8aec52d508e2..3347c11792d5 100644 --- a/include/configs/corstone1000.h +++ b/include/configs/corstone1000.h @@ -16,7 +16,7 @@ #define V2M_BASE 0x80000000 -#define CONFIG_PL011_CLOCK 50000000 +#define CFG_PL011_CLOCK 50000000 /* Physical Memory Map */ #define PHYS_SDRAM_1 (V2M_BASE) diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 76e6054b0cc1..97bb439f7357 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -8,7 +8,7 @@ #define CFG_SYS_BOOTMAPSZ (16 << 20) -#define CONFIG_PL011_CLOCK 150000000 +#define CFG_PL011_CLOCK 150000000 /* * Miscellaneous configurable options diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 0fc32efabc7f..ea59f772064a 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -41,7 +41,7 @@ /* Serial Port */ -#define CONFIG_PL011_CLOCK (get_bus_freq(0) / 4) +#define CFG_PL011_CLOCK (get_bus_freq(0) / 4) #define CFG_SYS_SERIAL0 0x21c0000 #define CFG_SYS_SERIAL1 0x21d0000 #define CFG_SYS_SERIAL2 0x21e0000 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 30f27e7f0c19..212d2201e7cc 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -77,7 +77,7 @@ * DUART Serial Driver. * Conflicts with AUART driver which can be set by board. */ -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000 #define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } /* Default baudrate can be overridden by board! */ diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index 02c469049adb..c9cef6a77c62 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -78,7 +78,7 @@ /*----------------------------------------------------------------------- * serial console configuration */ -#define CONFIG_PL011_CLOCK 50000000 +#define CFG_PL011_CLOCK 50000000 #define CONFIG_PL01x_PORTS {(void *)PHY_BASEADDR_UART0, \ (void *)PHY_BASEADDR_UART1, \ (void *)PHY_BASEADDR_UART2, \ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index fa522ce82883..d0b56cb48f7d 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -32,7 +32,7 @@ /* Serial (pl011) */ #define UART_CLK (62500000) -#define CONFIG_PL011_CLOCK UART_CLK +#define CFG_PL011_CLOCK UART_CLK #define CONFIG_PL01x_PORTS {(void *)(0x2a400000)} /* Support MTD */ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 8ba40546b2c0..2bca86bed939 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -17,7 +17,7 @@ /* PL011 Serial Configuration */ -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000 /* Generic Interrupt Controller Definitions */ #define GICD_BASE (0x801000000000) diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index e007be8e4564..436bf622e174 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -14,7 +14,7 @@ #define UART0_BASE 0x7ff80000 /* PL011 Serial Configuration */ -#define CONFIG_PL011_CLOCK 7372800 +#define CFG_PL011_CLOCK 7372800 /* Miscellaneous configurable options */ diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 87b8c5d57ee7..43f7e454d812 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -86,9 +86,9 @@ /* PL011 Serial Configuration */ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO -#define CONFIG_PL011_CLOCK 7372800 +#define CFG_PL011_CLOCK 7372800 #else -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000 #endif /* Physical Memory Map */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 705a941e3603..3fc70de57713 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -116,7 +116,7 @@ #define CFG_SYS_TIMER_COUNTER (V2M_TIMER01 + 0x4) /* PL011 Serial Configuration */ -#define CONFIG_PL011_CLOCK 24000000 +#define CFG_PL011_CLOCK 24000000 #define CONFIG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ (void *)CFG_SYS_SERIAL1} diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3e9d0d66f56d..0ea10f2edb32 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -158,7 +158,7 @@ CFG_PHY_ET1011C_TX_CLK_FIX CFG_PHY_ID CFG_PHY_INTERFACE_MODE CFG_PHY_IRAM_BASE -CONFIG_PL011_CLOCK +CFG_PL011_CLOCK CONFIG_PL01x_PORTS CONFIG_PME_PLAT_CLK_DIV CONFIG_POST From patchwork Sun Nov 20 14:07:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706883 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=PCRDBie4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXjt4WbVz23lt for ; Mon, 21 Nov 2022 01:20:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9540185483; Sun, 20 Nov 2022 15:10:42 +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="PCRDBie4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 195308543E; Sun, 20 Nov 2022 15:10:15 +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-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (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 C844F85324 for ; Sun, 20 Nov 2022 15:09:44 +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-qk1-x730.google.com with SMTP id z17so6518903qki.11 for ; Sun, 20 Nov 2022 06:09:44 -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=IHkvj4/WomRzGqjEaApCFYeROYiEiSfPDV/Vc2frSco=; b=PCRDBie4JyzF3cHxk9oA5GmC3ODkPD/St7FFTeKcytRGRhGIeA9WJjlyG5gob8sGsd CTrPqWWyYXfmyEJKVFy3MkFKARDhWf19wfHPTLJyon2N6ah8dr+JM6+e34hrPSVeHi+z YFRGRROMWER+dCre9eh4hGkoZHgISud+ph4Rw= 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=IHkvj4/WomRzGqjEaApCFYeROYiEiSfPDV/Vc2frSco=; b=Al/wis6BvNtzQXNZSnS0L24+BVFqRs01F0NxJ326mK/j8gay5R1xmAHttucBMTMPVm iDpV1LorWNgnMkkbC4uBHcANVkFLbkURcFTQ9zzFXrZZWTuGTMawz1FoH4ohiWOs0uh3 SAZvDH7M8nTNGut1jTsoHoMrgfoa9ksywU/H81RXzogyfIbiF+oeiNvOSlCUUb0AjV2K vnR1J66D0XRl6eG5QtYNiSMhq9CMVXRvcbvw9IiPnIcvrCwh/uFYJOyATLV1Obvqb/Ql y55Dk8I/HGxCmyDoUEogCfZxDrwz3oGgTfDWNQiDraj5I+UXKycZOIC4WWz3Lmn7HCvx 5IMg== X-Gm-Message-State: ANoB5pm5qcDzqzs25KKyxXricxOHeLW48DVAz+r0ifX4mLaMbcFwRFL/ cHhQpJp/DR92Nbk2wZ5ycrq1LLKOCyXt3Q== X-Google-Smtp-Source: AA0mqf47/9doYvgJj3Faele6B86nV0ziXdChahikAcXFZk8Y0zdHLOzo0eONZoDKEO0G4BkVpG/G6A== X-Received: by 2002:a05:620a:2b48:b0:6ec:c52d:65d4 with SMTP id dp8-20020a05620a2b4800b006ecc52d65d4mr12862863qkb.714.1668953335249; Sun, 20 Nov 2022 06:08:55 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:54 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 150/241] global: Migrate CONFIG_PL01x_PORTS to CFG Date: Sun, 20 Nov 2022 09:07:40 -0500 Message-Id: <20221120140829.3057894-41-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- drivers/serial/serial_pl01x.c | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mxs.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/vexpress_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README b/README index 1eda285312be..3e5af3e204c3 100644 --- a/README +++ b/README @@ -424,7 +424,7 @@ The following options need to be configured: If you have Amba PrimeCell PL011 UARTs, set this variable to the clock speed of the UARTs. - CONFIG_PL01x_PORTS + CFG_PL01x_PORTS If you have Amba PrimeCell PL010 or PL011 UARTs on your board, define this to a list of base addresses for each (supported) diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index dd2881931dfd..7449e9b90430 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifndef CONFIG_DM_SERIAL -static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS; +static volatile unsigned char *const port[] = CFG_PL01x_PORTS; static enum pl01x_type pl01x_type __section(".data"); static struct pl01x_regs *base_regs __section(".data"); #define NUM_PORTS (sizeof(port)/sizeof(port[0])) diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index ea59f772064a..dea14f28828d 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -47,7 +47,7 @@ #define CFG_SYS_SERIAL2 0x21e0000 #define CFG_SYS_SERIAL3 0x21f0000 /*below might needs to be removed*/ -#define CONFIG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ +#define CFG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ (void *)CFG_SYS_SERIAL1, \ (void *)CFG_SYS_SERIAL2, \ (void *)CFG_SYS_SERIAL3 } diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 212d2201e7cc..17b4295d2d6d 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -78,7 +78,7 @@ * Conflicts with AUART driver which can be set by board. */ #define CFG_PL011_CLOCK 24000000 -#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } +#define CFG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } /* Default baudrate can be overridden by board! */ /* NAND */ diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index c9cef6a77c62..c192d733c1db 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -79,7 +79,7 @@ * serial console configuration */ #define CFG_PL011_CLOCK 50000000 -#define CONFIG_PL01x_PORTS {(void *)PHY_BASEADDR_UART0, \ +#define CFG_PL01x_PORTS {(void *)PHY_BASEADDR_UART0, \ (void *)PHY_BASEADDR_UART1, \ (void *)PHY_BASEADDR_UART2, \ (void *)PHY_BASEADDR_UART3} diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index d0b56cb48f7d..be606ce2955b 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -33,7 +33,7 @@ /* Serial (pl011) */ #define UART_CLK (62500000) #define CFG_PL011_CLOCK UART_CLK -#define CONFIG_PL01x_PORTS {(void *)(0x2a400000)} +#define CFG_PL01x_PORTS {(void *)(0x2a400000)} /* Support MTD */ #define CFG_SYS_FLASH_BASE (0x08000000) diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 3fc70de57713..ba7731bfca6b 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -117,7 +117,7 @@ /* PL011 Serial Configuration */ #define CFG_PL011_CLOCK 24000000 -#define CONFIG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ +#define CFG_PL01x_PORTS {(void *)CFG_SYS_SERIAL0, \ (void *)CFG_SYS_SERIAL1} #define CFG_SYS_SERIAL0 V2M_UART0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0ea10f2edb32..390299fa0a8f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -159,7 +159,7 @@ CFG_PHY_ID CFG_PHY_INTERFACE_MODE CFG_PHY_IRAM_BASE CFG_PL011_CLOCK -CONFIG_PL01x_PORTS +CFG_PL01x_PORTS CONFIG_PME_PLAT_CLK_DIV CONFIG_POST CONFIG_POSTBOOTMENU From patchwork Sun Nov 20 14:07:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706852 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=mD8Schxw; 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 4NFXbC42ZLz23n6 for ; Mon, 21 Nov 2022 01:14:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38680853F3; Sun, 20 Nov 2022 15:09:50 +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="mD8Schxw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5820685306; Sun, 20 Nov 2022 15:09:17 +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-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 D9261852CC for ; Sun, 20 Nov 2022 15:09:02 +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-x834.google.com with SMTP id w4so5971946qts.0 for ; Sun, 20 Nov 2022 06:09:02 -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=bogYUvozm4s+lysNFDNug6mHsF5w6WTUA9tuqeiscj8=; b=mD8SchxwUtbTdqXqJLmgz5U3nhz+yRryTtFbGJrm5T87Ns6OmFPOlSdxWlDLMyZElw C7txL5ULrSUgzsBqkXQF+w3ZGaLHcpD3cXVEmqD/hChSXvqAEru9XKhvvjGee6kPbYCu yOuaF3wqR9Uqaxpvczbu5h5FMA7C6F2cnYYY8= 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=bogYUvozm4s+lysNFDNug6mHsF5w6WTUA9tuqeiscj8=; b=mffe9JnkM+qfiTGfLQIKnXC/UBlo6FhyqGGOw4+30PIGQYFo4IBbr7UwENy7T5ZZRw Y9wWyYMrDOexZZzeEQ0M22RQg0u5xgd1KaziV+bAwQpjLI3gXOkZI9flA/xreLY8I++N JNzJb4g4ATyvDfuJgk7biezV+GpkHo2Ix4GPBcbVXd5L/cLIOpjhQZIlTVgGtOZyjMbX EQoxgARtFcyuk4XY7GjEEgwXU6SkPX/XikJlp+WtP572ldOkPEz8w3LDplMUhkHkLUJw QIu9pLhk4ydLV66+KFZWqPJ7ztPHBFS7QmiSFFVy/rxZfBy7f1Ngn8xWoDdDUdkyIxvR sHUQ== X-Gm-Message-State: ANoB5pkS2V2sEqhAptWOGFQf5YQg+BQXFWE9gvhPQxn4AwQmfvZEEsd4 2Df/ZOYOTcQ674fVJt9z3OkQIGbvmCUl1g== X-Google-Smtp-Source: AA0mqf5w+9VlNaMzmutgg5VQglUHfRvyFg+8DIPFBipJcdosk1NBxvdNdYLynAlVD/6SzmRRTwPbww== X-Received: by 2002:a05:622a:1e8c:b0:3a5:62:af4f with SMTP id bz12-20020a05622a1e8c00b003a50062af4fmr13682384qtb.431.1668953342024; Sun, 20 Nov 2022 06:09:02 -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.09.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 160/241] global: Migrate CONFIG_RAMBOOT_SPIFLASH to CFG Date: Sun, 20 Nov 2022 09:07:50 -0500 Message-Id: <20221120140829.3057894-51-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/P1010RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index a75e1b8f7a8a..1fa0b38ae201 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -24,7 +24,7 @@ #ifdef CONFIG_SPIFLASH #ifdef CONFIG_NXP_ESBC -#define CONFIG_RAMBOOT_SPIFLASH +#define CFG_RAMBOOT_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #else #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 10) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2a06cc5d3041..083352a88bb8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -169,7 +169,7 @@ CFG_PPC_SPINTABLE_COMPATIBLE CFG_PRAM CFG_PSRAM_SCFG CFG_QBMAN_CLK_DIV -CONFIG_RAMBOOT_SPIFLASH +CFG_RAMBOOT_SPIFLASH CONFIG_RAMBOOT_TEXT_BASE CONFIG_RAMDISK_ADDR CONFIG_RD_LVL From patchwork Sun Nov 20 14:07:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706854 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=h6ujb3mC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXbc00SJz23mR for ; Mon, 21 Nov 2022 01:15:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7646F85400; Sun, 20 Nov 2022 15:09:52 +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="h6ujb3mC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A10E2852F0; Sun, 20 Nov 2022 15:09:20 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 52962852EF for ; Sun, 20 Nov 2022 15:09:03 +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-qv1-xf2a.google.com with SMTP id e15so6501607qvo.4 for ; Sun, 20 Nov 2022 06:09:03 -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=cKDPehxgoX69G3GVT33XGSoPDcG4kPp9CAkBQGYBG48=; b=h6ujb3mC3/ScTJmumiCR26uCW4xDSsenABuigw8oS0byEbJD5g9AidecR4poxhbZpb sQB1rsSz26TabITnwzPJ7ApzaGaM2mwAZrTwbQzhQ3f/8HnsuJc1TScfGuJiXKFzodTK toZirNd8/IytzpktnrAPjPIUrreB3rWWMXE3Q= 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=cKDPehxgoX69G3GVT33XGSoPDcG4kPp9CAkBQGYBG48=; b=tb2EncdrsoVDxcTPv3GU2U/HAnomjVvGOzIiosCOLEmECergtQpf1y2N5MJhi94USa ahxqfE75Hzdxq8donTi1i3L/1lHlMpIq51DFEp6d8UOXX7PsKINKw7iUCJ1M7/SSzH/C 2R4oVdbfcU53bZZ3wvphVlPQWLZfJbDTnyy87NvDhu09m7Kqg4TC0iRdaAYmumHBsYwU PJMQg1OqDCY52TuCIPpo5/QvJxDQ8xQ8dOz6okEC7qYWUoRp14jFr0IBYb91tugZemp+ MKPOgkCTP7+TT+tobn+R8QFxaqkfN/WAmG2byOEwkQaBmsjS/eOlf6YU0Wl5cLId34U3 905A== X-Gm-Message-State: ANoB5pmyqLmcpPnIKcVVdSibYlKg8rI/hBELqrZ6AN8VZsCXctqztIBb jdLb/sMt1Ee/YukcZMG+F7YYVRMZy5g5lw== X-Google-Smtp-Source: AA0mqf4VE3kDnd1w9gOYUoi24fnV/5Yz8bZF/RgzL2CKBFc3unI4t7yxwZIoYwFkTdxOJAq7BdtV8g== X-Received: by 2002:a0c:ed51:0:b0:4c6:a624:654b with SMTP id v17-20020a0ced51000000b004c6a624654bmr3660342qvq.104.1668953342625; Sun, 20 Nov 2022 06:09:02 -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.09.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 161/241] global: Migrate CONFIG_RAMBOOT_TEXT_BASE to CFG Date: Sun, 20 Nov 2022 09:07:51 -0500 Message-Id: <20221120140829.3057894-52-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/P2041RDB.h | 6 +++--- include/configs/T4240RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 0a6fcde3913d..f4cf43e7100d 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -12,7 +12,7 @@ #define __CONFIG_H #ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE +#define CFG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #endif @@ -46,10 +46,10 @@ /* * Config the L3 Cache as L3 SRAM */ -#define CFG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#define CFG_SYS_INIT_L3_ADDR CFG_RAMBOOT_TEXT_BASE #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | \ - CONFIG_RAMBOOT_TEXT_BASE) + CFG_RAMBOOT_TEXT_BASE) #else #define CFG_SYS_INIT_L3_ADDR_PHYS CFG_SYS_INIT_L3_ADDR #endif diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index f1ee131aaa98..c3a04a766abd 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -16,7 +16,7 @@ #ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD -#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE +#define CFG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #else #define RESET_VECTOR_OFFSET 0x27FFC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 083352a88bb8..df6a95c2572b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -170,7 +170,7 @@ CFG_PRAM CFG_PSRAM_SCFG CFG_QBMAN_CLK_DIV CFG_RAMBOOT_SPIFLASH -CONFIG_RAMBOOT_TEXT_BASE +CFG_RAMBOOT_TEXT_BASE CONFIG_RAMDISK_ADDR CONFIG_RD_LVL CONFIG_RESET_VECTOR_ADDRESS From patchwork Sun Nov 20 14:07:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706859 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=IanEOtpG; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXcf3xSQz23mR for ; Mon, 21 Nov 2022 01:16:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA7B28541B; Sun, 20 Nov 2022 15:09:57 +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="IanEOtpG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11423852FB; Sun, 20 Nov 2022 15:09:23 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 79443852F7 for ; Sun, 20 Nov 2022 15:09:12 +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-x833.google.com with SMTP id cg5so5910975qtb.12 for ; Sun, 20 Nov 2022 06:09:03 -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=lgUyCEhRU1lf7pCr3plbm+SPN0JSovN6TvvcaldGCSE=; b=IanEOtpGATw78ERTCAMUdG+QUFYSihWlA2FoAO2BtoKjSV19kb3t8Uw8DpoyUJS+2c rkpsOt2xtnmuujscDDKzQZX84dwhs+zpYllqgAdO6VvOQ+1Zt+2nC2b5vp12jJ1B6TEi WskO27TnSVFsIzrMaG+YrET5fqC3pd1RhLjm8= 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=lgUyCEhRU1lf7pCr3plbm+SPN0JSovN6TvvcaldGCSE=; b=10XdiF5IhN9f1bVEiFR8pgJOtTilPOOs8EsaVLtjnTvvtlc5qCsU/CyMrbpKlGKK/V D/lJpGP5WmC12bfr5Z8dqUCfEu9FjyoomBGuMFalq0Q/2iHzTNcKetbo7ehJRAr1TqNU uek2vhwJOlec7hPtP+CVtmeL5/UnO+bfTTWYVi4RfCn0Av22y9OWgwgrFFd4GfTJFhMt mQcfLy7+mimO8UbpJkfr71aKqAxqcuWZt4CTde7YyunrSt2N6adZHfK2XrJxmKIOVvYt IRpKH/37avYA6fU+DFeVe9thUFbQ9cnPUwFP4SNAWJCjkQzn+fBckTdIXI5Yn6Bqb4xV 10YQ== X-Gm-Message-State: ANoB5pkPb1t0O3MzNTRfyK9CfzPCVAqlM1HH9cqkJJYmjhfzqcGs7lNF cnhxZUVwXLGvkpDs/MxBvtCNX9WhKbDeHA== X-Google-Smtp-Source: AA0mqf6OJUk58OaXQzN2u4O4h6Vhrd2q/uiUnJ5bwoYR2Dedrt7CAVkXuvlatdRDG6EYMkAQyrQp0A== X-Received: by 2002:a05:622a:4886:b0:35b:af0c:6c9 with SMTP id fc6-20020a05622a488600b0035baf0c06c9mr4942456qtb.71.1668953343228; Sun, 20 Nov 2022 06:09:03 -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.09.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 162/241] global: Migrate CONFIG_RAMDISK_ADDR to CFG Date: Sun, 20 Nov 2022 09:07:52 -0500 Message-Id: <20221120140829.3057894-53-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- cmd/qfw.c | 4 ++-- doc/usage/cmd/qfw.rst | 2 +- include/configs/x86-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/qfw.c b/cmd/qfw.c index 95ddc4b79ec7..0c49c6074e16 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag, env = env_get("ramdiskaddr"); initrd_addr = env ? (void *)hextoul(env, NULL) : -#ifdef CONFIG_RAMDISK_ADDR - (void *)CONFIG_RAMDISK_ADDR; +#ifdef CFG_RAMDISK_ADDR + (void *)CFG_RAMDISK_ADDR; #else NULL; #endif diff --git a/doc/usage/cmd/qfw.rst b/doc/usage/cmd/qfw.rst index b3704b92d6d9..cc0e27c27790 100644 --- a/doc/usage/cmd/qfw.rst +++ b/doc/usage/cmd/qfw.rst @@ -31,7 +31,7 @@ kernel_addr initrd_addr address to which the file specified by the -initrd parameter of QEMU shall be loaded. Defaults to environment variable *ramdiskaddr* and further to - the value of *CONFIG_RAMDISK_ADDR*. + the value of *CFG_RAMDISK_ADDR*. Examples -------- diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index df75deedf583..e8bd2e507041 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -43,7 +43,7 @@ /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CFG_HOSTNAME "x86" -#define CONFIG_RAMDISK_ADDR 0x4000000 +#define CFG_RAMDISK_ADDR 0x4000000 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) #define CFG_OTHBOOTARGS "othbootargs=\0" #else diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index df6a95c2572b..e706fba5e8fd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -171,7 +171,7 @@ CFG_PSRAM_SCFG CFG_QBMAN_CLK_DIV CFG_RAMBOOT_SPIFLASH CFG_RAMBOOT_TEXT_BASE -CONFIG_RAMDISK_ADDR +CFG_RAMDISK_ADDR CONFIG_RD_LVL CONFIG_RESET_VECTOR_ADDRESS CONFIG_ROCKCHIP_SDHCI_MAX_FREQ From patchwork Sun Nov 20 14:07:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706855 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=loA9XnWO; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXbp1TQRz23mR for ; Mon, 21 Nov 2022 01:15:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E944B85407; Sun, 20 Nov 2022 15:09:53 +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="loA9XnWO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5B0A85306; Sun, 20 Nov 2022 15:09:20 +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-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 30B02852BA for ; Sun, 20 Nov 2022 15:09:12 +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-x82d.google.com with SMTP id jr19so5929255qtb.7 for ; Sun, 20 Nov 2022 06:09:04 -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=XChHPy3z5Qq7WjvXBflC3FOXE0SMDPckXNPYEdG0MMk=; b=loA9XnWOMZIJdjai/PILqdF0OV+20wYbgPZWR6RXOITw5tSGCQDdzjdjpjYZDl2u+V FuLAARqfWXuYgpoUKsjcAdYHBTutlnj8hebix8T7SWPU2wfMnHH63XWCH0uzQa2OlmHw Rl8HQwBN3WpcgELLNFmMhgZcllhWkx14evBH0= 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=XChHPy3z5Qq7WjvXBflC3FOXE0SMDPckXNPYEdG0MMk=; b=juHQh72EfnqKS4zXcpIj7bFSOabCu76vF73flofCxWTFwZ0DvURYLYCwMaPc47gVqg ht3xgkSmTiols9LWOCbmH0aIkayOg5fDUDvWIjiYTmj9x59Lj1l3rB1m91iHK6YYTXnW 7NgtQlwmzxspD8f0C8M5fVX9YIu/0hrkF6jqX6uDAxpTxZ8N47ZUIZQqC+92T/WNb+FJ /iKJP/sc3+dskhnh2Nvy28GVf7FIJ/mt4++jr/qZysA1wagrqhR2Yt6HUIBv/dOXm1FR Qm9LpaIb+9f+pof2QFSy5XtjGMYHjPoOkM0LEEzH9G+yHO0EkgC2iyMAll7P/IzvvUuG TbUQ== X-Gm-Message-State: ANoB5pkKI7sB+skQkFlwh7wV7AIPYaRTwb7O/1SevsF7LHhigGsnIXMd eDxrzffLV8WPjjNjF8uixAPnQfJUxuVijg== X-Google-Smtp-Source: AA0mqf7tAbBzLky28eM5B99Q9RCeCi1lYrTRSTXq+rulFkb3KmKnqBY+8S2HJU3cl9RMeJH3a5/JFA== X-Received: by 2002:ac8:1084:0:b0:3a5:2a3d:a953 with SMTP id a4-20020ac81084000000b003a52a3da953mr14336114qtj.231.1668953343851; Sun, 20 Nov 2022 06:09:03 -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.09.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:03 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 163/241] global: Migrate CONFIG_RD_LVL to CFG Date: Sun, 20 Nov 2022 09:07:53 -0500 Message-Id: <20221120140829.3057894-54-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/exynos5-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 860fd1601a66..e8236a9ec418 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -27,7 +27,7 @@ /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 -#define CONFIG_RD_LVL +#define CFG_RD_LVL #define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE #define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e706fba5e8fd..23d832894d3d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -172,7 +172,7 @@ CFG_QBMAN_CLK_DIV CFG_RAMBOOT_SPIFLASH CFG_RAMBOOT_TEXT_BASE CFG_RAMDISK_ADDR -CONFIG_RD_LVL +CFG_RD_LVL CONFIG_RESET_VECTOR_ADDRESS CONFIG_ROCKCHIP_SDHCI_MAX_FREQ CONFIG_ROOTPATH From patchwork Sun Nov 20 14:07:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706853 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=lTwMg+sm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXbP4nv2z23n6 for ; Mon, 21 Nov 2022 01:14:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D445853FA; Sun, 20 Nov 2022 15:09:51 +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="lTwMg+sm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75F6A85306; Sun, 20 Nov 2022 15:09:18 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 252AC852EC for ; Sun, 20 Nov 2022 15:09:12 +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-qv1-xf2a.google.com with SMTP id h7so5905928qvs.3 for ; Sun, 20 Nov 2022 06:09:05 -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=xpWtInSJwQZoEOPoHI/O+VYHUdhmT9vcu9XmSNR0glE=; b=lTwMg+smS+2R8sjqMgkdpVHiE4heghkjkJrZ8wXzKF3TpQrzo7vNN8KEmNSvS6VaJW Af3fA5y7LZJyLK5rTyNysQQ2hQ541uPvnEtOVfloawna7X2NDqp7sgzsgBsalj48qM81 OEr7sn8sl4j0LPb5GvNzRH/MBHwsNU/z6CWcA= 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=xpWtInSJwQZoEOPoHI/O+VYHUdhmT9vcu9XmSNR0glE=; b=t2owGrV3h4sm3sf116Buc17eH8WIp2ha63WUvt+svgGJSvSTpokXN4gqI1xW6kzBTH qVBgoo2PKwe3Untxbs087XpQMEba5Hk5AoCotlNbtjGs/TvEVghTZyg3r2rQ2X+wFF0m 2H3+I8c05Hr5a0MT5klC6p2MHgtt8/LY1i4zL7vXX0Pm6PsHQ9UBK3YsVOIg87a4uNtK LLCEx/u9FAkPHuL2LFxoKVRLw04xsVEEa1DTO0wRt3bw56lh9pu3Enn6cer/zTf+97+5 J9tckU3ScdJD1t/XvwvYHed1iABcqWISwmlhq9IMOHz6led7HGk4a+6OkV0a8TgU0Gun 37QQ== X-Gm-Message-State: ANoB5plOL3/kjsEj1AT3QT0/QM64j8Ie7pzIUqo9UOvicJnD/4xhCrkr p2bNIppffO8tXmL6uSvZRk8C6hZCsK2Xtg== X-Google-Smtp-Source: AA0mqf5B1NOJzcQBPynH7wISIslSSwJcHFPYh73IPiLgyJ1ATKOJn2YygtfXLLZeLpgLO+0eI5ekiw== X-Received: by 2002:a05:6214:1850:b0:4bb:6b68:9ab6 with SMTP id d16-20020a056214185000b004bb6b689ab6mr1732819qvy.128.1668953344420; Sun, 20 Nov 2022 06:09:04 -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.09.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 164/241] global: Migrate CONFIG_RESET_VECTOR_ADDRESS to CFG Date: Sun, 20 Nov 2022 09:07:54 -0500 Message-Id: <20221120140829.3057894-55-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/u-boot.lds | 4 ++-- arch/powerpc/dts/kmcent2-u-boot.dtsi | 2 +- arch/powerpc/dts/u-boot.dtsi | 6 +++--- board/freescale/p1_p2_rdb_pc/README | 2 +- board/freescale/p2041rdb/README | 2 +- board/freescale/t104xrdb/README | 2 +- board/freescale/t208xqds/README | 2 +- board/freescale/t208xrdb/README | 2 +- include/configs/P1010RDB.h | 8 ++++---- include/configs/P2041RDB.h | 8 ++++---- include/configs/T102xRDB.h | 10 +++++----- include/configs/T104xRDB.h | 8 ++++---- include/configs/T208xQDS.h | 10 +++++----- include/configs/T208xRDB.h | 10 +++++----- include/configs/T4240RDB.h | 8 ++++---- include/configs/kmcent2.h | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index f2361560e9ad..a4891bb558f6 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -935,7 +935,7 @@ config ARCH_T4240 imply FSL_SATA config MPC85XX_HAVE_RESET_VECTOR - bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc" + bool "Indicate reset vector at CFG_RESET_VECTOR_ADDRESS - 0xffc" depends on MPC85xx config BTB diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index fa3aa954cbb5..3af0dfdf336b 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -5,8 +5,8 @@ #include "config.h" -#ifdef CONFIG_RESET_VECTOR_ADDRESS -#define RESET_VECTOR_ADDRESS CONFIG_RESET_VECTOR_ADDRESS +#ifdef CFG_RESET_VECTOR_ADDRESS +#define RESET_VECTOR_ADDRESS CFG_RESET_VECTOR_ADDRESS #else #define RESET_VECTOR_ADDRESS 0xfffffffc #endif diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi index 28f303b749e9..53bac5533f24 100644 --- a/arch/powerpc/dts/kmcent2-u-boot.dtsi +++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi @@ -91,7 +91,7 @@ align = <256>; }; powerpc-mpc85xx-bootpg-resetvec { - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; + offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>; }; }; }; diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi index b4b5257362e5..6b7375cff215 100644 --- a/arch/powerpc/dts/u-boot.dtsi +++ b/arch/powerpc/dts/u-boot.dtsi @@ -23,11 +23,11 @@ u-boot-dtb-with-ucode { align = <4>; }; -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif powerpc-mpc85xx-bootpg-resetvec { - offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>; + offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>; }; }; }; diff --git a/board/freescale/p1_p2_rdb_pc/README b/board/freescale/p1_p2_rdb_pc/README index f542decec79b..fd849bfc29a2 100644 --- a/board/freescale/p1_p2_rdb_pc/README +++ b/board/freescale/p1_p2_rdb_pc/README @@ -57,7 +57,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="p1020rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot. diff --git a/board/freescale/p2041rdb/README b/board/freescale/p2041rdb/README index 96612daeeb11..ae7702773723 100644 --- a/board/freescale/p2041rdb/README +++ b/board/freescale/p2041rdb/README @@ -98,7 +98,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="p2041rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc CPLD command ============ diff --git a/board/freescale/t104xrdb/README b/board/freescale/t104xrdb/README index e90dca416639..f312e6a3e32b 100644 --- a/board/freescale/t104xrdb/README +++ b/board/freescale/t104xrdb/README @@ -379,7 +379,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot. diff --git a/board/freescale/t208xqds/README b/board/freescale/t208xqds/README index 63953d6b9b66..0d80c6901fb2 100755 --- a/board/freescale/t208xqds/README +++ b/board/freescale/t208xqds/README @@ -285,7 +285,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="t2080qds" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot. diff --git a/board/freescale/t208xrdb/README b/board/freescale/t208xrdb/README index 60551f6723e6..533054bfe192 100644 --- a/board/freescale/t208xrdb/README +++ b/board/freescale/t208xrdb/README @@ -281,7 +281,7 @@ enabled in relative defconfig file, 1. CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" (Change default device tree name if required) 2. CONFIG_OF_CONTROL 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at - CONFIG_RESET_VECTOR_ADDRESS - 0xffc + CFG_RESET_VECTOR_ADDRESS - 0xffc If device tree support is enabled in defconfig, 1. use 'u-boot.bin' for NOR boot. diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 1fa0b38ae201..eff275a5ada6 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -25,7 +25,7 @@ #ifdef CONFIG_SPIFLASH #ifdef CONFIG_NXP_ESBC #define CFG_RAMBOOT_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc +#define CFG_RESET_VECTOR_ADDRESS 0x110bfffc #else #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 10) #define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) @@ -53,11 +53,11 @@ #endif #ifdef CONFIG_NAND_SECBOOT /* NAND Boot */ -#define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc +#define CFG_RESET_VECTOR_ADDRESS 0x110bfffc #endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif /* High Level Configuration Options */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index f4cf43e7100d..8cfa01135ffe 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -13,7 +13,7 @@ #ifdef CONFIG_RAMBOOT_PBL #define CFG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE @@ -21,13 +21,13 @@ #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif /* High Level Configuration Options */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c61d086dbe57..9940eae0a36d 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -28,7 +28,7 @@ #endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000) #define CFG_SYS_SPI_FLASH_U_BOOT_START (0x30000000) @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC #define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CFG_SYS_MMC_U_BOOT_DST (0x30000000) #define CFG_SYS_MMC_U_BOOT_START (0x30000000) @@ -45,8 +45,8 @@ #endif /* CONFIG_RAMBOOT_PBL */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif /* @@ -87,7 +87,7 @@ #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif /* diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index bae6742928e3..cd7a085b8b8c 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -35,7 +35,7 @@ #endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000) #define CFG_SYS_SPI_FLASH_U_BOOT_START (0x30000000) @@ -43,7 +43,7 @@ #endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC +#define CFG_RESET_VECTOR_ADDRESS 0x30000FFC #define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CFG_SYS_MMC_U_BOOT_DST (0x30000000) #define CFG_SYS_MMC_U_BOOT_START (0x30000000) @@ -54,8 +54,8 @@ /* High Level Configuration Options */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index d9841397fb6b..b0ded3647212 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -30,7 +30,7 @@ #endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000) #define CFG_SYS_SPI_FLASH_U_BOOT_START (0x00200000) @@ -38,7 +38,7 @@ #endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC #define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CFG_SYS_MMC_U_BOOT_DST (0x00200000) #define CFG_SYS_MMC_U_BOOT_START (0x00200000) @@ -52,11 +52,11 @@ #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif /* diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 9e38d5e9f3a2..e2c04d121edc 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -30,7 +30,7 @@ #endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CFG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000) #define CFG_SYS_SPI_FLASH_U_BOOT_START (0x00200000) @@ -38,7 +38,7 @@ #endif #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC #define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CFG_SYS_MMC_U_BOOT_DST (0x00200000) #define CFG_SYS_MMC_U_BOOT_START (0x00200000) @@ -52,11 +52,11 @@ #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif /* diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index c3a04a766abd..772db525bf81 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -17,13 +17,13 @@ #ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD #define CFG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE -#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc #else #define RESET_VECTOR_OFFSET 0x27FFC #define BOOT_PAGE_OFFSET 0x27000 #ifdef CONFIG_SDCARD -#define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC +#define CFG_RESET_VECTOR_ADDRESS 0x200FFC #define CFG_SYS_MMC_U_BOOT_SIZE (768 << 10) #define CFG_SYS_MMC_U_BOOT_DST 0x00200000 #define CFG_SYS_MMC_U_BOOT_START 0x00200000 @@ -35,8 +35,8 @@ /* High Level Configuration Options */ -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index b64651527202..aa3112d94e0e 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -134,7 +134,7 @@ /* High Level Configuration Options */ -#define CONFIG_RESET_VECTOR_ADDRESS 0xebfffffc +#define CFG_RESET_VECTOR_ADDRESS 0xebfffffc #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 1e66d609d68d..7be07b5f43d5 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -105,8 +105,8 @@ #endif /* not CONFIG_TPL_BUILD */ #endif -#ifndef CONFIG_RESET_VECTOR_ADDRESS -#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#ifndef CFG_RESET_VECTOR_ADDRESS +#define CFG_RESET_VECTOR_ADDRESS 0xeffffffc #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 23d832894d3d..bd4936d08ada 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -173,7 +173,7 @@ CFG_RAMBOOT_SPIFLASH CFG_RAMBOOT_TEXT_BASE CFG_RAMDISK_ADDR CFG_RD_LVL -CONFIG_RESET_VECTOR_ADDRESS +CFG_RESET_VECTOR_ADDRESS CONFIG_ROCKCHIP_SDHCI_MAX_FREQ CONFIG_ROOTPATH CONFIG_SANDBOX_ARCH From patchwork Sun Nov 20 14:07:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706858 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=VEPm4CTt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXcS0PMFz23mR for ; Mon, 21 Nov 2022 01:15:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1590585416; Sun, 20 Nov 2022 15:09:57 +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="VEPm4CTt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B802C852BA; Sun, 20 Nov 2022 15:09:22 +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-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 CF79D852F3 for ; Sun, 20 Nov 2022 15:09:12 +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-qk1-x72f.google.com with SMTP id i9so6516112qki.10 for ; Sun, 20 Nov 2022 06:09:06 -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=J4rjYgbq1GqAdLBBV6hI2Sf4bZS6x9XBj7mh+NSn3Dc=; b=VEPm4CTt9cQfTpxdgBgMg3gskcZTC9iuLPQPIICVWorLXr48Iiac/gqCMw0hGpEf3L srK+5vLyEozzuqF44GTtM8zYtPHKaQ2CTWrmL1WplSlTS4wCym0NVrjpUAx5fhDDiz2y dUOd1Vg6fIHI/YS17bjMxtHt5mAoJFxwxpYBk= 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=J4rjYgbq1GqAdLBBV6hI2Sf4bZS6x9XBj7mh+NSn3Dc=; b=Gg9jAjSNSf2voJ6tcXzlNQa6c8ausxTVKxhyiqZKYdWCohRkAlSckfteEphP4hGR2K tHW14Zlg/tkqOwTu1rCcoGU+HZ0tNlgC7sG6sTZ3Zq5oISt7jfpFItB8i6M7J8raASSH 6RE1zXhEv7+9Xi7D1W55isKvVkpmJtvRK5Cu4v4j+UeenGDR1Jy0G1szIGRqbxnOZlaP 3P7uQPNs2pJmKf4MOhkPvCztrVPdcWK+sUwRlYSPEK47LQGNdGrZCGGdnkHulyqXIZIu ObWMvXaqcZj8+DXRx5fUwey3fO/4nWAyCKq0kAQ0NQj/OqtyDTX4jut9BkwgqrsxQ8pe isjg== X-Gm-Message-State: ANoB5pl7cozMA7dO2L/MsM1QjNwdWslktJUl5hqwhWO4R9VL8zMxB+gL uSiMd83l2l3AVVzRKcwkF/vGLH36bW2haA== X-Google-Smtp-Source: AA0mqf6u8tLEYQULmi/9yeb8XHciioRP+piu/zC89A417DPDmqtA7gKVAHSGvA+KBZvkOVu2HE7UhA== X-Received: by 2002:a05:620a:e1c:b0:6fb:a5cc:208a with SMTP id y28-20020a05620a0e1c00b006fba5cc208amr13098394qkm.231.1668953346298; Sun, 20 Nov 2022 06:09:06 -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.09.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:05 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 167/241] global: Migrate CONFIG_SANDBOX_ARCH to CFG Date: Sun, 20 Nov 2022 09:07:57 -0500 Message-Id: <20221120140829.3057894-58-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/sandbox/include/asm/config.h | 2 +- drivers/adc/adc-uclass.c | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sandbox/include/asm/config.h b/arch/sandbox/include/asm/config.h index 50215b35d777..0adb6978451c 100644 --- a/arch/sandbox/include/asm/config.h +++ b/arch/sandbox/include/asm/config.h @@ -6,7 +6,7 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ -#define CONFIG_SANDBOX_ARCH +#define CFG_SANDBOX_ARCH /* Used by drivers/spi/sandbox_spi.c and arch/sandbox/include/asm/state.h */ #ifndef CONFIG_SANDBOX_SPI_MAX_BUS diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 67137ffb3414..67289bb1acae 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -22,7 +22,7 @@ #define CHECK_MASK (!CHECK_NUMBER) /* TODO: add support for timer uclass (for early calls) */ -#ifdef CONFIG_SANDBOX_ARCH +#ifdef CFG_SANDBOX_ARCH #define sdelay(x) udelay(x) #else extern void sdelay(unsigned long loops); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 332b5493d30d..c9e0703f52a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -176,7 +176,7 @@ CFG_RD_LVL CFG_RESET_VECTOR_ADDRESS CFG_ROCKCHIP_SDHCI_MAX_FREQ CFG_ROOTPATH -CONFIG_SANDBOX_ARCH +CFG_SANDBOX_ARCH CONFIG_SANDBOX_SDL CONFIG_SANDBOX_SPI_MAX_BUS CONFIG_SANDBOX_SPI_MAX_CS From patchwork Sun Nov 20 14:07:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706885 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=QiHmSLbH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXkH3VNWz23lt for ; Mon, 21 Nov 2022 01:20:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2B91485341; Sun, 20 Nov 2022 15:14:04 +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="QiHmSLbH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 325B58548E; Sun, 20 Nov 2022 15:12:15 +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-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 9D684853A9 for ; Sun, 20 Nov 2022 15:09:45 +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-qk1-x731.google.com with SMTP id z1so6527612qkl.9 for ; Sun, 20 Nov 2022 06:09:45 -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=uHzMCZMbNaKvfcrUAE5xzgV8acyZ0ATa1g9ssLFgLY8=; b=QiHmSLbHj8GohSxhebsVpkLTvkiJtQzpVehDOWfmlhUCdHE3B3pv17BubH81A18IEQ ZMpeeYSmofgU4aLlOKP/+0BVZ4NAGHApazU3CFpA516MRQenP7W5lknSJ1g36GPWBo6M wjheHzyy7KU0HIRJKS/PHbAFVD11oamjpcDW0= 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=uHzMCZMbNaKvfcrUAE5xzgV8acyZ0ATa1g9ssLFgLY8=; b=3Fyn48Q0pa8ZfpFNPhWCss9BcqavQcpoDb5Dj1rBm5yEJN1mQdhQasG4W2LDb+X2of hjpZW6hJq0XTTdoNH5UNWJvxf0nEpEWwuVm2btVl2s0J49P1L8yyv67kOr9EU8OAxrAJ tqhhoo01SYMgoCEb/d+ZF0/Axuzy+bIgWWV0FlAuvGLCFQJq5jTowmSE1eLphR58w24i kOjPHUIwu0ZmMfJ5XF3TrrpVcYv0L1L2D86eWRnlFnWhUbH/2NPRughOfRCezp6/2EvS 2fp9VaGv4IeWNHYc+YUkf+xFVdQm/YRhBB6KON5bTEuFKaA9PWQQJfBqsEmJFWUIkz3f oDSQ== X-Gm-Message-State: ANoB5plcdhWeGUlpB+fw0XOl3o24d4vHqEuFy6G99B/ITes/Tp/R64mf Tllpwl+4+nKO+GSL/3Bz6fEYCP9cTM1ofg== X-Google-Smtp-Source: AA0mqf5wTK9lIXiAe/mBb5qUUOWgqX/l5nXtAwVFKo5j1HnZ5cImWIaWXnzavJbbpbHRbgi4QUgBDA== X-Received: by 2002:a05:620a:a52:b0:6ec:5107:82fe with SMTP id j18-20020a05620a0a5200b006ec510782femr12992783qka.151.1668953347600; Sun, 20 Nov 2022 06:09:07 -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.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:07 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 169/241] global: Migrate CONFIG_SANDBOX_SPI_MAX_CS to CFG Date: Sun, 20 Nov 2022 09:07:59 -0500 Message-Id: <20221120140829.3057894-60-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/sandbox/include/asm/config.h | 4 ++-- arch/sandbox/include/asm/state.h | 2 +- drivers/spi/sandbox_spi.c | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/sandbox/include/asm/config.h b/arch/sandbox/include/asm/config.h index 36833987330c..2ffe94f10bc8 100644 --- a/arch/sandbox/include/asm/config.h +++ b/arch/sandbox/include/asm/config.h @@ -12,8 +12,8 @@ #ifndef CFG_SANDBOX_SPI_MAX_BUS #define CFG_SANDBOX_SPI_MAX_BUS 1 #endif -#ifndef CONFIG_SANDBOX_SPI_MAX_CS -#define CONFIG_SANDBOX_SPI_MAX_CS 10 +#ifndef CFG_SANDBOX_SPI_MAX_CS +#define CFG_SANDBOX_SPI_MAX_CS 10 #endif #endif diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index ada85be5cb1a..e99a7d04e8da 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -99,7 +99,7 @@ struct sandbox_state { /* Pointer to information for each SPI bus/cs */ struct sandbox_spi_info spi[CFG_SANDBOX_SPI_MAX_BUS] - [CONFIG_SANDBOX_SPI_MAX_CS]; + [CFG_SANDBOX_SPI_MAX_CS]; /* Information about Watchdog */ struct sandbox_wdt_info wdt; diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c index 0c645904da14..0065a5c65755 100644 --- a/drivers/spi/sandbox_spi.c +++ b/drivers/spi/sandbox_spi.c @@ -90,7 +90,7 @@ static int sandbox_spi_xfer(struct udevice *slave, unsigned int bitlen, busnum = dev_seq(bus); cs = spi_chip_select(slave); if (busnum >= CFG_SANDBOX_SPI_MAX_BUS || - cs >= CONFIG_SANDBOX_SPI_MAX_CS) { + cs >= CFG_SANDBOX_SPI_MAX_CS) { printf("%s: busnum=%u, cs=%u: out of range\n", __func__, busnum, cs); return -ENOENT; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 815d8f8f12ba..7af096ee8f63 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -178,7 +178,7 @@ CFG_ROCKCHIP_SDHCI_MAX_FREQ CFG_ROOTPATH CFG_SANDBOX_ARCH CFG_SANDBOX_SPI_MAX_BUS -CONFIG_SANDBOX_SPI_MAX_CS +CFG_SANDBOX_SPI_MAX_CS CONFIG_SAR2_REG CONFIG_SAR_REG CONFIG_SCIF_A From patchwork Sun Nov 20 14:08:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706856 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=eyzonw4d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXc11yFNz23mR for ; Mon, 21 Nov 2022 01:15:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FC188540C; Sun, 20 Nov 2022 15:09:55 +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="eyzonw4d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E9E7F852ED; Sun, 20 Nov 2022 15:09:20 +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-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 4C9C1852EA for ; Sun, 20 Nov 2022 15:09:12 +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-qv1-xf29.google.com with SMTP id p8so5844721qvn.5 for ; Sun, 20 Nov 2022 06:09:08 -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=rmYhVJ4RfPc452q1XIZZvp3cgsDVjevjzv8uNUQ4rWo=; b=eyzonw4dBm3SYct0FoxX65D4Ac5We4Dhcgur+0egK0izDjp0cQZ6y6mbgrOeuVqo7g HucxsMdvzF1v4na9VTLT85+THTUdrxcNrKlRxXO4RPiuC1INfJLBi3GshkrKmqZVSmHx apX8hdOTKb1ckhl5wT79esFeJ2zdEvZjndH4g= 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=rmYhVJ4RfPc452q1XIZZvp3cgsDVjevjzv8uNUQ4rWo=; b=x6U0QaUlj2KxvIJpo9RmGCjasqRMhQrWYRcH67sB+hBsK/Y85NXRIANyU6+Duydob/ dS/LVn1uCZAtfZX8TP3an05uBhtj1lSibFfvYmXNu6M46x4FasbumZR67ctGtAp61b9T J5kRYGHU8LciMr/gF+r5C9ymcnhr6S8arArx97kkKps8bgmKEgmM5ADpnYId8PoLKZRW eb4vrUAf4qWQAnVwYgXGOlUjHTUhW73ZEfHnuNVkYH5wnY3r8TCO7J9b5GWnM7TSatnD NIHOw+fccgEY/Zsz5gXlPjFAAH4jhKR0YeGD7ClQJOXxtaDoiwmZAJWaATndgqN4PTKA 2rTA== X-Gm-Message-State: ANoB5plYLRVxTWPVKF3CpNlBuSApNJ748jQkxwsBe1r0HkXyRh5g0Ims 12BC38YSfcbHCEWnhryDvpXbT67mYfrUOA== X-Google-Smtp-Source: AA0mqf6cuR/lEG4Fmyo9VemN0bsbeUFisIHicNmxl3Nb+96TFxwE/rc3LRL+AFwuE3zQSc/HdIYBIw== X-Received: by 2002:a05:6214:a0f:b0:4b7:b387:b63d with SMTP id dw15-20020a0562140a0f00b004b7b387b63dmr13787902qvb.83.1668953348280; Sun, 20 Nov 2022 06:09:08 -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.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:07 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 170/241] global: Migrate CONFIG_SAR2_REG to CFG Date: Sun, 20 Nov 2022 09:08:00 -0500 Message-Id: <20221120140829.3057894-61-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-mvebu/cpu.c | 4 ++-- arch/arm/mach-mvebu/include/mach/soc.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 67ad5e5907be..9139df1ae248 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -195,7 +195,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq) int i; #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS) - val = readl(CONFIG_SAR2_REG); /* SAR - Sample At Reset */ + val = readl(CFG_SAR2_REG); /* SAR - Sample At Reset */ #else val = readl(CONFIG_SAR_REG); /* SAR - Sample At Reset */ #endif @@ -205,7 +205,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq) * Shift CPU0 clock frequency select bit from SAR2 register * into correct position */ - freq |= ((readl(CONFIG_SAR2_REG) & SAR2_CPU_FREQ_MASK) + freq |= ((readl(CFG_SAR2_REG) & SAR2_CPU_FREQ_MASK) >> SAR2_CPU_FREQ_OFFS) << 3; #endif for (i = 0; sar_freq_tab[i].val != 0xff; i++) { diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index e6383d4a86e2..1210d26c7461 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -135,7 +135,7 @@ #if defined(CONFIG_ARMADA_375) /* SAR values for Armada 375 */ #define CONFIG_SAR_REG (MVEBU_REGISTER(0xe8200)) -#define CONFIG_SAR2_REG (MVEBU_REGISTER(0xe8204)) +#define CFG_SAR2_REG (MVEBU_REGISTER(0xe8204)) #define SAR_CPU_FREQ_OFFS 17 #define SAR_CPU_FREQ_MASK (0x1f << SAR_CPU_FREQ_OFFS) @@ -174,7 +174,7 @@ #elif defined(CONFIG_ARMADA_MSYS) /* SAR values for MSYS */ #define CONFIG_SAR_REG (MBUS_DFX_BASE + 0xf8200) -#define CONFIG_SAR2_REG (MBUS_DFX_BASE + 0xf8204) +#define CFG_SAR2_REG (MBUS_DFX_BASE + 0xf8204) #define SAR_CPU_FREQ_OFFS 18 #define SAR_CPU_FREQ_MASK (0x7 << SAR_CPU_FREQ_OFFS) @@ -192,7 +192,7 @@ #elif defined(CONFIG_ARMADA_XP) /* SAR values for Armada XP */ #define CONFIG_SAR_REG (MVEBU_REGISTER(0x18230)) -#define CONFIG_SAR2_REG (MVEBU_REGISTER(0x18234)) +#define CFG_SAR2_REG (MVEBU_REGISTER(0x18234)) #define SAR_CPU_FREQ_OFFS 21 #define SAR_CPU_FREQ_MASK (0x7 << SAR_CPU_FREQ_OFFS) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7af096ee8f63..ed50a507f270 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -179,7 +179,7 @@ CFG_ROOTPATH CFG_SANDBOX_ARCH CFG_SANDBOX_SPI_MAX_BUS CFG_SANDBOX_SPI_MAX_CS -CONFIG_SAR2_REG +CFG_SAR2_REG CONFIG_SAR_REG CONFIG_SCIF_A CONFIG_SCSI_DEV_LIST From patchwork Sun Nov 20 14:08:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706886 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=QtVtK/qm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXkV5Ly2z23lt for ; Mon, 21 Nov 2022 01:21:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 37DA28538A; Sun, 20 Nov 2022 15:14:05 +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="QtVtK/qm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 606688539E; Sun, 20 Nov 2022 15:12:13 +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-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 A3290853A1 for ; Sun, 20 Nov 2022 15:09:45 +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-qk1-x72a.google.com with SMTP id 8so6547966qka.1 for ; Sun, 20 Nov 2022 06:09:45 -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=eCIZSgQIW0dDeeNd0ttRFT955ruQ1KAYrbvugalsIdI=; b=QtVtK/qmZC/XSX8T+7ZpSLl+dU9eC4yMnrOQJpMLXdJoNEqZbL4/BeKinI2qlps7VJ Xb6M3EXP/or8AMxr8Cvb80epcNYeGJN0I7K3a4l8RxbWipkCehCo+RKk7bYQBlrh0ptV Ae1vvIVH9HUWvpo1XBH3/asDh7C0wH3Wi9o+8= 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=eCIZSgQIW0dDeeNd0ttRFT955ruQ1KAYrbvugalsIdI=; b=KxvHYQ/K6vJec4xZwbckDoIRKP87ipBbCA7Ldm+JmdxIKwgX+7vTMdZLAmZuaStxOL xrvOggtgrzexG2zb6Bf2BzSA6MxQyajtkodDx5htAn+sR9JkuouO7TKKyuFLGrH/bDdk AmJQnBk7Dghw8wNqo8YIgGRinTsSTCOP87CU0MgdW1HdWIjXB3nSb1Im3Xcs1DEjCTgg A5s7TY2al+eRwXJVXWsMz/XYunhoJMJXfUCR/uoqBvs0m4DIwtcfHG/AdqFh95WnbXAT 9+rHc7VDbbif2W6433Sog72FYExs3HZm8kH14dTTZhLBs00CCBtjBMdYNY4bJDwbw4lA I52Q== X-Gm-Message-State: ANoB5pnF0qvC5VPkAMfdXN7fhXOW728mg2zjRe+gX7H5XyWEzKU+nQ0o f4tY2NuxcRTSgkR1T7dq2I9aRzNqNDnCEg== X-Google-Smtp-Source: AA0mqf5C5ageH2Yf0WJaDJbhJGfTAWs4P6yX/xuPhmPTVndacc59JgwNuQMqxRjuZyynjPF5n8YyHA== X-Received: by 2002:a37:af05:0:b0:6fa:da64:4879 with SMTP id y5-20020a37af05000000b006fada644879mr238848qke.312.1668953349647; Sun, 20 Nov 2022 06:09:09 -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.09.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 172/241] global: Migrate CONFIG_SCIF_A to CFG Date: Sun, 20 Nov 2022 09:08:02 -0500 Message-Id: <20221120140829.3057894-63-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/serial/serial_sh.c | 2 +- drivers/serial/serial_sh.h | 8 ++++---- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index e6c23cedff11..4671217b59a0 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -274,7 +274,7 @@ U_BOOT_DRIVER(serial_sh) = { # error "Default SCIF doesn't set....." #endif -#if defined(CONFIG_SCIF_A) +#if defined(CFG_SCIF_A) #define SCIF_BASE_PORT PORT_SCIFA #elif defined(CONFIG_SCI) #define SCIF_BASE_PORT PORT_SCI diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index 11deaa951168..e6ab6f1b9b76 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -92,7 +92,7 @@ struct uart_port { # define SCIF_ORER 0x0001 /* overrun error bit */ #elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) || \ defined(CONFIG_R7S72100) -# if defined(CONFIG_SCIF_A) +# if defined(CFG_SCIF_A) # define SCIF_ORER 0x0200 # else # define SCIF_ORER 0x0001 @@ -164,7 +164,7 @@ struct uart_port { # define SCIF2_TXROOM_MAX 16 #elif defined(CONFIG_RCAR_GEN2) # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK) -# if defined(CONFIG_SCIF_A) +# if defined(CFG_SCIF_A) # define SCIF_RFDC_MASK 0x007f # else # define SCIF_RFDC_MASK 0x001f @@ -380,7 +380,7 @@ SCIF_FNS(SCFDR, 0, 0, 0x1C, 16) SCIF_FNS(SCSPTR, 0, 0, 0x20, 16) SCIF_FNS(DL, 0, 0, 0x30, 16) SCIF_FNS(CKS, 0, 0, 0x34, 16) -#if defined(CONFIG_SCIF_A) +#if defined(CFG_SCIF_A) SCIF_FNS(SCLSR, 0, 0, 0x14, 16) #else SCIF_FNS(SCLSR, 0, 0, 0x24, 16) @@ -491,7 +491,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk) #define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk) #elif defined(CONFIG_RCAR_GEN2) #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */ - #if defined(CONFIG_SCIF_A) + #if defined(CFG_SCIF_A) #define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */ #else #define SCBRR_VALUE(bps, clk) (clk / bps / 32 - 1) /* Internal Clock */ diff --git a/include/configs/stout.h b/include/configs/stout.h index 5058e0a204d7..be9013bcf93d 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -23,7 +23,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) /* SCIF */ -#define CONFIG_SCIF_A +#define CFG_SCIF_A /* SPI */ #define CONFIG_SPI_FLASH_QUAD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bdb3b68f8c80..d77171c2c553 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -181,7 +181,7 @@ CFG_SANDBOX_SPI_MAX_BUS CFG_SANDBOX_SPI_MAX_CS CFG_SAR2_REG CFG_SAR_REG -CONFIG_SCIF_A +CFG_SCIF_A CONFIG_SCSI_DEV_LIST CONFIG_SC_TIMER_CLK CONFIG_SERIAL_BOOT From patchwork Sun Nov 20 14:08:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706857 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=k8kNh+P6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXcF1JnDz23mR for ; Mon, 21 Nov 2022 01:15:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EA3D85412; Sun, 20 Nov 2022 15:09:56 +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="k8kNh+P6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 81530852EA; Sun, 20 Nov 2022 15:09:21 +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-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 E3769852F5 for ; Sun, 20 Nov 2022 15:09:12 +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-qk1-x733.google.com with SMTP id d7so6529078qkk.3 for ; Sun, 20 Nov 2022 06:09:11 -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=lfe6xnZVVaBpju/+PRKuUXdhbDWD5oEzhFZGtS6hMaM=; b=k8kNh+P69AaE/F8VsI7PvDdVTdL2iOXSRULWzg5/DMogOiYPe7YFbxYeN87r1zOo9F bkcebaPHIX3PtONKSEItubiyVlAreIPvNUryUbAM1IKFxGCSIAaicZrjLTqSFPJY1t/k N4N/Tg6UY/PDOhoGi5AlSXyh+zARTmZwpPSdg= 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=lfe6xnZVVaBpju/+PRKuUXdhbDWD5oEzhFZGtS6hMaM=; b=vU/49qMpkzgmnSPJmQmsE4svq3eXBNKdX+f0TeCY01AyoAiQ5G6YwJxssVL+ZMVgbD 8egejITWUJkhiISeU6TjLb0AXp1pjEIEidGUFvK6j2WWJeNBpJ8q2cjvPqHc9pJkh1nH OMCcUmWF1yYB9y6ZAgIEz2Lhcb8mnD3mVufUw+CYYCYfCzbp6j3EYQE05X4fs3aOA5Pb 1tgLOzvQc7PlIah/7uzGxxCp/xvOmKIpMz5CZYjH7BvLCzrJDGrzq72o9j4YXU8nb/iv n862/T/lqYGHlL50Izi6Gfbf37pBR4+rH59h34dgreqfQPmuUxlhXSRq5ikqKfa4bkRZ 2a/A== X-Gm-Message-State: ANoB5pkYTi4ApURNYbKz59/NlLGfF9pBSeu79SGI6laGWkLfMutZJo17 jNUKNRGf1XEwEN/goDrmV2JCzLgf3E/puA== X-Google-Smtp-Source: AA0mqf5GKLvm463lNHkHNkF0VatPsSjzBcMSVXNxBVX6nH7vfOapVBKxT25YiQCkpuT0xyDSzQ4lxw== X-Received: by 2002:a05:620a:a0e:b0:6f8:ab99:6c50 with SMTP id i14-20020a05620a0a0e00b006f8ab996c50mr13110293qka.639.1668953350702; Sun, 20 Nov 2022 06:09:10 -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.09.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 173/241] global: Migrate CONFIG_SCSI_DEV_LIST to CFG Date: Sun, 20 Nov 2022 09:08:03 -0500 Message-Id: <20221120140829.3057894-64-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/scsi/scsi.c | 4 ++-- include/configs/ls1021aiot.h | 2 +- include/configs/ls1028ardb.h | 2 +- include/configs/ls1043ardb.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 3e769b0843f0..a020a7da23a5 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -18,8 +18,8 @@ #include #if !defined(CONFIG_DM_SCSI) -# ifdef CONFIG_SCSI_DEV_LIST -# define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST +# ifdef CFG_SCSI_DEV_LIST +# define SCSI_DEV_LIST CFG_SCSI_DEV_LIST # else # ifdef CONFIG_SATA_ULI5288 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index cc6d07b40620..d6122856f069 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -61,7 +61,7 @@ #ifndef PCI_DEVICE_ID_FREESCALE_AHCI #define PCI_DEVICE_ID_FREESCALE_AHCI 0x0440 #endif -#define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ +#define CFG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ PCI_DEVICE_ID_FREESCALE_AHCI} /* SPI */ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 8c53636beac3..ee4f885c5341 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -52,7 +52,7 @@ /* SATA */ #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 -#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} /* Initial environment variables */ #ifndef SPL_NO_ENV diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index ec81b3ca5b36..da84e517b127 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -210,7 +210,7 @@ #ifndef SPL_NO_SATA #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 -#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} +#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #endif #include diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d77171c2c553..179d6918cd64 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -182,7 +182,7 @@ CFG_SANDBOX_SPI_MAX_CS CFG_SAR2_REG CFG_SAR_REG CFG_SCIF_A -CONFIG_SCSI_DEV_LIST +CFG_SCSI_DEV_LIST CONFIG_SC_TIMER_CLK CONFIG_SERIAL_BOOT CONFIG_SERVERIP From patchwork Sun Nov 20 14:08:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706862 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=H/0E9g0H; 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 4NFXdG5sSNz23mR for ; Mon, 21 Nov 2022 01:16:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3FEB85427; Sun, 20 Nov 2022 15:10:00 +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="H/0E9g0H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D2BEF852F7; Sun, 20 Nov 2022 15:09:25 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 52388852FA for ; Sun, 20 Nov 2022 15:09:12 +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-qk1-x734.google.com with SMTP id s20so6541739qkg.5 for ; Sun, 20 Nov 2022 06:09:11 -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=5BTRKrQZ73hMf83hO5kPsKrdC5Lzk0Gd5ZubPeT6Ifg=; b=H/0E9g0HDFp4axberVDk/ConiG1o38X1nOCl8tFffU23y8hFJBPwfSKlGdgROH4KaN vZDGbNzPRDRw1wK3AHy8FSHVWysQB5amasCQKdZgPbd/iU2wG6vialJPMR25ZbRLaGAS kqNmpjrrGdRy0Uz7lp2gP+e5peQBpO40Oe4JA= 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=5BTRKrQZ73hMf83hO5kPsKrdC5Lzk0Gd5ZubPeT6Ifg=; b=KPyllGr1Ynicg2jDEhlZKZhDZx+rUA7DOTzIayo4I1kYAqBHLtv4FQjkeR1CboClQL S6YNKrN65TRDV9mccf2NGnH1KFYpTu6ADq+lsZgO/gQmjca55fN42t8R0U9JRgteORmV 0HSxLXQ/AqgLQnlBlO9a5x3q7h0ffr8xAjon+363z3RXOfhnvM2TjPTk1wJCKUrLsV6L RcNK9gYK50zYEWGcLtc25q+wjLZEZDZS5pg4DEXxcNZdlsCSiXnkKT1oNt+usrWmcbQB X6yRb4DkaJukqUCcyKCmYxsxxi1vBKzVWZ1d13cOeOI1I8LQItJ27xyI42bJOGeZZ6W/ NOIA== X-Gm-Message-State: ANoB5plDVr8eRc8X484XPnU2Bd60ksWt1+Ajq5yR9Iw+JFcsWYttmOJK hAWieMCXA4JDIQZjNLZFjZn3b1TMec/4Aw== X-Google-Smtp-Source: AA0mqf6MS4mpM8cuQoSEgMKekjIU4q+WEPp1E55Ae7U44NDXudI3Kl6EXeRw93dgpnn8/gX+Ag1EoA== X-Received: by 2002:a05:620a:2705:b0:6f9:26a0:5333 with SMTP id b5-20020a05620a270500b006f926a05333mr12964710qkp.2.1668953351361; Sun, 20 Nov 2022 06:09:11 -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.09.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:10 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 174/241] global: Migrate CONFIG_SC_TIMER_CLK to CFG Date: Sun, 20 Nov 2022 09:08:04 -0500 Message-Id: <20221120140829.3057894-65-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-imx/syscounter.c | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx7_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index df478a232637..129efac6fa69 100644 --- a/arch/arm/mach-imx/syscounter.c +++ b/arch/arm/mach-imx/syscounter.c @@ -65,7 +65,7 @@ int timer_init(void) struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR; unsigned long val, freq; - freq = CONFIG_SC_TIMER_CLK; + freq = CFG_SC_TIMER_CLK; asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq)); writel(freq, &sctr->cntfid0); diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 1e99cdc7df4d..8129be9e88ea 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -9,7 +9,7 @@ #include #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) -#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */ #else #ifndef CONFIG_SYS_L2CACHE_OFF #define CFG_SYS_PL310_BASE L2_PL310_BASE diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 3a5917fed4b8..dfba95b769cc 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -15,7 +15,7 @@ /* Timer settings */ #define CFG_MXC_GPT_HCLK -#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ +#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */ /* Miscellaneous configurable options */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 179d6918cd64..b45fcaa9432c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -183,7 +183,7 @@ CFG_SAR2_REG CFG_SAR_REG CFG_SCIF_A CFG_SCSI_DEV_LIST -CONFIG_SC_TIMER_CLK +CFG_SC_TIMER_CLK CONFIG_SERIAL_BOOT CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG From patchwork Sun Nov 20 14:08:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706884 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=ecA/yNUd; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXk465pnz23lt for ; Mon, 21 Nov 2022 01:20:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CECE852F8; Sun, 20 Nov 2022 15:14:03 +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="ecA/yNUd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6871C853A9; Sun, 20 Nov 2022 15:12:15 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 A4026853A4 for ; Sun, 20 Nov 2022 15:09:45 +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-qv1-xf2a.google.com with SMTP id k2so5317335qvo.1 for ; Sun, 20 Nov 2022 06:09:45 -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=T0FB8L5xcImd+/SZoVSNx/kwWqIzlznn6o9ddWf+m5g=; b=ecA/yNUdexWDMy9i6nAy9bDQQt0/8X5am406vU4PkkrM7vH1F9FfC1Txvio7T3aDuC IA0pLOGaQGp+er7M0/PmtLre6EvS2gQJyBG3Jq1bNxKuQrs/1ZrD5v3qLfoNzcScmKo8 lgMITftu2xi5Z7mnlyE5l4Q9bku2xtsNhAbnE= 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=T0FB8L5xcImd+/SZoVSNx/kwWqIzlznn6o9ddWf+m5g=; b=JHuIL9CbMV+QVjexZmj8+HUyNhRBzV7hxhweMZy9cxJZ4D1k99b5hL5AVF00H42Sh8 LqMTATejbSQ8veox/VPAUJGtVae3H8lfjk9neVFvTVdfcMs+DUCDp+AUKebZ5jgndcMS iXbP5m+wK4KrBHG0kMQULON/4BmxSdxfBMkUPxgiNW9Z8CLp2ASMIhrX9X+fx1YYD1/V 6/ml+YGw42qaUIUit15nT6Pjz//sAmFNVfvyV3gCBREPVlIWm7kW5CoXoe1hwequfYfL EXsWwnXDNe+RF/dodGStf6/xXE/SKQ/yVmpCHxs6Vhb2oCpJJ+BIVa7xfGka9sKa/JNp eGwQ== X-Gm-Message-State: ANoB5pntijPmEpCJAVvFSIbTYLzhw00NWZKxIX3ecLCftRam5ex5Oh66 441nJPz8uU99APUJPAfiWjJTx2trhKSwjQ== X-Google-Smtp-Source: AA0mqf6A3etEDpWF7G9XYx5yc39rFyFysG/W0iJMZb6N9Dbk1rNQYeLxqBhMctAdLl/+2U1XyoqT3w== X-Received: by 2002:a05:6214:3788:b0:4bb:658f:c81b with SMTP id ni8-20020a056214378800b004bb658fc81bmr13901794qvb.56.1668953351965; Sun, 20 Nov 2022 06:09:11 -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.09.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:11 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 175/241] global: Migrate CONFIG_SERIAL_BOOT to CFG Date: Sun, 20 Nov 2022 09:08:05 -0500 Message-Id: <20221120140829.3057894-66-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- arch/m68k/cpu/mcf5445x/start.S | 10 +++++----- include/configs/stmark2.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index 1ce244872f14..257af6c965d2 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -28,7 +28,7 @@ void init_fbcs(void) { fbcs_t *fbcs __maybe_unused = (fbcs_t *) MMAP_FBCS; -#if !defined(CONFIG_SERIAL_BOOT) +#if !defined(CFG_SERIAL_BOOT) #if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && defined(CFG_SYS_CS0_CTRL)) out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE); out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL); diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index a083c3d45d27..0beacb38dfbb 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -25,7 +25,7 @@ addl #60,%sp; /* space for 15 regs */ \ rte; -#if defined(CONFIG_SERIAL_BOOT) +#if defined(CFG_SERIAL_BOOT) #define ASM_DRAMINIT (asm_dram_init - CONFIG_TEXT_BASE + \ CFG_SYS_INIT_RAM_ADDR) #define ASM_DRAMINIT_N (asm_dram_init - CONFIG_TEXT_BASE) @@ -40,7 +40,7 @@ * These vectors are to catch any un-intended traps. */ _vectors: -#if defined(CONFIG_SERIAL_BOOT) +#if defined(CFG_SERIAL_BOOT) INITSP: .long 0 /* Initial SP */ #ifdef CONFIG_CF_SBF @@ -68,7 +68,7 @@ vector10_17: vector18_1F: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT -#if !defined(CONFIG_SERIAL_BOOT) +#if !defined(CFG_SERIAL_BOOT) /* TRAP #0 - #15 */ vector20_2F: @@ -111,7 +111,7 @@ vector192_255: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT #endif -#if defined(CONFIG_SERIAL_BOOT) +#if defined(CFG_SERIAL_BOOT) /* Image header: chksum 4 bytes, len 4 bytes, img dest 4 bytes */ asm_sbf_img_hdr: .long 0x00000000 /* checksum, not yet implemented */ @@ -436,7 +436,7 @@ asm_delay: . = 0x400 .globl _start _start: -#if !defined(CONFIG_SERIAL_BOOT) +#if !defined(CFG_SERIAL_BOOT) nop nop move.w #0x2700,%sr /* Mask off Interrupt */ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 3b4743905596..ca3eb6a31b1e 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -64,7 +64,7 @@ #define CFG_SYS_DRAM_TEST #if defined(CONFIG_CF_SBF) -#define CONFIG_SERIAL_BOOT +#define CFG_SERIAL_BOOT #endif /* Reserve 256 kB for Monitor */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b45fcaa9432c..0d58f8ff0a1b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -184,7 +184,7 @@ CFG_SAR_REG CFG_SCIF_A CFG_SCSI_DEV_LIST CFG_SC_TIMER_CLK -CONFIG_SERIAL_BOOT +CFG_SERIAL_BOOT CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN From patchwork Sun Nov 20 14:08:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706860 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=RLpPDRe8; 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 4NFXcs4Rknz23mR for ; Mon, 21 Nov 2022 01:16:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B12AB8541E; Sun, 20 Nov 2022 15:09:58 +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="RLpPDRe8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AC25F85329; Sun, 20 Nov 2022 15:09:24 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 9652B852FC for ; Sun, 20 Nov 2022 15:09:14 +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-x833.google.com with SMTP id e15so5937806qts.1 for ; Sun, 20 Nov 2022 06:09:14 -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=Z5MRBI7TS23P+1jf72PiXLRCzm7n7wVuLEOX139Y+BE=; b=RLpPDRe86zRaKIYo19ZG0E7IOmdnnmlT0lnciEBv9imi32iihniP2NCuxt8juBHaOV Hl4iuD5+RWnbBmR+kpFMAnknR5FBXJkYj02EjYtKtKErLSRv7ex6uX71OnFKig+OoPas eSi73FiGJJ9kPD8TGec1HCr7PEL8BqqLlyRZU= 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=Z5MRBI7TS23P+1jf72PiXLRCzm7n7wVuLEOX139Y+BE=; b=BnnYnauvgkbXbkKZRnsE1S9q073+/gP6U+Zc4jFruPM0zr9ol2QcXfBu9cUlzJI7o1 sSf5L0eYrfRnl9utD1orgmXqVkU3X3nDC7xBgUnTYAa+ygbhuOfosKZnbNEMD5hl8Iv3 pPAoUmxmZ22LoDfsx9egXnd6UsAt7u79PKwlDBGXZd5Vn+Ha4YfBgoG+wvCS4JrWbAlx bZEop/XAWePiAbPRsYyE0AnjvcA/K9UG1lhHLYWtaHL4poFALCRuEi+j2b+xUXu7PadM KmQR+0o8Ie0xMKCvL+4PMeEDS+mfNd4lm1nvbNhaiC737ApfGepfaYGI4ju/rL6HOES2 rkyQ== X-Gm-Message-State: ANoB5pmnBanomuBvNwcM3rwzrFtlrEX7jEiyvVtFw/jNOHnGF2yxQjsK GN2Q+rrk/rSmZxCkcqqUppgKE/L8goZ6hA== X-Google-Smtp-Source: AA0mqf578LYAoWUpMHCuP3vmGmOuwr4y6FGqquWX1mTcG5fwZG7mgtEmeEfrcc8iGNZkZg7yRCiwWw== X-Received: by 2002:ac8:7542:0:b0:3a5:c5c1:43ff with SMTP id b2-20020ac87542000000b003a5c5c143ffmr363377qtr.312.1668953352612; Sun, 20 Nov 2022 06:09:12 -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.09.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:12 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 176/241] global: Migrate CONFIG_SERVERIP to CFG Date: Sun, 20 Nov 2022 09:08:06 -0500 Message-Id: <20221120140829.3057894-67-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- doc/README.usb | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MCR3000.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 4 ++-- include/configs/apalis_imx6.h | 4 ++-- include/configs/cobra5272.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/integratorcp.h | 2 +- include/configs/mt7622.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt7629.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/poleg.h | 2 +- include/configs/stm32mp15_common.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- net/bootp.c | 10 +++++----- scripts/config_whitelist.txt | 2 +- 32 files changed, 40 insertions(+), 40 deletions(-) diff --git a/README b/README index 903bd1d8ff2d..aa989f67e2c0 100644 --- a/README +++ b/README @@ -743,7 +743,7 @@ The following options need to be configured: (Environment variable "ipaddr") - Server IP address: - CONFIG_SERVERIP + CFG_SERVERIP Defines a default value for the IP address of a TFTP server to contact when using the "tftboot" command. diff --git a/doc/README.usb b/doc/README.usb index 495b1859a771..431942fbc32c 100644 --- a/doc/README.usb +++ b/doc/README.usb @@ -163,7 +163,7 @@ and all the parameters can either get stored in the board's external environment, or get obtained from the bootp server if not set. #define CFG_IPADDR 10.0.0.2 (replace with your value) -#define CONFIG_SERVERIP 10.0.0.1 (replace with your value) +#define CFG_SERVERIP 10.0.0.1 (replace with your value) #define CONFIG_BOOTFILE "uImage" The 'usb start' command should identify the adapter something like this: diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 8eb5f7084f86..efbdc4c28afa 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -20,7 +20,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index b42177688427..ff99b6ab857d 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -29,7 +29,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 043e188189e1..fcd3106ccb6d 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -32,7 +32,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 88e3d72ef67f..adcaa164d3e0 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -32,7 +32,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 35c37a4449b1..c86eef2210e2 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -33,7 +33,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 8bb270ce6797..cc65740957a0 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -25,7 +25,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 1f904efa84bb..c2171281eab7 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -27,7 +27,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 # define CFG_NETMASK 255.255.255.0 -# define CONFIG_SERVERIP 192.162.1.1 +# define CFG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 1248b367ae62..f5c887714f39 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -53,7 +53,7 @@ "bootm ${loadaddr} - 0xf00000\0" #define CFG_IPADDR 192.168.0.3 -#define CONFIG_SERVERIP 192.168.0.1 +#define CFG_SERVERIP 192.168.0.1 #define CFG_NETMASK 255.0.0.0 /* Miscellaneous configurable options */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index d752a9050001..d47378e19352 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -331,7 +331,7 @@ #define CFG_ROOTPATH "/nfsroot" #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ -#define CONFIG_SERVERIP 192.168.1.1 +#define CFG_SERVERIP 192.168.1.1 #define CFG_GATEWAYIP 192.168.1.1 #define CFG_NETMASK 255.255.255.0 diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 8f7841163936..580d2e3020ed 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -16,7 +16,7 @@ /* Networking */ #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1 #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x84000000\0" \ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 387fb3f69c83..7fd99ea907d1 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -36,8 +36,8 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#undef CONFIG_SERVERIP -#define CONFIG_SERVERIP 192.168.10.1 +#undef CFG_SERVERIP +#define CFG_SERVERIP 192.168.10.1 #define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \ "boot part 0 1 mmcpart 0; " \ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4f2addd42d8b..02de22ce6a24 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -38,8 +38,8 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#undef CONFIG_SERVERIP -#define CONFIG_SERVERIP 192.168.10.1 +#undef CFG_SERVERIP +#define CFG_SERVERIP 192.168.10.1 #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index b0acdb2e7d62..df24e3014f00 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -71,7 +71,7 @@ enter a valid image address in flash */ /* User network settings */ #define CFG_IPADDR 192.168.100.2 /* default board IP address */ -#define CONFIG_SERVERIP 192.168.100.1 /* default tftp server IP address */ +#define CFG_SERVERIP 192.168.100.1 /* default tftp server IP address */ #endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 3cf56e98faf8..b744ae1d6e85 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -22,7 +22,7 @@ #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC) #define UBOOT_UPDATE \ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 0c879cc06bc7..fc8da4f9e358 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -16,7 +16,7 @@ #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1 #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x83000000\0" \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c0d5e6f0aa06..e34d933abae2 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -33,8 +33,8 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#undef CONFIG_SERVERIP -#define CONFIG_SERVERIP 192.168.10.1 +#undef CFG_SERVERIP +#define CFG_SERVERIP 192.168.10.1 #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index fdaeb6588146..8efcc8c17b3d 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -23,7 +23,7 @@ #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) #define UBOOT_UPDATE \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 3da98a5165e4..83c79aa53fcb 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -18,7 +18,7 @@ #define CFG_IPADDR 192.168.10.2 #define CFG_NETMASK 255.255.255.0 -#define CONFIG_SERVERIP 192.168.10.1 +#define CFG_SERVERIP 192.168.10.1 #define CFG_FDTADDR 0x84000000 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index d82856f5eb10..4d0acdd0f3b6 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -58,6 +58,6 @@ /* Environment */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.146 +#define CFG_SERVERIP 192.168.1.146 #endif /* __CONFIG_H */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index ccf73604480b..d1b2d938ff9f 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -19,7 +19,7 @@ /* Integrator CP-specific configuration */ #define CFG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */ -#define CONFIG_SERVERIP 192.168.1.100 +#define CFG_SERVERIP 192.168.1.100 #define CFG_IPADDR 192.168.1.104 /* diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 199da46ad018..f0459f1e44ed 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -19,6 +19,6 @@ /* Ethernet */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.3 +#define CFG_SERVERIP 192.168.1.3 #endif diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index d3cf6597a633..b279fb44cfb7 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -34,7 +34,7 @@ /* Ethernet */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.2 +#define CFG_SERVERIP 192.168.1.2 #ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 8c0b02b40e50..d7700673f6f7 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -29,6 +29,6 @@ /* Ethernet */ #define CFG_IPADDR 192.168.1.1 -#define CONFIG_SERVERIP 192.168.1.2 +#define CFG_SERVERIP 192.168.1.2 #endif diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 10db30cd5366..3b0b269b3ad3 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -16,7 +16,7 @@ /* Default Env vars */ #define CFG_IPADDR 0.0.0.0 /* In order to cause an error */ -#define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */ +#define CFG_SERVERIP 0.0.0.0 /* In order to cause an error */ #define CFG_NETMASK 255.255.255.0 #define CFG_GATEWAYIP 0.0.0.0 #define CFG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */ diff --git a/include/configs/poleg.h b/include/configs/poleg.h index e824af8273a1..af0ed0002c83 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -14,7 +14,7 @@ #define CFG_SYS_SDRAM_BASE 0x0 /* Default environemnt variables */ -#define CONFIG_SERVERIP 192.168.0.1 +#define CFG_SERVERIP 192.168.0.1 #define CFG_IPADDR 192.168.0.2 #define CFG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index ec8c8fba91f1..85ddf1750768 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -25,7 +25,7 @@ /* Ethernet need */ #ifdef CONFIG_DWC_ETH_QOS -#define CONFIG_SERVERIP 192.168.1.1 +#define CFG_SERVERIP 192.168.1.1 #endif #define STM32MP_FIP_IMAGE_GUID \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 47086a7c9cc8..6ea5f2f83784 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -46,7 +46,7 @@ /* * Network Configuration */ -#define CONFIG_SERVERIP 192.168.11.1 +#define CFG_SERVERIP 192.168.11.1 #define CFG_IPADDR 192.168.11.10 #define CFG_GATEWAYIP 192.168.11.1 #define CFG_NETMASK 255.255.255.0 diff --git a/include/env_default.h b/include/env_default.h index 06cf3e36d692..95e00c27f0b6 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -56,8 +56,8 @@ const char default_environment[] = { #ifdef CFG_IPADDR "ipaddr=" __stringify(CFG_IPADDR) "\0" #endif -#ifdef CONFIG_SERVERIP - "serverip=" __stringify(CONFIG_SERVERIP) "\0" +#ifdef CFG_SERVERIP + "serverip=" __stringify(CFG_SERVERIP) "\0" #endif #ifdef CONFIG_SYS_DISABLE_AUTOLOAD "autoload=0\0" diff --git a/net/bootp.c b/net/bootp.c index 6c01e3815320..61cf853059bd 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -183,7 +183,7 @@ static void store_bootp_params(struct bootp_hdr *bp) */ static void store_net_params(struct bootp_hdr *bp) { -#if !defined(CONFIG_SERVERIP_FROM_PROXYDHCP) +#if !defined(CFG_SERVERIP_FROM_PROXYDHCP) store_bootp_params(bp); #endif net_copy_ip(&net_ip, &bp->bp_yiaddr); @@ -1056,7 +1056,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, "%d\n", src, dest, len, dhcp_state); if (net_read_ip(&bp->bp_yiaddr).s_addr == 0) { -#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) +#if defined(CFG_SERVERIP_FROM_PROXYDHCP) store_bootp_params(bp); #endif return; @@ -1081,11 +1081,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, CONFIG_IS_ENABLED(NET_DEVICES)) efi_net_set_dhcp_ack(pkt, len); -#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) +#if defined(CFG_SERVERIP_FROM_PROXYDHCP) if (!net_server_ip.s_addr) - udelay(CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS * + udelay(CFG_SERVERIP_FROM_PROXYDHCP_DELAY_MS * 1000); -#endif /* CONFIG_SERVERIP_FROM_PROXYDHCP */ +#endif /* CFG_SERVERIP_FROM_PROXYDHCP */ debug("TRANSITIONING TO REQUESTING STATE\n"); dhcp_state = REQUESTING; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0d58f8ff0a1b..9abd8a58bc37 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -185,7 +185,7 @@ CFG_SCIF_A CFG_SCSI_DEV_LIST CFG_SC_TIMER_CLK CFG_SERIAL_BOOT -CONFIG_SERVERIP +CFG_SERVERIP CONFIG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN CONFIG_SH_ETHER_ALIGNE_SIZE From patchwork Sun Nov 20 14:08:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706872 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=noMySnDs; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXgM3jZSz23mR for ; Mon, 21 Nov 2022 01:18:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5C0C8544C; Sun, 20 Nov 2022 15:10:18 +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="noMySnDs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACC4C85310; Sun, 20 Nov 2022 15:09:30 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 BE133852CE for ; Sun, 20 Nov 2022 15:09:14 +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-qk1-x734.google.com with SMTP id s20so6541780qkg.5 for ; Sun, 20 Nov 2022 06:09:14 -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=se27WxGG9nJT6Rk9GquJSANGSh+mNmyTBwMzTRwJZAw=; b=noMySnDsa0kPRPVgYmOjpx/shqrnfTziB7dG0/uw9TT248mc7fFRTYUVejZbyExv2i o67TvrSjBfyXwSiMag1V3cKOvFQ9VkAkpj3dCfXlR/2vIWPF+Y+CToJETpzdZX7ePfDg kmMdSSwHwDK3LEe/zSCq8gP9ltSMJisdk1FoI= 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=se27WxGG9nJT6Rk9GquJSANGSh+mNmyTBwMzTRwJZAw=; b=7do9r956jeewKl/4x1/jqk7tTb2WU9nfFYjdsF7qSJkGlrmpAsoLufw6s9FZ26MlQp fpWjCXm3zN/eRckwvHlUN4bmklbbaJLUEy8NLc0evqJ4UASFX6oAJHMrHcMiIadet7Fu swZ3yPp6aVRd0hu4wShQ7D/yRo5RHJYH8cjlSHyUF5XfzQNOqdBeMgALxrsozgcHvvAD QBZoN8l/rMLEAxG2G73W7Df8cK6qFkkU4zkNgkby4TWKsc2rF9bibaGeDERHp+UxdKrK dZwOzXZM+0TJ30PWx/WSk95ss04FYRC8me1tuXUdcZST94PhvImwE3oHoqqrluYHXddM 7Zng== X-Gm-Message-State: ANoB5plRKhdPRaVYrdTgkydEdyTd9Nz8ccwShz9kYeV5k++4sotAnTfU PSp2Nzmu3mgI4tiemtZj8LXxBRk3w1wUqA== X-Google-Smtp-Source: AA0mqf5B3JZ3fhezQDmkW2j+O6Ykf2WOaFzI9JE5PzxQ7r/4kqvl1e54ZaMYS4RHoTGNBMIiqKT7AQ== X-Received: by 2002:a37:68d4:0:b0:6fa:ebc3:d94e with SMTP id d203-20020a3768d4000000b006faebc3d94emr12753613qkc.641.1668953354321; Sun, 20 Nov 2022 06:09:14 -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.09.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:14 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 177/241] global: Migrate CONFIG_SETUP_INITRD_TAG to CFG Date: Sun, 20 Nov 2022 09:08:07 -0500 Message-Id: <20221120140829.3057894-68-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/legoev3.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 3a0622ab0b3b..15864f20350d 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -48,7 +48,7 @@ * Linux Information */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) -#define CONFIG_SETUP_INITRD_TAG +#define CFG_SETUP_INITRD_TAG #define CFG_EXTRA_ENV_SETTINGS \ "bootenvfile=uEnv.txt\0" \ "fdtfile=da850-lego-ev3.dtb\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9abd8a58bc37..c8e2d10fe0be 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -186,7 +186,7 @@ CFG_SCSI_DEV_LIST CFG_SC_TIMER_CLK CFG_SERIAL_BOOT CFG_SERVERIP -CONFIG_SETUP_INITRD_TAG +CFG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN CONFIG_SH_ETHER_ALIGNE_SIZE CONFIG_SH_ETHER_CACHE_INVALIDATE From patchwork Sun Nov 20 14:08:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706873 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=sJ+FlGSu; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXgl6l8Tz23mR for ; Mon, 21 Nov 2022 01:18:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 756B985455; Sun, 20 Nov 2022 15:10:29 +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="sJ+FlGSu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CFEB98530F; Sun, 20 Nov 2022 15:09:30 +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-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 BFD8B852CC for ; Sun, 20 Nov 2022 15:09:15 +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-qv1-xf29.google.com with SMTP id p8so5844874qvn.5 for ; Sun, 20 Nov 2022 06:09:15 -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=FnnFgCn+1UZhHQ02ZhikofGjD8y9gHYmb0ZfEUeVH1M=; b=sJ+FlGSuIpPHHVCtqoA1SBG4Cpu1+cCslzIcRSByRDbpjKSjPt0144V0BtCvTTAd1+ zNpSpZHyQv8E/frVwx2KKgh1P0JCYQ1IToxSgZw3ryZX5m8c4FTiqdHv85XYTeYv3ovx q+x9NwOAl5t4RgBG+nhVeaZpnIraU4S5yuB9c= 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=FnnFgCn+1UZhHQ02ZhikofGjD8y9gHYmb0ZfEUeVH1M=; b=wl1eCBBEq25jE2FBjy5CHcBUj/BDxiZCl1nxo9PSn8iz6h8ct0xGD62RM7rjrLNdeR MDwA67irYAE731avj5kceC9Ijg6VGY27vtdNHv+8WxPBTHFrkW0Kw5e2MWgOidcU8H17 sK/Dz+ie52IeltCHOsl6HTglErHkcWYMUQgZOZwfbZ8uB47Gg6IRlaXEG4QwzZO2LnNp zBK+NXOGTYzZbwx6/VqFsQBj0L3B2r7VN/GxMeSaE5yXQQT3/dAFyirTwOVPjnE5afO3 K5x7YGrotaBspYFvGY4k7379cuzauBzpDiHkMlrJoeLZrsWPaDiE5z5W46m+g0266mFX xr+Q== X-Gm-Message-State: ANoB5plq7G7t5+tSSh/KwK+M3yXJYWEaTJFaol1ldkT1PcvzhMLR+2SF v9ci90aWBOS8B84ZC2OuW+TzhZlWKnI2Qw== X-Google-Smtp-Source: AA0mqf5ZHUa/HMXmL/J5Cce/a5oEkcSt1WGPTTHKboQs94cG1EUlLRBI6/hAODT4BgaPZAGKWSwktw== X-Received: by 2002:a05:6214:3113:b0:4bb:7436:49de with SMTP id ks19-20020a056214311300b004bb743649demr13720616qvb.27.1668953354865; Sun, 20 Nov 2022 06:09:14 -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.09.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:14 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 178/241] global: Migrate CONFIG_SET_DFU_ALT_BUF_LEN to CFG Date: Sun, 20 Nov 2022 09:08:08 -0500 Message-Id: <20221120140829.3057894-69-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/samsung/common/misc.c | 2 +- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 9c0ec29c937b..5ffa216e2e5d 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_SET_DFU_ALT_INFO void set_dfu_alt_info(char *interface, char *devstr) { - size_t buf_size = CONFIG_SET_DFU_ALT_BUF_LEN; + size_t buf_size = CFG_SET_DFU_ALT_BUF_LEN; ALLOC_CACHE_ALIGN_BUFFER(char, buf, buf_size); char *alt_info = "Settings not found!"; char *status = "error!\n"; diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 3ac13a65d63f..560a23c23efb 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -37,7 +37,7 @@ ""PARTS_BOOT" part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) +#define CFG_SET_DFU_ALT_BUF_LEN (SZ_1K) #define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 93f88ef53eba..e8ec504c355e 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -57,7 +57,7 @@ "params.bin raw 0x1880 0x20\0" /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ -#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) +#define CFG_SET_DFU_ALT_BUF_LEN (SZ_1K) /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ #define CFG_ODROID_REV_AIN 9 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c8e2d10fe0be..6ffe0779b47d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -187,7 +187,7 @@ CFG_SC_TIMER_CLK CFG_SERIAL_BOOT CFG_SERVERIP CFG_SETUP_INITRD_TAG -CONFIG_SET_DFU_ALT_BUF_LEN +CFG_SET_DFU_ALT_BUF_LEN CONFIG_SH_ETHER_ALIGNE_SIZE CONFIG_SH_ETHER_CACHE_INVALIDATE CONFIG_SH_ETHER_CACHE_WRITEBACK From patchwork Sun Nov 20 14:08:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706881 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=SKjJ0J5n; 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 4NFXjS4jt3z23lt for ; Mon, 21 Nov 2022 01:20:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B18F88547B; Sun, 20 Nov 2022 15:10:40 +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="SKjJ0J5n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 212B7852FF; Sun, 20 Nov 2022 15:09:41 +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-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 F24F1852FF for ; 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-qv1-xf30.google.com with SMTP id c8so6483208qvn.10 for ; 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=KYYj81rcfI0l515ws2mUAPy3O7szw5EntzlgwbrX+4Y=; b=SKjJ0J5nc2pDXrKG/kQDgQUTKsyX5RdXk7N/PixBr2hAawf15h3fBax+00ts7QKLHR 2ZcTxnu73ZLeTnOWDK+FLzXCDK/BKL5Ri1kNNFIYzePx7RF3oVNxD0BoPl8Qzjfw9JFn R1/om9ZDMYBaa1FndrGI97U5JuF0wVHXQQhlc= 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=KYYj81rcfI0l515ws2mUAPy3O7szw5EntzlgwbrX+4Y=; b=RI6P1oOS/OHlcAnh8cjkNuO8JQu2ohaUbuQu02OZJPKO2Lk2xphugLuVD59jGNtZ9W Pr8P9G90E2M1dLg8Ngp8RhKdUc9LGGNgyi0S1kBI1PV3MOYwkE7dIPMQJzPTlpy00GRb IzAH9aCc8+LMVMvh1TUymTo18K0+3GhuuCZJYCJ6hgyvFB7EZZr51qCt8x2Kyxltqqqp gidHRvSU45VEiwEXx+DsjmwLB8RdnaCeSD0xf/EFK0mzA3dmv70RFH+bsAB2vC22pJ6y GHtsygGL7KaldoQhE5V4ll/FTrUf9Yv5HgIOdbh1KvIzLiesfE/0ME43ov3P5La/Izyq 5ciw== X-Gm-Message-State: ANoB5pn+GyRlcszyKDYJnhDyH+WZcNrjYDN/0netHZ+FJyvRtHzJuoKg wTpJbvZRNsASJeDQF3q4N2OT7IPu+yXSTw== X-Google-Smtp-Source: AA0mqf5mTPUW9FZj5aBtFoDPbcnHn1htbAxT2Nv9NE8IGC5SjGPdWKyRZc9PhJkkZ+0Zz6HpLbwNUg== X-Received: by 2002:a0c:c343:0:b0:4b1:79b2:207e with SMTP id j3-20020a0cc343000000b004b179b2207emr1020732qvi.89.1668953356948; Sun, 20 Nov 2022 06:09:16 -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.09.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:16 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 181/241] global: Migrate CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG Date: Sun, 20 Nov 2022 09:08:11 -0500 Message-Id: <20221120140829.3057894-72-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- drivers/net/sh_eth.c | 2 +- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index aa989f67e2c0..c35207cb2af5 100644 --- a/README +++ b/README @@ -553,7 +553,7 @@ The following options need to be configured: CONFIG_SH_ETHER_PHY_ADDR Define the ETH PHY's address - CONFIG_SH_ETHER_CACHE_WRITEBACK + CFG_SH_ETHER_CACHE_WRITEBACK If this option is set, the driver enables cache flush. - TPM Support: diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 38049b380d7c..72fdf7ad89a1 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -39,7 +39,7 @@ # error "Please define CONFIG_SH_ETHER_PHY_ADDR" #endif -#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK) && \ +#if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \ !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) #define flush_cache_wback(addr, len) \ flush_dcache_range((unsigned long)addr, \ diff --git a/include/configs/alt.h b/include/configs/alt.h index 940169b42043..93aee6b6a460 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -27,7 +27,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/condor.h b/include/configs/condor.h index fa3edef9b300..3f99cbf9dab9 100644 --- a/include/configs/condor.h +++ b/include/configs/condor.h @@ -17,7 +17,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/gose.h b/include/configs/gose.h index e54f4b24e048..45a537341b0e 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -23,7 +23,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 5ae17f70e909..3fde61407094 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -20,7 +20,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 1d8aa6def88f..b3b6f03e08d4 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -23,7 +23,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/lager.h b/include/configs/lager.h index bb8cc5fecb7a..16d15ccdd913 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -24,7 +24,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/porter.h b/include/configs/porter.h index 907cf29d0318..7a1d9d48a150 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -28,7 +28,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/silk.h b/include/configs/silk.h index 7361daa27c49..4edb1bc3c533 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -28,7 +28,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/stout.h b/include/configs/stout.h index b60e363b2c7c..0004fb454c1e 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -32,7 +32,7 @@ #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII -#define CONFIG_SH_ETHER_CACHE_WRITEBACK +#define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8627d6a91aa6..bf1359f8df54 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -190,7 +190,7 @@ CFG_SETUP_INITRD_TAG CFG_SET_DFU_ALT_BUF_LEN CFG_SH_ETHER_ALIGNE_SIZE CFG_SH_ETHER_CACHE_INVALIDATE -CONFIG_SH_ETHER_CACHE_WRITEBACK +CFG_SH_ETHER_CACHE_WRITEBACK CONFIG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_USE_PORT From patchwork Sun Nov 20 14:08:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706888 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=OpevDg2/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXkw2qy3z23lt for ; Mon, 21 Nov 2022 01:21:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EEDF9853BA; Sun, 20 Nov 2022 15:14:06 +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="OpevDg2/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B1168527B; Sun, 20 Nov 2022 15:12:23 +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-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (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 1E71C853D6 for ; Sun, 20 Nov 2022 15:09:46 +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-x832.google.com with SMTP id w9so5906726qtv.13 for ; Sun, 20 Nov 2022 06:09:46 -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=xIp4In7YSKUDWAbNRGZxAaoLJDfzkZQ+Lupbvc8UgrE=; b=OpevDg2/+JEdThz7QKIYUXoIseRJ5OpUvk61e13U7DJ7V+BbiPr6JPzxHkCu3sPl2v 022bLwESUnPISWd5sca8T8N9XN0mBVTDaj4adVpnk7ULQaN6iJnAhQEnzhHF7TVfUP38 QoVCIHXqo/BkabbOeInoXxLrR9no2UyPM5AxQ= 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=xIp4In7YSKUDWAbNRGZxAaoLJDfzkZQ+Lupbvc8UgrE=; b=u9BqIq8/RyoIUwbHZ4UdEKhe8LLeHEajDavHw/pD98wEoynqydYA8eh4TX7AWtGA62 VzHf+TtzV10fuUWxx89/o8xCYo/D4vqV0TBybpc+1FY2LPOqC8EFu/Cxhz7jDgUSx49A peDNNEx8DpxDFg3RX8i9XAUL/Fe9WZmaqPRpD8A6OGhNscINbjA4Zekm17+PO7LeWglc mN1+1vGlBK2CYTwhes2c5DtZtF+FMMawREaNL+vHgJFh3xUC3xH0N7EN5JzRh6GxG8sO JtX/Qmp5xW8ffj/+PyMDQ61O7zu9E116omiTS9sgHzYzYMcOiYyIWLQf0CwEArMC5raN Us0g== X-Gm-Message-State: ANoB5plZ4mjeprnBpp7Hr/euV5pBN2KJOQ2dJULUg0KRCWak717vXpGT 0HytPa4ABsvfDcucMYBhGrYXFSgpkiO/SQ== X-Google-Smtp-Source: AA0mqf6uCqxzbEyL3wV9g+hbPgO14xOZgFegvnEYZPCNrjbs+1Z/DQN72CYbXEzIAmwGhbpZlLBmtg== X-Received: by 2002:ac8:6055:0:b0:3a5:4106:64e with SMTP id k21-20020ac86055000000b003a54106064emr13750945qtm.321.1668953357579; Sun, 20 Nov 2022 06:09:17 -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.09.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:17 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 182/241] global: Migrate CONFIG_SH_ETHER_PHY_ADDR to CFG Date: Sun, 20 Nov 2022 09:08:12 -0500 Message-Id: <20221120140829.3057894-73-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- drivers/net/sh_eth.c | 8 ++++---- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README b/README index c35207cb2af5..0ae3c6b97c15 100644 --- a/README +++ b/README @@ -550,7 +550,7 @@ The following options need to be configured: CONFIG_SH_ETHER_USE_PORT Define the number of ports to be used - CONFIG_SH_ETHER_PHY_ADDR + CFG_SH_ETHER_PHY_ADDR Define the ETH PHY's address CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 72fdf7ad89a1..70ec27999062 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -35,8 +35,8 @@ #ifndef CONFIG_SH_ETHER_USE_PORT # error "Please define CONFIG_SH_ETHER_USE_PORT" #endif -#ifndef CONFIG_SH_ETHER_PHY_ADDR -# error "Please define CONFIG_SH_ETHER_PHY_ADDR" +#ifndef CFG_SH_ETHER_PHY_ADDR +# error "Please define CFG_SH_ETHER_PHY_ADDR" #endif #if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \ @@ -636,7 +636,7 @@ int sh_eth_initialize(struct bd_info *bd) memset(eth, 0, sizeof(struct sh_eth_dev)); eth->port = CONFIG_SH_ETHER_USE_PORT; - eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR; + eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR; eth->port_info[eth->port].iobase = (void __iomem *)(BASE_IO_ADDR + 0x800 * eth->port); @@ -853,7 +853,7 @@ static int sh_ether_probe(struct udevice *udev) priv->bus = miiphy_get_dev_by_name(udev->name); eth->port = CONFIG_SH_ETHER_USE_PORT; - eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR; + eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR; eth->port_info[eth->port].iobase = (void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port); diff --git a/include/configs/alt.h b/include/configs/alt.h index 93aee6b6a460..8dd4b101c668 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -25,7 +25,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/condor.h b/include/configs/condor.h index 3f99cbf9dab9..43b88f127213 100644 --- a/include/configs/condor.h +++ b/include/configs/condor.h @@ -15,7 +15,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/gose.h b/include/configs/gose.h index 45a537341b0e..5184db41061f 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -21,7 +21,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 3fde61407094..8ba9b73672c8 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -18,7 +18,7 @@ /* Network interface */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0 +#define CFG_SH_ETHER_PHY_ADDR 0 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b3b6f03e08d4..2910336def6c 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -21,7 +21,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/lager.h b/include/configs/lager.h index 16d15ccdd913..815239a73bd4 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -22,7 +22,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/porter.h b/include/configs/porter.h index 7a1d9d48a150..8ba6a7d3bc8e 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -26,7 +26,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/silk.h b/include/configs/silk.h index 4edb1bc3c533..df5f0a246241 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -26,7 +26,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/include/configs/stout.h b/include/configs/stout.h index 0004fb454c1e..a0a1c50cacdf 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -30,7 +30,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 -#define CONFIG_SH_ETHER_PHY_ADDR 0x1 +#define CFG_SH_ETHER_PHY_ADDR 0x1 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bf1359f8df54..1513dc9458e6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -191,7 +191,7 @@ CFG_SET_DFU_ALT_BUF_LEN CFG_SH_ETHER_ALIGNE_SIZE CFG_SH_ETHER_CACHE_INVALIDATE CFG_SH_ETHER_CACHE_WRITEBACK -CONFIG_SH_ETHER_PHY_ADDR +CFG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE From patchwork Sun Nov 20 14:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706880 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=MlWNWJuI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXjF6QH1z23mR for ; Mon, 21 Nov 2022 01:20:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 651A685473; Sun, 20 Nov 2022 15:10:39 +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="MlWNWJuI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BDB4A852FB; Sun, 20 Nov 2022 15:09:34 +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-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 345B385318 for ; Sun, 20 Nov 2022 15:09:18 +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-x830.google.com with SMTP id h21so5939583qtu.2 for ; Sun, 20 Nov 2022 06:09:18 -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=wfBOCZ6ulR2UmeF4zmNI4QTg2jFqCDnextHTXbTm1Ps=; b=MlWNWJuIATcMK4Bf8gdITn551/FvZ5FCYVtMriDR8CFfrY1tRdsq89iMa2pvaWqjmB SA3w47f1Na88ANQeV3Scag3ztflpCo2x1bywyxP2aKwYbwHRnPuKLIrMUYKXtfrhlKG3 idYjEBzjBrcIOkwuHBc3VmMFO31CHHROollng= 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=wfBOCZ6ulR2UmeF4zmNI4QTg2jFqCDnextHTXbTm1Ps=; b=Jy4EYw8ZbWHmIoczB31aUr2W54avc8C4rGaviliccGB/R5AkQmz4po3+o21lENEqso MO/IJSqGUpj1wGFuo0cmiXy3Jb9xWe4XT5W6qZqSeaeIzT5kvvcTtygY7cDRmbdX/rrk fL+l3KhXKGUgVS0jWOSoK1RScTSuH5snoLcB5M5MxjntXanXPbxZ6OUHG9cZDgrzfELo LjZEigtvGDGO0P14Qrqfz59NteqPtjz2gTVkAjSyN4N25QCQyvmzYz1HDC/PZfuJjMa3 8C24goGpfsqCnNKNLyyAMlY4Rxs7PslteRXLEMdMMMegaslIlngqpZ4JFyctlhPMslrO 4v0Q== X-Gm-Message-State: ANoB5plJ3dfVvV3taJ7+J6AYUuswhMRP60QKW/Z8T9F5d2EDZVCGBlP2 FNJh/Net/1XiHLoAF6P6y3lcvGDVABitew== X-Google-Smtp-Source: AA0mqf5lhDNI48KUUA7DHpW+m/yMAB5HjVPTPIchf4RgMX5nTAiJSc7cv7Ik5AUo4LIQDtDQC5HSrQ== X-Received: by 2002:ac8:4f10:0:b0:3a5:7aac:665e with SMTP id b16-20020ac84f10000000b003a57aac665emr4354514qte.165.1668953358170; Sun, 20 Nov 2022 06:09:18 -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.09.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:17 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 183/241] global: Migrate CONFIG_SH_ETHER_PHY_MODE to CFG Date: Sun, 20 Nov 2022 09:08:13 -0500 Message-Id: <20221120140829.3057894-74-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- drivers/net/sh_eth.c | 2 +- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 70ec27999062..9bdc42ced24f 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -536,7 +536,7 @@ static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth) phydev = phy_connect( miiphy_get_dev_by_name(dev->name), - port_info->phy_addr, dev, CONFIG_SH_ETHER_PHY_MODE); + port_info->phy_addr, dev, CFG_SH_ETHER_PHY_MODE); port_info->phydev = phydev; phy_config(phydev); diff --git a/include/configs/alt.h b/include/configs/alt.h index 8dd4b101c668..283af8a324e3 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -26,7 +26,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/condor.h b/include/configs/condor.h index 43b88f127213..2c9817cf02c5 100644 --- a/include/configs/condor.h +++ b/include/configs/condor.h @@ -16,7 +16,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/gose.h b/include/configs/gose.h index 5184db41061f..ed7dd70dd964 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -22,7 +22,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 8ba9b73672c8..6a11aa61f0fb 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -19,7 +19,7 @@ /* Network interface */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 2910336def6c..31d0795f07fb 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -22,7 +22,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/lager.h b/include/configs/lager.h index 815239a73bd4..991fc9020ee0 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -23,7 +23,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/porter.h b/include/configs/porter.h index 8ba6a7d3bc8e..3b7dcd8e94b8 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -27,7 +27,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/silk.h b/include/configs/silk.h index df5f0a246241..46615c46f6ec 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -27,7 +27,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/include/configs/stout.h b/include/configs/stout.h index a0a1c50cacdf..3bc569c908a0 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -31,7 +31,7 @@ /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 -#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII +#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK #define CFG_SH_ETHER_CACHE_INVALIDATE #define CFG_SH_ETHER_ALIGNE_SIZE 64 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1513dc9458e6..fa784171f026 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -192,7 +192,7 @@ CFG_SH_ETHER_ALIGNE_SIZE CFG_SH_ETHER_CACHE_INVALIDATE CFG_SH_ETHER_CACHE_WRITEBACK CFG_SH_ETHER_PHY_ADDR -CONFIG_SH_ETHER_PHY_MODE +CFG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE CONFIG_SLIC From patchwork Sun Nov 20 14:08:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706890 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=CKNLasJq; 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 4NFXlJ5Szyz23lt for ; Mon, 21 Nov 2022 01:21:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F623853E8; Sun, 20 Nov 2022 15:14:08 +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="CKNLasJq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 42F7085280; Sun, 20 Nov 2022 15:12:24 +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-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) (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 48F61853E0 for ; Sun, 20 Nov 2022 15:09:46 +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-x82a.google.com with SMTP id fz10so5940149qtb.3 for ; Sun, 20 Nov 2022 06:09:46 -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=zcVAbV43b3Lk3Cl8/rpGT83iSuOk6JZayxqqvWXv6TI=; b=CKNLasJqPNRgf7gklPQNOiVXC5K7fvg93/zsSdvKwPPapTO6w0EkMUrktiGwNyVvd+ kVWEVPAAxoZJLe2ndkfYyg0TgM65/tPZeqbfz+gPxOwotA9exYtcLFb/nXhY0POrI0Op iCfCGLsWeU+j89VBf/Jwuli30U3uyYc1Ir9f0= 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=zcVAbV43b3Lk3Cl8/rpGT83iSuOk6JZayxqqvWXv6TI=; b=oUrM1l+IXHCzcYbJv6+Z/0rYeA1sVMc6gBcUfGA4tFPkPAmMQ9som1oG5WH579VNnO hxcS659tm8vjKCM4HEr+jwlILpQ6uIpfP2Tbzph5G2wfknSj25ot5aim89AZOcWxbL+O fFzhv0SqvpBRSolSVHceGxchwRcOUCI4SI1f+7M0rgOx0eeO1/+j4OAJMqf18PiRLw95 nRx+eviMYOdhNqCxzWhls5nllQSCQV7LBLc+hRmbji1OSWsoSz1NZmaqYdpe0PyEjFeC aWmzuh1p2QQZei/t8OZ3UEh2MfwxRV1KCQ6Fb9AJYmt05nUqmIOx0fntcIPEfL8iHbH8 SpAg== X-Gm-Message-State: ANoB5pmwvWaILRvxJ5f01i1g5U2zblq6ar4hYk+xU9DYpvEjO3r07QVr dHWWlEsmMIHGQMRHcMjXHHoqVS5I86zAcw== X-Google-Smtp-Source: AA0mqf5DDBpvCEeKl1/4jlC6dFfmnYmfWsb8bb2PVh3rQ3y5ofhjCVk5eprFDXBVcUW+S+nG2g75uw== X-Received: by 2002:ac8:7183:0:b0:3a5:1dcb:d22d with SMTP id w3-20020ac87183000000b003a51dcbd22dmr13851303qto.489.1668953358826; Sun, 20 Nov 2022 06:09:18 -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.09.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:18 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 184/241] global: Migrate CONFIG_SH_ETHER_USE_PORT to CFG Date: Sun, 20 Nov 2022 09:08:14 -0500 Message-Id: <20221120140829.3057894-75-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- drivers/net/sh_eth.c | 8 ++++---- include/configs/alt.h | 2 +- include/configs/condor.h | 2 +- include/configs/gose.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/lager.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README b/README index 0ae3c6b97c15..3eb882c6a248 100644 --- a/README +++ b/README @@ -547,7 +547,7 @@ The following options need to be configured: CONFIG_SH_ETHER Support for Renesas on-chip Ethernet controller - CONFIG_SH_ETHER_USE_PORT + CFG_SH_ETHER_USE_PORT Define the number of ports to be used CFG_SH_ETHER_PHY_ADDR diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 9bdc42ced24f..1775d801544c 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -32,8 +32,8 @@ #include "sh_eth.h" -#ifndef CONFIG_SH_ETHER_USE_PORT -# error "Please define CONFIG_SH_ETHER_USE_PORT" +#ifndef CFG_SH_ETHER_USE_PORT +# error "Please define CFG_SH_ETHER_USE_PORT" #endif #ifndef CFG_SH_ETHER_PHY_ADDR # error "Please define CFG_SH_ETHER_PHY_ADDR" @@ -635,7 +635,7 @@ int sh_eth_initialize(struct bd_info *bd) memset(dev, 0, sizeof(struct eth_device)); memset(eth, 0, sizeof(struct sh_eth_dev)); - eth->port = CONFIG_SH_ETHER_USE_PORT; + eth->port = CFG_SH_ETHER_USE_PORT; eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR; eth->port_info[eth->port].iobase = (void __iomem *)(BASE_IO_ADDR + 0x800 * eth->port); @@ -852,7 +852,7 @@ static int sh_ether_probe(struct udevice *udev) priv->bus = miiphy_get_dev_by_name(udev->name); - eth->port = CONFIG_SH_ETHER_USE_PORT; + eth->port = CFG_SH_ETHER_USE_PORT; eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR; eth->port_info[eth->port].iobase = (void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port); diff --git a/include/configs/alt.h b/include/configs/alt.h index 283af8a324e3..45918c2af439 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -24,7 +24,7 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/condor.h b/include/configs/condor.h index 2c9817cf02c5..50c8d1733838 100644 --- a/include/configs/condor.h +++ b/include/configs/condor.h @@ -14,7 +14,7 @@ /* Environment compatibility */ /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/gose.h b/include/configs/gose.h index ed7dd70dd964..7ae0726518da 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -20,7 +20,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512u * 1024 * 1024) /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 6a11aa61f0fb..8de4a36e931a 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -17,7 +17,7 @@ #define CFG_SYS_SDRAM_SIZE (10 * 1024 * 1024) /* Network interface */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 31d0795f07fb..d47d70178ccd 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -20,7 +20,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/lager.h b/include/configs/lager.h index 991fc9020ee0..2577c7a7da67 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -21,7 +21,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/porter.h b/include/configs/porter.h index 3b7dcd8e94b8..1526f470e8e1 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -25,7 +25,7 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/silk.h b/include/configs/silk.h index 46615c46f6ec..c7346a356542 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -25,7 +25,7 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/include/configs/stout.h b/include/configs/stout.h index 3bc569c908a0..910997e08c7e 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -29,7 +29,7 @@ #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ -#define CONFIG_SH_ETHER_USE_PORT 0 +#define CFG_SH_ETHER_USE_PORT 0 #define CFG_SH_ETHER_PHY_ADDR 0x1 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII #define CFG_SH_ETHER_CACHE_WRITEBACK diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fa784171f026..36cc068c4473 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -193,7 +193,7 @@ CFG_SH_ETHER_CACHE_INVALIDATE CFG_SH_ETHER_CACHE_WRITEBACK CFG_SH_ETHER_PHY_ADDR CFG_SH_ETHER_PHY_MODE -CONFIG_SH_ETHER_USE_PORT +CFG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE CONFIG_SLIC CONFIG_SMDK5420 From patchwork Sun Nov 20 14:08:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706889 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=UuSrjzLe; 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 4NFXl66QFfz23lt for ; Mon, 21 Nov 2022 01:21:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BAF92853E0; Sun, 20 Nov 2022 15:14: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="UuSrjzLe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 094F885279; Sun, 20 Nov 2022 15:12:22 +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-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 492FA853E6 for ; Sun, 20 Nov 2022 15:09:46 +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-x829.google.com with SMTP id a27so5912170qtw.10 for ; Sun, 20 Nov 2022 06:09:46 -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=CuR1/gm21wZ0MUALP/r2b2ziYNPxq8Cupod57lWPexk=; b=UuSrjzLeCrCFnUhklMXt0qmeKNI8mlUdHYE1VzJONynD4T673wO/UPVdebS6Mu+qCE +Ef6YBO8Wf3zuT2eFUALUP1v4/7jxbL++FpBkXzUf1V346JTYFxHazU+d7KBdfPoS+Wa LxC4wBEh2rZofMfCfOttqvPg4y6jKgI9Yy5xQ= 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=CuR1/gm21wZ0MUALP/r2b2ziYNPxq8Cupod57lWPexk=; b=sY806O72dPVUT0eiEZnulySFwdnvBZZex2/anM9b0IjSxI+j08G9o3zpeMp9qVCVdo FSIiYJy55vjB7YalhUB9KvLcnvc83WMWJyzGSj534VErOCLXs+F8qawapfpqmv4Z6/VD evwthUo1WrMVskn0VQnL/+RaQpF4GvbSQ+oSa6x0kh6YdSOuG0r0BKo4JvogW6Y1sShp YQLpuSqQRvZa0LVK/0/FD1xhK6plJoQTcen6reYDj/gwK5e8Q0i7OLtdtXiWYsNbc7Rp UxH6Gz5YEVlLM0k5ftyqq43SX0qkOzdJUZx/2d+7vdCFM5Jr1Se3RtzNVrHNuiVYsK3F 4adA== X-Gm-Message-State: ANoB5pkR4fEBI7RkE81hwGbgfyZDAVUy7Hzn2EnEAgxh2gIpvq09fmaz i+ILsoRXVHi9uMXYAP3mJpkmBUE8rNVyrg== X-Google-Smtp-Source: AA0mqf5DWUzAhT45Kp7K+ZdrVbtAwgzFLgwrrvIgZuWzxDtnO6S7Z2fGOl6Pux89W8+HLTsENm5GgQ== X-Received: by 2002:a05:622a:1187:b0:3a5:58f9:cd0b with SMTP id m7-20020a05622a118700b003a558f9cd0bmr4366464qtk.404.1668953359515; Sun, 20 Nov 2022 06:09:19 -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.09.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:19 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 185/241] global: Migrate CONFIG_SH_QSPI_BASE to CFG Date: Sun, 20 Nov 2022 09:08:15 -0500 Message-Id: <20221120140829.3057894-76-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/blanche.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/blanche.h b/include/configs/blanche.h index dc74ed3e79d6..5bc3df06aa11 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -23,7 +23,7 @@ /* FLASH */ #if !defined(CONFIG_MTD_NOR_FLASH) -#define CONFIG_SH_QSPI_BASE 0xE6B10000 +#define CFG_SH_QSPI_BASE 0xE6B10000 #else #define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BASE 0x00000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 36cc068c4473..8a23b09ef5c0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -194,7 +194,7 @@ CFG_SH_ETHER_CACHE_WRITEBACK CFG_SH_ETHER_PHY_ADDR CFG_SH_ETHER_PHY_MODE CFG_SH_ETHER_USE_PORT -CONFIG_SH_QSPI_BASE +CFG_SH_QSPI_BASE CONFIG_SLIC CONFIG_SMDK5420 CONFIG_SMP_PEN_ADDR From patchwork Sun Nov 20 14:08:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706874 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=VtNFEpJh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXh01lFsz23mR for ; Mon, 21 Nov 2022 01:18:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A21848545B; Sun, 20 Nov 2022 15:10:30 +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="VtNFEpJh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E8BDD8530D; Sun, 20 Nov 2022 15:09:34 +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 C528A852F8 for ; Sun, 20 Nov 2022 15:09:20 +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 c15so5925394qtw.8 for ; Sun, 20 Nov 2022 06:09:20 -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=IR7Gud2h8Fobw47GYABKLvaqQpkOrct8cMfjQj2yTF4=; b=VtNFEpJhl+2dK9j1NmhcJgcHHdLdIKAz9CMZb+WMy9+OP0o+Q/ngEcXBzCMnEQXyfC kItTVSpQpIHeE2QpSero5bEza4MyEtE66uCcw4y7gtCgVzCr3IUvDFgYNNxo9g1fsnob 80gsujVM5qhyNWJLVtbb2LIcyosUmDJeR0rys= 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=IR7Gud2h8Fobw47GYABKLvaqQpkOrct8cMfjQj2yTF4=; b=2IAdUMbHZmMYVmNM9No4ESjLjHtCx61rKVYQOYvOwxCkIA0TXBfpm2xjdfrnj6r086 jH64MtFwOpdoXgsGggcBESNd3reDsuGGHINJh8NJhI8d9YqH0+d1EfQNLlz2HTeQ6oyz MQuGCq6vu4Yrh1U5lnYXYL0wB6tfEs9qfel2tUSuu/a9ZmOi+tg+JoSh572TR/YIKUbm sdABlCMEA5wxRL1nt+O72aSN2yQxtEvWhNMZcfrj+KIih48GT9+3UBtFfIFejsWqpmon tanxxF1OsinBfeBD+CURLoQgT3KKyKSHqXgU93e33qru0ltVWYIDQBMdVYdxRCTTlV0J 5Lpw== X-Gm-Message-State: ANoB5plOOVmFZN1yIKppWXqsK3B19BJs6yWLRRXSofz/nMrPvB4jaTOp BiY1qiS33S/cKy1vyQ7lTTnfbDKo2GZtvw== X-Google-Smtp-Source: AA0mqf5ego0UcaZqDIng/0QDULb5z87syL6+rmA5+CMCqgQIGf5YPqU3OZ+niWhi8LgIS0ilFbgqeA== X-Received: by 2002:ac8:4e2a:0:b0:3a5:24fe:64fe with SMTP id d10-20020ac84e2a000000b003a524fe64femr14264399qtw.249.1668953360266; Sun, 20 Nov 2022 06:09:20 -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.09.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:19 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 186/241] global: Migrate CONFIG_SLIC to CFG Date: Sun, 20 Nov 2022 09:08:16 -0500 Message-Id: <20221120140829.3057894-77-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index ab7972442970..9e26c201b7a8 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -187,7 +187,7 @@ void board_gpio_init(void) setbits_be32(&pgpio->gpdat, 0x00080000); #endif -#ifdef CONFIG_SLIC +#ifdef CFG_SLIC /* reset SLIC */ setbits_be32(&pgpio->gpdir, 0x00040000); setbits_be32(&pgpio->gpdat, 0x00040000); diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index ccc000227b19..4ab2efd528d1 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -13,7 +13,7 @@ #include #if defined(CONFIG_TARGET_P1020RDB_PC) -#define CONFIG_SLIC +#define CFG_SLIC #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0x5c #define __SW_BOOT_SPI 0x1c @@ -42,7 +42,7 @@ * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off */ #if defined(CONFIG_TARGET_P1020RDB_PD) -#define CONFIG_SLIC +#define CFG_SLIC #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0x64 #define __SW_BOOT_SPI 0x34 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8a23b09ef5c0..c1129ffb9e53 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -195,7 +195,7 @@ CFG_SH_ETHER_PHY_ADDR CFG_SH_ETHER_PHY_MODE CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE -CONFIG_SLIC +CFG_SLIC CONFIG_SMDK5420 CONFIG_SMP_PEN_ADDR CONFIG_SOCRATES From patchwork Sun Nov 20 14:08:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706892 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=tJOEdTpC; 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 4NFXlh3gYyz23lt for ; Mon, 21 Nov 2022 01:22:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D197785404; Sun, 20 Nov 2022 15:14:10 +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="tJOEdTpC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5073E85213; Sun, 20 Nov 2022 15:12:26 +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-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) (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 53FF7853DD for ; Sun, 20 Nov 2022 15:09:46 +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-qv1-xf35.google.com with SMTP id s18so4903787qvo.9 for ; Sun, 20 Nov 2022 06:09:46 -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=7KSN5rvlSfe/ZCskFbSU+fT1MD8HhFKM37os9/E0uwI=; b=tJOEdTpCUly99s/ohhqHi2ja+vwM7z2G2eiOtfXw7Crq/yRnhmj0zRZFXjqeFJrOmY Kyk5SG0g5ilyon6dbgHPG4SXMcKvJ3cxvOl0ijtfy1kSr6lQ6+obnZtTA3+9mTBXVgxz a4SbC9EgAlHzz2mbWSyk0XfKq8NB4UUjmMvso= 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=7KSN5rvlSfe/ZCskFbSU+fT1MD8HhFKM37os9/E0uwI=; b=ZmLMezLLW+tBM2H4dHSep9UAqpzkoTg+Y16Ajb8lGrpi3sDDtlfXv58sGOO8Jt4eTr 1x4Zd/x1AAmfLbVTwVlsUtXPmZmtj4gNPP1qt7dhtH/CP5K+z8VLZedhcrGVxnkMXi1y z+FTHSI1C29TjfIMrOkUqhgNd2kNWmHkPhAH0JqxMKFmHIvQ4aAoOi8P+bExm3fSyN4R +cukYGtJ6ycTrAaZsXLcVZ8+D2ZweinHh89c2HnELBefopAbwcJ5LaRAd3wJ2a6ZNUUP Znk2RUZan6VvE+jhMYfx7hEvw+/94DWYCWXswsmwGbM9AWqMfDtsEMkBZBLWTXW6ZDKs neoQ== X-Gm-Message-State: ANoB5pkTJYC+3BXOo/fEoE4d5KSosN4wPH+b0i348R1ex9ee8BLH6Uru HhQsNTEKYcxJpL46nYdWK+dsAezjp3bcsw== X-Google-Smtp-Source: AA0mqf4dR+gSKLtt3uVQNvPCqEFf1OojTsFH/fIpxS7TN9ecU5fLAQu8D+TiVaoeuwlgEEwjcuEVgw== X-Received: by 2002:a05:6214:b22:b0:4bb:6661:61df with SMTP id w2-20020a0562140b2200b004bb666161dfmr13717127qvj.113.1668953360910; Sun, 20 Nov 2022 06:09:20 -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.09.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:20 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 187/241] global: Migrate CONFIG_SMDK5420 to CFG Date: Sun, 20 Nov 2022 09:08:17 -0500 Message-Id: <20221120140829.3057894-78-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/smdk5420.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 0392530c0adf..e182625dd633 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -5,18 +5,18 @@ * Configuration settings for the SAMSUNG SMDK5420 board. */ -#ifndef __CONFIG_SMDK5420_H -#define __CONFIG_SMDK5420_H +#ifndef __CFG_SMDK5420_H +#define __CFG_SMDK5420_H #include #include #include -#define CONFIG_SMDK5420 /* which is in a SMDK5420 */ +#define CFG_SMDK5420 /* which is in a SMDK5420 */ #define CFG_SYS_SDRAM_BASE 0x20000000 /* DRAM Memory Banks */ #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ -#endif /* __CONFIG_SMDK5420_H */ +#endif /* __CFG_SMDK5420_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c1129ffb9e53..4cf75324d291 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -196,7 +196,7 @@ CFG_SH_ETHER_PHY_MODE CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE CFG_SLIC -CONFIG_SMDK5420 +CFG_SMDK5420 CONFIG_SMP_PEN_ADDR CONFIG_SOCRATES CONFIG_SPI_ADDR From patchwork Sun Nov 20 14:08:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706887 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=KHJXHpUA; 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 4NFXkj6swKz23lt for ; Mon, 21 Nov 2022 01:21:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 164DE853A9; Sun, 20 Nov 2022 15:14:06 +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="KHJXHpUA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3657585289; Sun, 20 Nov 2022 15:12:25 +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 4EB23853D9 for ; Sun, 20 Nov 2022 15:09:46 +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 l2so5912170qtq.11 for ; Sun, 20 Nov 2022 06:09:46 -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=ZUFHHbAbBg4kcMUa6eo33EKOxbp6q5RfaFAXcEuu/iw=; b=KHJXHpUA2Ryn6LLIBTHzFZDTW05Skf3Y1EF4KkSYJQL2RwSF7eUfmUolcLG5Wpw0+O YyLoymE9pJ62rMuauRhpQdUWHgnUGyd5blVdfGE2L1aA1C3Locx+iy9hZ74wW7S/32hw ZZ+PYgV7/aRrIAF5GEy7Wu8dEGlUINkBJlGbw= 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=ZUFHHbAbBg4kcMUa6eo33EKOxbp6q5RfaFAXcEuu/iw=; b=Sk4l8g1S6I9cw3mHElDvLkjEIcuejRZSLvlO41EfP0XSX7iUyTl8Ibw03t92fpNPV7 X8xy66xOwBlATFZOfPnOtOm1ZrUIPnC9OaiiZHG/8wpwJ67b/fOxDqoS2uALN3DK2qE8 wj+6K4wSb/yfyK0seHJOZ+qr3AtYPWXXiexpqaCm08IiLPkZEELLJMS2W1MrPdoXj9Uy cwhg/t+zEYGolMl09H276NQErULd6ulyz07YA0YEf1pXRhsLXlN/3HrYUfxP6juUcc65 B1atmdrKeK53XVN1k/P2gPxjTaEeM+EKT6YEXc1awIqbUu6eoAaQ8gqel8P5s3e85IA3 kPhg== X-Gm-Message-State: ANoB5pk4pkCiZvjH7vkPWr5ouOChSln3d21f9DBd+WBYtLoFwkSFpHfv F0AUGv7lYyY/9syoUXH33bHkLhFm77g3pg== X-Google-Smtp-Source: AA0mqf4NEgP9jwsNtOUuhL+DvGvoJpQM0ptwJ9FKS7LiWb9WfGxPFv9DkYHI/UB2lSdxbSAmSfIvhA== X-Received: by 2002:ac8:72d0:0:b0:3a5:9e38:9f4 with SMTP id o16-20020ac872d0000000b003a59e3809f4mr13878158qtp.532.1668953361483; Sun, 20 Nov 2022 06:09:21 -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.09.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 188/241] global: Migrate CONFIG_SMP_PEN_ADDR to CFG Date: Sun, 20 Nov 2022 09:08:18 -0500 Message-Id: <20221120140829.3057894-79-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- board/samsung/arndale/arndale.c | 4 ++-- include/configs/arndale.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 51beda79c967..9794ade40463 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -205,11 +205,11 @@ ENTRY(_nonsec_init) bx lr ENDPROC(_nonsec_init) -#ifdef CONFIG_SMP_PEN_ADDR +#ifdef CFG_SMP_PEN_ADDR /* void __weak smp_waitloop(unsigned previous_address); */ ENTRY(smp_waitloop) wfi - ldr r1, =CONFIG_SMP_PEN_ADDR @ load start address + ldr r1, =CFG_SMP_PEN_ADDR @ load start address ldr r1, [r1] #ifdef CFG_PEN_ADDR_BIG_ENDIAN rev r1, r1 diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index a992dc684291..3ebf600e1d7c 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -112,10 +112,10 @@ int checkboard(void) } #endif -#ifdef CONFIG_SMP_PEN_ADDR +#ifdef CFG_SMP_PEN_ADDR void smp_set_core_boot_addr(unsigned long addr, int corenr) { - writel(addr, CONFIG_SMP_PEN_ADDR); + writel(addr, CFG_SMP_PEN_ADDR); /* make sure this write is really executed */ __asm__ volatile ("dsb\n"); diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 8acc525b11c9..b56effcd411e 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -16,7 +16,7 @@ /* Miscellaneous configurable options */ -#define CONFIG_SMP_PEN_ADDR 0x02020000 +#define CFG_SMP_PEN_ADDR 0x02020000 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ #define CFG_ARM_GIC_BASE_ADDRESS 0x10480000 diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 7e850517494e..3b0ecf578063 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -164,7 +164,7 @@ {1, {I2C_NULL_HOP} }, \ } -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index d6122856f069..08532dc3e0aa 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -90,7 +90,7 @@ #define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index ccbf7c2e70dc..498c89c3cf21 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -274,7 +274,7 @@ #endif #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index a554ee459042..128d80f48062 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -155,7 +155,7 @@ /* GPIO */ #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4cf75324d291..fa6ceab52d5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -197,7 +197,7 @@ CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE CFG_SLIC CFG_SMDK5420 -CONFIG_SMP_PEN_ADDR +CFG_SMP_PEN_ADDR CONFIG_SOCRATES CONFIG_SPI_ADDR CONFIG_SPI_BOOTING From patchwork Sun Nov 20 14:08:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706891 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=j9OciLJX; 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 4NFXlV4RzDz23lt for ; Mon, 21 Nov 2022 01:21:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B939853FB; Sun, 20 Nov 2022 15:14:09 +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="j9OciLJX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 324088530A; Sun, 20 Nov 2022 15:12: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-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (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 D1E51853E8 for ; Sun, 20 Nov 2022 15:09:46 +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-x835.google.com with SMTP id z6so5927537qtv.5 for ; Sun, 20 Nov 2022 06:09:46 -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=C+AJIBbMDLsQwoEkJVlLu+GzMTm6LgIdpPXnOKO0vA8=; b=j9OciLJXiruzm0nyaVM/cAVP5pZQKFRQGdGxfbYrM4etScYO+4vB993FWEOs3LIT9G 6lI1rh2ICT8wrTu3V7xMUeHLNjEiFNqwwy0zFLwWVJA4F7OIVnMXIIktnzDGTw9dJ1Qu VI7k4UTSx45FlgvhNWbLUQRA3kyLJzI8gAvDg= 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=C+AJIBbMDLsQwoEkJVlLu+GzMTm6LgIdpPXnOKO0vA8=; b=v2UgWdYNanYcH5jWmEP0Ki8GKwiBOINGQeYtFvTzqSijsitYHR+APZBkNNRPN044dQ 4zv6iM+JVvm2IX94+KSLPTLmk28ITiLFutM+tMyhD9iYAkCcBeDk02GdjoWRv6ugv3Jw RJa2hpdnqQakIAeCkVjoB4hUCbyh1irjWHXgEajtSbIZFE8unqOoYykBvUInRivvEow1 zEqWNWlsyAEsl6vuJSVnBtmNP/8ILeIOXt4lpRM4PMJxIsQnR2+/lZ8tABDNFU2he26u BYVlDnb7a2k/bptm6/qKs4rZDV+VezBc+MQKJPgGZ1gTR2Zumrm2JjTl8Y3khtesFpCA CmcA== X-Gm-Message-State: ANoB5plT5V4lmLKL1sxNlIhfin35Ri0nQ1Y9gECJcXA0zmGk727z9lhl t8/yn3CparOUdjpqXexGdCFZ2+BZVZGexQ== X-Google-Smtp-Source: AA0mqf5iOXUcckNk/lFKiqjARKj9UNa8iIMUXwRhWGYOL1+NEi207kFozgWbgE3hGmI7s9ynEO3a9w== X-Received: by 2002:ac8:4d0e:0:b0:39d:11a9:760d with SMTP id w14-20020ac84d0e000000b0039d11a9760dmr13651975qtv.139.1668953362209; Sun, 20 Nov 2022 06:09:22 -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.09.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 189/241] global: Migrate CONFIG_SOCRATES to CFG Date: Sun, 20 Nov 2022 09:08:19 -0500 Message-Id: <20221120140829.3057894-80-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/socrates.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/socrates.h b/include/configs/socrates.h index eb5c14fff28e..ddbd257d08a5 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -17,7 +17,7 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_SOCRATES 1 +#define CFG_SOCRATES 1 /* * Only possible on E500 Version 2 or newer cores. diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fa6ceab52d5c..9f28554caab4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -198,7 +198,7 @@ CFG_SH_QSPI_BASE CFG_SLIC CFG_SMDK5420 CFG_SMP_PEN_ADDR -CONFIG_SOCRATES +CFG_SOCRATES CONFIG_SPI_ADDR CONFIG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD From patchwork Sun Nov 20 14:08:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706879 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=rqxu0Xuy; 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 4NFXj40HVsz23mR for ; Mon, 21 Nov 2022 01:19:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63E5F8546E; Sun, 20 Nov 2022 15:10:38 +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="rqxu0Xuy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1A8385329; Sun, 20 Nov 2022 15:09:34 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 61950852FB for ; Sun, 20 Nov 2022 15:09:23 +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-x833.google.com with SMTP id e15so5937918qts.1 for ; Sun, 20 Nov 2022 06:09:23 -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=KQfoUov1wQQaw7fhtci3L0tDVfqx/SQfLWHLbP9xgCA=; b=rqxu0XuyFl56Qwt04KX9zKj1mCiqX10cYjOe0l6I0mprXzpUjAWCFFQ45glnGbbT0+ moAGjiPgwATbvx0gr4VvCGNqUpWuCg+LuzNxv0D51BROhUdlVShKg2PXYb/sbQrVlvYh +urXM4ptE0KI/pjID3Xfb9he9O0il69nJiNQ8= 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=KQfoUov1wQQaw7fhtci3L0tDVfqx/SQfLWHLbP9xgCA=; b=vTMUCwjaNCXrNmecNvl4dqa1DVMk6BaPzY3Pok/6nNmK8hLOcCEdH+ahS5nU8idJq2 L8FNLqxkKRrlu8+ZL7p6XYuq4aYB95RHNOcsyrw5YPsKmAoukIqOpZMZXqrpLKsLvnqF RZVXQdQ7ziRpFJDbiNr8BVY3MTT7LMHJmeXehZbY4sYNAWFitsDWpRxqSZya5aBN4MZQ tU1TTSMkCPFHoFQQvVFlrA81e40iqQtKsWaWRZ2zZKI4fikb6yTx35u7u4Ix+CDUUHQT yubt9ybJRy8q/H7ltj9QoYlcFYrNpESfmmUTBubH9Z1Lij/hf4Jooe7KDq8DqWmxirMq 5EAQ== X-Gm-Message-State: ANoB5pml9seK3ykaz0e95CnU2NNaUqBTHDnVpaPXcdIx6ckzvCxMii4u BWNFB39qWm2B+nG+MkaJc92/APbHEYuuXg== X-Google-Smtp-Source: AA0mqf5L3XRxNCzVTDJNrTzqSqRG2Qcc0rzJfkG12OqRUvQkqYhNhgyn1F27ovvNplG7w6zcYtl0kQ== X-Received: by 2002:ac8:688:0:b0:3a5:122:fb79 with SMTP id f8-20020ac80688000000b003a50122fb79mr3470070qth.452.1668953362874; Sun, 20 Nov 2022 06:09:22 -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.09.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:22 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 190/241] global: Migrate CONFIG_SPI_ADDR to CFG Date: Sun, 20 Nov 2022 09:08:20 -0500 Message-Id: <20221120140829.3057894-81-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/mt7629.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index d7700673f6f7..6fc851f2079c 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -17,8 +17,8 @@ /* Defines for SPL */ -#define CONFIG_SPI_ADDR 0x30000000 -#define CFG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO) +#define CFG_SPI_ADDR 0x30000000 +#define CFG_SYS_UBOOT_BASE (CFG_SPI_ADDR + CONFIG_SPL_PAD_TO) /* SPL -> Uboot */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9f28554caab4..9989d7052f14 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -199,7 +199,7 @@ CFG_SLIC CFG_SMDK5420 CFG_SMP_PEN_ADDR CFG_SOCRATES -CONFIG_SPI_ADDR +CFG_SPI_ADDR CONFIG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE From patchwork Sun Nov 20 14:08:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706882 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=jTcgfRgh; 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 4NFXjg1Vfjz23lt for ; Mon, 21 Nov 2022 01:20:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF2B28547F; Sun, 20 Nov 2022 15:10:41 +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="jTcgfRgh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CA4CC85369; Sun, 20 Nov 2022 15:09:44 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 E62F285324 for ; Sun, 20 Nov 2022 15:09:23 +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-x833.google.com with SMTP id e15so5937927qts.1 for ; Sun, 20 Nov 2022 06:09:23 -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=kd/rIY2jyZMBV4P2ffnW++FvAi748Rfizp0wW6pFdt8=; b=jTcgfRghh7DmJ6dwtHCJJKBkVyRxsSG5ZNZqT4syeUKJ7D5IDhMCGJjDugK3dLShsm oNPAv4OEreLofSZLZFXZgWDwtZ8SvmekCZXjlBOD7qor52ID/uWnQz0uKnNdN6bhg/oP jLxq/4wsG3H412iRUtfNCTVjSUE8tf85UdPos= 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=kd/rIY2jyZMBV4P2ffnW++FvAi748Rfizp0wW6pFdt8=; b=uhcykhSHAHiZuszZbqTjSSmUdk1slmvknlEX0O+HEcGb4pDwOSSbzVWb0BOLYtze+F B5aTBB2WtHJdnI1IExpfjAyrzivadxv77Dr2O/F85uqmDGC2HF6tV1iz2DYlAO5P2IjD C2mNulI//6Y5fKvOeQbAdH38i0E87P++s6MBI/olAnzLjmo33zt12EZFspgxgG7zLXZp Uc+XTxmePsGjUtzgbO1vsafzO8FJfo5zuTRlDKNuj5fpIlVBlj2Jrao9Nldet+1pUWJu z364snUVsIhDKwkqLYEbecoSeJAn8wIMCBG/YnQY3+Dkuuv5LuolRAQ92xmkFgc/b3Me UPzw== X-Gm-Message-State: ANoB5pkimWXA411JyQjUw6hjWyatHzfIpTqFgm3Ioe4lgmpC0MrOBWUL aKBcoalhiJdeI8ELrZIk2vi791U6npKVcQ== X-Google-Smtp-Source: AA0mqf7aKLPCFKOVk/3VqqpLDLTFl4JD7oVOkxtnXFgjTseuukr959VEOK7cRijOv2+WWonSUL1HUg== X-Received: by 2002:ac8:7657:0:b0:3a5:663d:730 with SMTP id i23-20020ac87657000000b003a5663d0730mr13671660qtr.291.1668953363435; Sun, 20 Nov 2022 06:09:23 -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.09.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:23 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 191/241] global: Migrate CONFIG_SPI_BOOTING to CFG Date: Sun, 20 Nov 2022 09:08:21 -0500 Message-Id: <20221120140829.3057894-82-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-exynos/spl_boot.c | 6 +++--- include/configs/exynos5-dt-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c index 553dac75b61d..83bdee9f8579 100644 --- a/arch/arm/mach-exynos/spl_boot.c +++ b/arch/arm/mach-exynos/spl_boot.c @@ -94,7 +94,7 @@ static int config_branch_prediction(int set_cr_z) } #endif -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING static void spi_rx_tx(struct exynos_spi *regs, int todo, void *dinp, void const *doutp, int i) { @@ -220,7 +220,7 @@ void copy_uboot_to_ram(void) u32 (*copy_bl2)(u32 offset, u32 nblock, u32 dst) = NULL; u32 offset = 0, size = 0; -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING struct spl_machine_param *param = spl_get_machine_params(); #endif #ifdef CONFIG_SUPPORT_EMMC_BOOT @@ -248,7 +248,7 @@ void copy_uboot_to_ram(void) bootmode = get_boot_mode(); switch (bootmode) { -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING case BOOT_MODE_SERIAL: /* Customised function to copy u-boot from SF */ exynos_spi_copy(param->uboot_size, CONFIG_TEXT_BASE); diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index c9e0c13172cc..a0cdbd746a9a 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -17,6 +17,6 @@ #define CFG_SYS_SPI_BASE 0x12D30000 #define FLASH_SIZE (4 << 20) -#define CONFIG_SPI_BOOTING +#define CFG_SPI_BOOTING #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9989d7052f14..cb15aa3c8f4e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -200,7 +200,7 @@ CFG_SMDK5420 CFG_SMP_PEN_ADDR CFG_SOCRATES CFG_SPI_ADDR -CONFIG_SPI_BOOTING +CFG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX From patchwork Sun Nov 20 14:08:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706893 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=eqpsdEpB; 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 4NFXlv3gQ1z23lt for ; Mon, 21 Nov 2022 01:22:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C12828544B; Sun, 20 Nov 2022 15:14:11 +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="eqpsdEpB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C26285322; Sun, 20 Nov 2022 15:12:28 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 D1407853E7 for ; Sun, 20 Nov 2022 15:09:46 +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-x833.google.com with SMTP id w9so5906806qtv.13 for ; Sun, 20 Nov 2022 06:09:46 -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=fpHbX9e170f5vP+FpZ/GTox69NHICpl8dpJuWm8NoY8=; b=eqpsdEpBSfpqWndXG2DaOjzTEpMxuyUl+V8UUUpvVAHDw7zlt3kIDlp5R+3wy8lU/j FefnEPwvyijsyA8fDGrr1hQtjhBNzcAuFh6rQLcFSKLYzrTvtanHi33VCsXPsGngsNOY lc7b83Y+2/jmmNwBHuGfu/oT2mVrloyXS1C7I= 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=fpHbX9e170f5vP+FpZ/GTox69NHICpl8dpJuWm8NoY8=; b=n9V2twZPOC/NKVo27fEzntERbs0pYBjFCmCAV5cKjM5rJS5QoFNVoi1872ujtJ1j0Y p7HEY5ISXIf8EsoDCKxAgAApXWZx1yVmxot1+dc2Ox/JSLFiF8PA6JduI0xMZgwvLzsk zRnsP5nGkFvzLQYxRvGyT1ri2erxsyRsNMzk9mASOIE10qYwKFfVMRnCJMwXdlw2x3os uJ3jmU0+AwX077gKMWr+w4CY/6qmX3nZHP13ybrz9SGzii6PL8fQ0bBq9ErzgyRJQ1xA c7F299IoLopb1Htpo3KN2FO8vCuHGgIj7nic8WOJauJPhTf2/hCt/cy50J3SDXJa0w41 kWgw== X-Gm-Message-State: ANoB5pnPWKOfzYEQ7MWEuAxMX78B6ot/9mvcdrWTi2gO1zFxhUEyQFIz laFGKpjs9HnBVzPn/MT+CHe2I3AMrsMI6w== X-Google-Smtp-Source: AA0mqf6b/vUAboyQVARyUlzbfOf+jvQEPc/1SNd4rQTWPu8hkBiERRDP7aky822NVvoMjUz4q5cdlg== X-Received: by 2002:a05:622a:8c8:b0:3a5:7de1:9708 with SMTP id i8-20020a05622a08c800b003a57de19708mr14043338qte.616.1668953364117; Sun, 20 Nov 2022 06:09:24 -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.09.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:23 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 192/241] global: Migrate CONFIG_SPI_FLASH_QUAD to CFG Date: Sun, 20 Nov 2022 09:08:22 -0500 Message-Id: <20221120140829.3057894-83-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/alt.h | 2 +- include/configs/porter.h | 2 +- include/configs/silk.h | 2 +- include/configs/stout.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/alt.h b/include/configs/alt.h index 45918c2af439..1b29420db63d 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -21,7 +21,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) /* FLASH */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/porter.h b/include/configs/porter.h index 1526f470e8e1..65d5eb95739f 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -22,7 +22,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024) /* FLASH */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/silk.h b/include/configs/silk.h index c7346a356542..be73a7f01ace 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -22,7 +22,7 @@ #define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024) /* FLASH */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/stout.h b/include/configs/stout.h index 910997e08c7e..d9b8ebf311d9 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -26,7 +26,7 @@ #define CFG_SCIF_A /* SPI */ -#define CONFIG_SPI_FLASH_QUAD +#define CFG_SPI_FLASH_QUAD /* SH Ether */ #define CFG_SH_ETHER_USE_PORT 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb15aa3c8f4e..371a292a17de 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -201,7 +201,7 @@ CFG_SMP_PEN_ADDR CFG_SOCRATES CFG_SPI_ADDR CFG_SPI_BOOTING -CONFIG_SPI_FLASH_QUAD +CFG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET From patchwork Sun Nov 20 14:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706878 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=XRLAkIIP; 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 4NFXhs4p6Bz23mR for ; Mon, 21 Nov 2022 01:19:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB8D38546B; Sun, 20 Nov 2022 15:10:36 +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="XRLAkIIP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F11B1852FA; Sun, 20 Nov 2022 15:09:32 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 44A8485329 for ; Sun, 20 Nov 2022 15:09:25 +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-qk1-x734.google.com with SMTP id s20so6541925qkg.5 for ; Sun, 20 Nov 2022 06:09:25 -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=2b3mp0G+zuvHap67KY8CCM9mvb8Df1F62rdh2V3iBNE=; b=XRLAkIIPR7qyV2fVDk8VXspKqwUwFgwgyP0WalETQUT7PWSRoGjsydfYBDvbKWPLYE PI11dYTyGuMmtOT4EuWjqRoDuFV93RM/L0PEBTbGFlZSxMOtR1jI2y2W7aXjlXHB6Z+I ujJJ+tv/p68fn7QQJ72DJ4PQhCgLfkbtylRCs= 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=2b3mp0G+zuvHap67KY8CCM9mvb8Df1F62rdh2V3iBNE=; b=KjwMKGGg6S0LGxbDHzVXbUi2ezqosA6PKOoGrdwmK6Nj6VtgcsTSDCuD3loT27dTB0 RZYYOmT+gJMHW4QDj68x2dIcQ0VKZGB658JZdaeAz6v7t3YECq09C5L83DLZFT+YYtB2 +pVtUEk0H/PD/yM2qMUxLtTscMUSZ3vE7C5+siHejroHuriNaWUnwJ/IuObn9BijLnBe 3nhl+/3O+WL3OsP6MWmXgOatigRqSCZ9ghDgjeDYYlE1styI7slJDgqcISdPX6im2kAe gzLsx4NyfbievksrFLvmLb8Nhc+zEbENhLTXm7UyTqfsLejbvHuTQ53Ph022rDkElyyZ RWsw== X-Gm-Message-State: ANoB5pkfXd4iqpw09zHP0yxigfJ9nC+KZ6Lzp3qvbcZ3sCpX8vahjKH3 1+DfVf33NLc4SYotrb9xPKNpIduT82kv7w== X-Google-Smtp-Source: AA0mqf7eM8eS+KUg4xnbtA9wHKYIX2dWqI0lVyYMUPpBNHhGp703EVtAXxGIKp38bYoN/h5ha6SXfA== X-Received: by 2002:a37:b42:0:b0:6fb:dbda:2e71 with SMTP id 63-20020a370b42000000b006fbdbda2e71mr7590264qkl.139.1668953364687; Sun, 20 Nov 2022 06:09:24 -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.09.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:24 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 193/241] global: Migrate CONFIG_SPI_FLASH_SIZE to CFG Date: Sun, 20 Nov 2022 09:08:23 -0500 Message-Id: <20221120140829.3057894-84-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/venice2.h | 2 +- scripts/config_whitelist.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 6b5f650811b8..1a540c9f7122 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -22,7 +22,7 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 35c5a4f12261..0a5eaf03d9a5 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -26,7 +26,7 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 55e2d744c4a0..3aaed94e15cb 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -23,7 +23,7 @@ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 24cf554649ba..39e1aded3730 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -20,7 +20,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index b846889541c7..d3bb6d760376 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -21,7 +21,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index baa452156ecd..fbba4ca701db 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -19,7 +19,7 @@ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index ecd0405d297b..dd756a5056c8 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -20,7 +20,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 7f942888e74d..10b36e6a1657 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -20,7 +20,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 50cddb4a4acb..6578350990d7 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -20,7 +20,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h index ec1a8634e718..34ab82fe1173 100644 --- a/include/configs/p3450-0000.h +++ b/include/configs/p3450-0000.h @@ -24,7 +24,7 @@ func(DHCP, dhcp, na) /* Environment at end of QSPI, in the VER partition */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #define BOARD_EXTRA_ENV_SETTINGS \ "preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \ diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 098796637010..6566dc170ff6 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -20,7 +20,7 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/include/configs/venice2.h b/include/configs/venice2.h index b2dc04a975ad..1cf493a50373 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -21,7 +21,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */ -#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#define CFG_SPI_FLASH_SIZE (4 << 20) #include "tegra-common-post.h" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 371a292a17de..c1e6c9cc89bc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -202,7 +202,7 @@ CFG_SOCRATES CFG_SPI_ADDR CFG_SPI_BOOTING CFG_SPI_FLASH_QUAD -CONFIG_SPI_FLASH_SIZE +CFG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_STACKBASE From patchwork Sun Nov 20 14:08:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706875 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=EmyWRkfh; 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 4NFXhD38LKz23mR for ; Mon, 21 Nov 2022 01:19:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C4D7C85461; Sun, 20 Nov 2022 15:10:31 +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="EmyWRkfh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 413CC852F1; Sun, 20 Nov 2022 15:09:35 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 DC25285313 for ; Sun, 20 Nov 2022 15:09:25 +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-x833.google.com with SMTP id cg5so5911251qtb.12 for ; Sun, 20 Nov 2022 06:09:25 -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=ODW77d2tyAtten8uDrxCqOVsnmyVat0pOJLwsfkmhgA=; b=EmyWRkfhh8J8dTcrvdJk62GqelUSvOoWMUpnB164FxpjVEtp+ToXarnQVJ4qpgscit O0YSf/PYcwVeSdAtO7dMOjRJxEzlZCEeBeK7b4t9FbXY5vnoysmYuVf2qiBsi58V3/dX oi1Ze4Jobsho8H8ys53QAU6uGe9o5kwyJVom8= 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=ODW77d2tyAtten8uDrxCqOVsnmyVat0pOJLwsfkmhgA=; b=2+SB37Qx3alMnhGj7d77QTaqnbtuckYE+G4dgjGGHrh/Aqy+DJeL0GSu+7qGjZaVSU Is/i2tUQwRVwSjHPks2kMOXyOVEbqAwZeiKuDqxC05jlnsCG586CVb+mQdw2Tjgnaatw 9Aikte61BkFPKb8hFpKWw97/1M1yg9VgchtYoAHMS+5hBHEQsGKd2iIDiuIg2Mc3wgU1 XrIH/m7M+9J21F/R6/1mKveIvgL5kVouckyr+8hN2H3r+t1pvyFrqtOnunuauJB1Eb9Z Uy9rfkWyfmNU3rSdIYPBuKSSxJ4OqIf6vDS0YP+R59t1wefygAzc2ienTMU/KbnD2vmN AIiw== X-Gm-Message-State: ANoB5pmXoO760uTAoI6aVePyF1NlnvQRfJjw2FIrsWFOdA9jtb2yVXN1 V2TV3J4hlkz5ZwJWmVUREa4rvEN6i9WJ5Q== X-Google-Smtp-Source: AA0mqf4+C9t3dZdQG+JBry2MF4XXMy1/OmobuCk2MGMv8xO/3x4/+eEKSrO7ILoJtli5Dxsk/jSm7g== X-Received: by 2002:ac8:455a:0:b0:39c:e448:e7c2 with SMTP id z26-20020ac8455a000000b0039ce448e7c2mr13689767qtn.677.1668953365386; Sun, 20 Nov 2022 06:09:25 -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.09.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:24 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 194/241] global: Migrate CONFIG_SPI_HALF_DUPLEX to CFG Date: Sun, 20 Nov 2022 09:08:24 -0500 Message-Id: <20221120140829.3057894-85-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/mxs.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 17b4295d2d6d..8d917dc12d2d 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -88,7 +88,7 @@ /* SPI */ #ifdef CONFIG_CMD_SPI -#define CONFIG_SPI_HALF_DUPLEX +#define CFG_SPI_HALF_DUPLEX #endif #endif /* __CONFIGS_MXS_H__ */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c1e6c9cc89bc..c83653e9ca94 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -203,7 +203,7 @@ CFG_SPI_ADDR CFG_SPI_BOOTING CFG_SPI_FLASH_QUAD CFG_SPI_FLASH_SIZE -CONFIG_SPI_HALF_DUPLEX +CFG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR From patchwork Sun Nov 20 14:08:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706895 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=fn8wRsCG; 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 4NFXmN10xMz23lt for ; Mon, 21 Nov 2022 01:22:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65FC485487; Sun, 20 Nov 2022 15:14:14 +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="fn8wRsCG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1643085371; Sun, 20 Nov 2022 15:12:29 +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-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (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 EF5CB853E9 for ; Sun, 20 Nov 2022 15:09:46 +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-x82f.google.com with SMTP id a27so5912256qtw.10 for ; Sun, 20 Nov 2022 06:09:46 -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=pHNsDtavgILuZXSUMdxRB1e/y7ldh2YtZIrKoAMjmdQ=; b=fn8wRsCGsFZqCK0Y5s+jWuSl/g5hhLSgwkBNseII2KNOwccy2ofo3XQLSrVxJxkxKr F6qZbRWC14xgKvvk57vMIe6sd2T4svF9q2xQF23t3Z90tOKXtidCX7296eJPm332QkYq AYNQvhnaAXqAH85bjPTtNY3cTGwPDZrHJBz4E= 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=pHNsDtavgILuZXSUMdxRB1e/y7ldh2YtZIrKoAMjmdQ=; b=CXWU+s2XsytO9TRbpRD5HfR73WOnjLJ/aaHGoZr6u+8VafWykLdEQ2tQgAW7XeoWM1 ASj/sR7Z+UbHw7cxK3NwgXPPasUFTYBBsrs4xIhbOA4Uedua508GXjI02AEuO6VRSoDr oKMoxccrd7s8G8FJhslecz3j8s/XXYiNo58AueUL2+/Hg2s0s+9mH1lIzH704tq+l5qn cXgU7ZAkaqezSVxcI2Ne8dwQQphxQs5W/NynH3kXUU74ThaDdHKiNoBcM9kyHPeGvQve EMIQ/Bcs66C2y41u28kDnoBJrLiSpcBYGCLOcrfur2LaInmjLJSvUXJUQYZ+m4ogsYC7 zqiQ== X-Gm-Message-State: ANoB5pmZkM33uiWvwm7gvi9jalvKVvAPqyLJJcSIvjZLiKzz0GutqcLr pTMuCo0vnAfkXY2VoHm1t134m8XFzl+jvA== X-Google-Smtp-Source: AA0mqf4uXvCTxAiNHm2VBAQptbjB66bSz61rI5qD7ExAgWvqi7T+MvfP7IQF/+3TmNAGUvHyDdmlsw== X-Received: by 2002:ac8:1246:0:b0:3a5:fbf9:1f7b with SMTP id g6-20020ac81246000000b003a5fbf91f7bmr13883744qtj.353.1668953365921; Sun, 20 Nov 2022 06:09:25 -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.09.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:25 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 195/241] global: Migrate CONFIG_SPI_N25Q256A_RESET to CFG Date: Sun, 20 Nov 2022 09:08:25 -0500 Message-Id: <20221120140829.3057894-86-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/socfpga_sr1500.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 70df27241ca6..30663c08f2e2 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -16,7 +16,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* Enable SPI NOR flash reset, needed for SPI booting */ -#define CONFIG_SPI_N25Q256A_RESET +#define CFG_SPI_N25Q256A_RESET /* Environment setting for SPI flash */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c83653e9ca94..7058ba72ba7f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -204,7 +204,7 @@ CFG_SPI_BOOTING CFG_SPI_FLASH_QUAD CFG_SPI_FLASH_SIZE CFG_SPI_HALF_DUPLEX -CONFIG_SPI_N25Q256A_RESET +CFG_SPI_N25Q256A_RESET CONFIG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS From patchwork Sun Nov 20 14:08:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706876 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=eOOERTMv; 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 4NFXhR2spmz23mR for ; Mon, 21 Nov 2022 01:19:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8F4085464; Sun, 20 Nov 2022 15:10:32 +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="eOOERTMv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80AD485313; Sun, 20 Nov 2022 15:09:37 +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-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 1EE148533D for ; Sun, 20 Nov 2022 15:09:27 +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-x830.google.com with SMTP id h21so5939690qtu.2 for ; Sun, 20 Nov 2022 06:09:27 -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=x0toH8LwPQ8f65huohgh6XDZJfCHQEGxcEdTGW+9Y6k=; b=eOOERTMv8Ekcl3Y+l6TDovW8Utq/gQWsqbJBWGUMv47AdOROT8xYUu06K34DBjlth6 IFCFSJt0dTR7xMirQdkiOMcTO1iYhfZckFrCBmZiOdAOkFtHGeL0Azc9cFdIyu9XzYqp Ae4SAoAE2iRhuGN9FfRLMpjEv95E383Mh5YIw= 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=x0toH8LwPQ8f65huohgh6XDZJfCHQEGxcEdTGW+9Y6k=; b=phYiLrPlsDBKvJNwvLKex7dcBzdqHe4pEltY2qnU/GmhlCbR3EIP/c5fDXqE0ZRql0 gUmuxnq8XUItb+vhICix5BDLJFzFYTpwJu1GdDqY3/bdanFGNrIdg2JmUfe7j/Zna+XZ ZK21PyGPSeHx5zMAUkMvIUYghBClniITP6JyRd0j974q6ITjD2u4eNCuRxGfxx8Umg5+ jfGH3OrDuDKaASdkrRiiThflvNAQpGk5WxxShVnI5R6yQfCzVNfAJis+QcGmUaQ9Lx6t dUM5CoMe8JvPCK72BD3Oj6NoifYlRzquph3oGjXWEVs55iLtO7MjAnfkowBje/FIzGsP jBCw== X-Gm-Message-State: ANoB5pl29pHytVTb6IaGQTvUprGPMfqlVXInIy51kL7aibGBfkT4JZU+ dhsDjDFDDmo4uD6ddhVNe7+sEID+FFXR0A== X-Google-Smtp-Source: AA0mqf6Ekt5BLILrTsT8LokQ6jB9wHNURGvY48YV5V1wbCgN13dfVtVN+bsiGY/ux27rGJ9gs5Q3mg== X-Received: by 2002:a05:622a:429a:b0:3a1:e533:23a7 with SMTP id cr26-20020a05622a429a00b003a1e53323a7mr13629807qtb.197.1668953366593; Sun, 20 Nov 2022 06:09:26 -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.09.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:26 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 196/241] global: Migrate CONFIG_STACKBASE to CFG Date: Sun, 20 Nov 2022 09:08:26 -0500 Message-Id: <20221120140829.3057894-87-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/tegra-common.h | 2 +- include/configs/tegra114-common.h | 2 +- include/configs/tegra124-common.h | 2 +- include/configs/tegra20-common.h | 2 +- include/configs/tegra30-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 66cf7ae5847e..bde7ffce008f 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -45,7 +45,7 @@ #define CFG_SYS_BOOTMAPSZ (256 << 20) /* 256M */ #ifndef CONFIG_ARM64 -#define CFG_SYS_INIT_RAM_ADDR CONFIG_STACKBASE +#define CFG_SYS_INIT_RAM_ADDR CFG_STACKBASE #define CFG_SYS_INIT_RAM_SIZE CONFIG_SYS_MALLOC_LEN /* Defines for SPL */ diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h index 87ec1f5a99d6..ab4fa5504c52 100644 --- a/include/configs/tegra114-common.h +++ b/include/configs/tegra114-common.h @@ -15,7 +15,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x83800000 /* 56MB */ +#define CFG_STACKBASE 0x83800000 /* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index 0485fea6ccb8..b413e2512128 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -17,7 +17,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x83800000 /* 56MB */ +#define CFG_STACKBASE 0x83800000 /* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 617bfb2197cf..a313ac2041a9 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -16,7 +16,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x03800000 /* 56MB */ +#define CFG_STACKBASE 0x03800000 /* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 04fcf11ed82d..c57d2d157e33 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -16,7 +16,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x83800000 /* 56MB */ +#define CFG_STACKBASE 0x83800000 /* 56MB */ /* * Memory layout for where various images get loaded by boot scripts: diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7058ba72ba7f..f271ba83faca 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -205,7 +205,7 @@ CFG_SPI_FLASH_QUAD CFG_SPI_FLASH_SIZE CFG_SPI_HALF_DUPLEX CFG_SPI_N25Q256A_RESET -CONFIG_STACKBASE +CFG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS CONFIG_TEGRA_BOARD_STRING From patchwork Sun Nov 20 14:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706894 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=qeatb3aS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXm66dhwz23lt for ; Mon, 21 Nov 2022 01:22:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF39985478; Sun, 20 Nov 2022 15:14:12 +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="qeatb3aS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 29B66852FA; Sun, 20 Nov 2022 15:12:33 +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-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 598AD853FB for ; Sun, 20 Nov 2022 15:09:51 +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-x833.google.com with SMTP id s4so5931494qtx.6 for ; Sun, 20 Nov 2022 06:09:51 -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=mk+1PfDD5PKmNMGzQK9yYKsab9+65F6DeA0fFgAIF+Y=; b=qeatb3aSWhFu2h1bzZQuTor5HdOjDGDc+gmlRxRYkk5FxJvQ3+TI/Im4CeYbAPYma7 +LGIGglm4Dt7F3PRdXI8UAdVlmOxqdGAsB0y9ZTQ5W6QBlTBDx1/dhfbI+JVAp2FhCkd qyHJ4iZVvbmy5Qth3cVBRO7T/+dffPFJCFdiU= 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=mk+1PfDD5PKmNMGzQK9yYKsab9+65F6DeA0fFgAIF+Y=; b=rLneqqY5oEl92Y04c+6ZTm8LhJMJ7btzL20PGyetm5feMJzmGvG2bGnXsl35RMIsMG e/aj9VKJLubnK3xaTmvXDXveexw24DnPeLJarT3SauptmxCebJXAsxHgqM5Co0ILxevz LYsPXYmvHh6tiKnVVjQAJ3gWuEhKLhUhIBKQMAUy9Oy8uUfV4mMVVO7ow1N8M1dovGjK SL/z8PAyPwX9who4Is71Yq5BzcbI1h7oJHj6lVPRO+sRbpgcn3MHizSE2UFylBp6m8RS Iz2Eua/GG8jNX0TkGix7iSQM9wG7LnOGSDTSDk4GMz3nYh93Axdx8O05iFwZhhBNBp9z pF5A== X-Gm-Message-State: ANoB5pkV6ObBDTVsAa0gGM60sJeY+DfBwvsFFC7js9JUUvH93VPS9Nul A8t4DRieLoJK0ULW1oyLF8aJFDKy1A3qFw== X-Google-Smtp-Source: AA0mqf6N8tBBdvkHerKlDCOTW1SbjeDEByIGe5oKsfz682K8M4hWA687x1XFG6Q5lWR4pQpC3srHGw== X-Received: by 2002:ac8:5b56:0:b0:393:1482:bd1d with SMTP id n22-20020ac85b56000000b003931482bd1dmr359653qtw.519.1668953367153; Sun, 20 Nov 2022 06:09:27 -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.09.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:26 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 197/241] global: Migrate CONFIG_STANDALONE_LOAD_ADDR to CFG Date: Sun, 20 Nov 2022 09:08:27 -0500 Message-Id: <20221120140829.3057894-88-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- arch/arc/config.mk | 2 +- arch/arm/config.mk | 6 +++--- arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +- arch/m68k/config.mk | 2 +- arch/microblaze/config.mk | 2 +- arch/mips/config.mk | 4 ++-- arch/nios2/config.mk | 2 +- arch/powerpc/config.mk | 2 +- arch/riscv/config.mk | 2 +- arch/sh/config.mk | 2 +- arch/x86/config.mk | 2 +- config.mk | 2 +- examples/standalone/Makefile | 2 +- include/configs/display5.h | 2 +- include/configs/microchip_mpfs_icicle.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/qemu-riscv.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/sifive-unmatched.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/xtfpga.h | 6 +++--- scripts/config_whitelist.txt | 2 +- tools/patman/test_checkpatch.py | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README b/README index 3eb882c6a248..57ca5733dd64 100644 --- a/README +++ b/README @@ -1224,7 +1224,7 @@ The following options need to be configured: this is instead controlled by the value of /config/load-environment. - CONFIG_STANDALONE_LOAD_ADDR + CFG_STANDALONE_LOAD_ADDR This option defines a board specific value for the address where standalone program gets loaded, thus diff --git a/arch/arc/config.mk b/arch/arc/config.mk index 2b70945ac342..05e0eb7c9e4b 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -23,4 +23,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common LDFLAGS_FINAL += -pie --gc-sections # Load address for standalone apps -CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x82000000 diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 2065438d0530..9f9d5964dccd 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -3,11 +3,11 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifndef CONFIG_STANDALONE_LOAD_ADDR +ifndef CFG_STANDALONE_LOAD_ADDR ifneq ($(CONFIG_ARCH_OMAP2PLUS),) -CONFIG_STANDALONE_LOAD_ADDR = 0x80300000 +CFG_STANDALONE_LOAD_ADDR = 0x80300000 else -CONFIG_STANDALONE_LOAD_ADDR = 0xc100000 +CFG_STANDALONE_LOAD_ADDR = 0xc100000 endif endif diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index b82aac9126d0..c3af74f1d83f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -14,7 +14,7 @@ #include #endif -#define CONFIG_STANDALONE_LOAD_ADDR 0x80300000 +#define CFG_STANDALONE_LOAD_ADDR 0x80300000 /* * Reserve secure memory diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index ed592334af2e..9b54b0b8f9ff 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -3,7 +3,7 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 +CFG_STANDALONE_LOAD_ADDR ?= 0x20000 PLATFORM_CPPFLAGS += -D__M68K__ KBUILD_LDFLAGS += -n diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk index d35b4f6db7a1..83e51fee649f 100644 --- a/arch/microblaze/config.mk +++ b/arch/microblaze/config.mk @@ -6,7 +6,7 @@ # (C) Copyright 2004 Atmark Techno, Inc. # Yasushi SHOJI -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000 +CFG_STANDALONE_LOAD_ADDR ?= 0x80F00000 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 04f362780580..5434507a958b 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -25,14 +25,14 @@ ifdef CONFIG_32BIT PLATFORM_CPPFLAGS += -mabi=32 KBUILD_LDFLAGS += -m $(32bit-emul) OBJCOPYFLAGS += -O $(32bit-bfd) -CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 +CFG_STANDALONE_LOAD_ADDR ?= 0x80200000 endif ifdef CONFIG_64BIT PLATFORM_CPPFLAGS += -mabi=64 KBUILD_LDFLAGS += -m$(64bit-emul) OBJCOPYFLAGS += -O $(64bit-bfd) -CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 +CFG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 endif PLATFORM_CPPFLAGS += -D__MIPS__ diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index 44260b1431cb..ddf73e3ac2a3 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -4,7 +4,7 @@ # Psyent Corporation # Scott McNutt -CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x02000000 PLATFORM_CPPFLAGS += -D__NIOS2__ PLATFORM_CPPFLAGS += -G0 diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 307ca65745c8..5c3e71984ca9 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -3,7 +3,7 @@ # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 +CFG_STANDALONE_LOAD_ADDR ?= 0x40000 LDFLAGS_FINAL += --gc-sections LDFLAGS_FINAL += --bss-plt PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \ diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk index 1ebce5bd6748..3e81e34d41c2 100644 --- a/arch/riscv/config.mk +++ b/arch/riscv/config.mk @@ -23,7 +23,7 @@ KBUILD_LDFLAGS += -m $(64bit-emul) EFI_LDS := elf_riscv64_efi.lds endif -CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x00000000 PLATFORM_CPPFLAGS += -ffixed-gp -fpic PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections \ diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 78bb2660e1e3..14a81613d05b 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -3,7 +3,7 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000 +CFG_STANDALONE_LOAD_ADDR ?= 0x8C000000 ifeq ($(CPU),sh2) LDFLAGS_STANDALONE += -EB endif diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 889497b6bd75..b808d560c444 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -3,7 +3,7 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 +CFG_STANDALONE_LOAD_ADDR ?= 0x40000 PLATFORM_CPPFLAGS += -fomit-frame-pointer PF_CPPFLAGS_X86 := $(call cc-option, -fno-toplevel-reorder, \ diff --git a/config.mk b/config.mk index b915c29b3f3e..db1c4aa74889 100644 --- a/config.mk +++ b/config.mk @@ -76,4 +76,4 @@ export PLATFORM_CPPFLAGS export RELFLAGS export LDFLAGS_FINAL export LDFLAGS_STANDALONE -export CONFIG_STANDALONE_LOAD_ADDR +export CFG_STANDALONE_LOAD_ADDR diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 5b48a9d43c62..4f6693f5348d 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -42,7 +42,7 @@ endif # source file. ccflags-y += $(call cc-option,-fno-toplevel-reorder) -LDFLAGS_STANDALONE += -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) +LDFLAGS_STANDALONE += -Ttext $(CFG_STANDALONE_LOAD_ADDR) ######################################################################### diff --git a/include/configs/display5.h b/include/configs/display5.h index 6900baa84545..3d63e3528127 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -279,7 +279,7 @@ /* Miscellaneous configurable options */ -#define CONFIG_STANDALONE_LOAD_ADDR 0x10001000 +#define CFG_STANDALONE_LOAD_ADDR 0x10001000 /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h index 0350f7a62da7..ead07ca2dd6a 100644 --- a/include/configs/microchip_mpfs_icicle.h +++ b/include/configs/microchip_mpfs_icicle.h @@ -11,7 +11,7 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000 /* Environment options */ diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index 1adfa5b668ae..833b2ffe129a 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -11,7 +11,7 @@ #include "mx6_common.h" /* Miscellaneous configurable options */ -#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR +#define CFG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR /* Physical Memory Map */ #define CFG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index 11c795787887..8247c434e06d 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -10,7 +10,7 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000 #define RISCV_MMODE_TIMERBASE 0x2000000 #define RISCV_MMODE_TIMER_FREQ 1000000 diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 59e40710de48..72c042a9040e 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -13,7 +13,7 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000 #define RISCV_MMODE_TIMERBASE 0x2000000 #define RISCV_MMODE_TIMER_FREQ 1000000 diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 3cf300a2e459..80df15d67d3e 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -13,7 +13,7 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 +#define CFG_STANDALONE_LOAD_ADDR 0x80200000 /* Environment options */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1be4cde2b70e..dec836a2fecc 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -77,7 +77,7 @@ */ /* standalone support */ -#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR +#define CFG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR /* FLASH and environment organization */ diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 105ce7c0c726..714b21afc6b0 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -61,12 +61,12 @@ */ #if XCHAL_HAVE_PTP_MMU #if XCHAL_VECBASE_RESET_VADDR == XCHAL_VECBASE_RESET_PADDR -#define CONFIG_STANDALONE_LOAD_ADDR 0x00800000 +#define CFG_STANDALONE_LOAD_ADDR 0x00800000 #else -#define CONFIG_STANDALONE_LOAD_ADDR 0xd0800000 +#define CFG_STANDALONE_LOAD_ADDR 0xd0800000 #endif #else -#define CONFIG_STANDALONE_LOAD_ADDR 0x60800000 +#define CFG_STANDALONE_LOAD_ADDR 0x60800000 #endif #if defined(CFG_MAX_MEM_MAPPED) && \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f271ba83faca..e5598eb4159d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -206,7 +206,7 @@ CFG_SPI_FLASH_SIZE CFG_SPI_HALF_DUPLEX CFG_SPI_N25Q256A_RESET CFG_STACKBASE -CONFIG_STANDALONE_LOAD_ADDR +CFG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS CONFIG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index 8960cd505f82..a9faf6ab979f 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -205,7 +205,7 @@ index 6f3748d..f9e4e65 100644 + You can add calls to bootstage_mark() to set time markers. + - Standalone program support: - CONFIG_STANDALONE_LOAD_ADDR + CFG_STANDALONE_LOAD_ADDR diff --git a/MAINTAINERS b/MAINTAINERS index b167b028ec..beb7dc634f 100644 From patchwork Sun Nov 20 14:08:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706896 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=MSWx2b6Z; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NFXmb4Gsfz23lt for ; Mon, 21 Nov 2022 01:22:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E858185488; Sun, 20 Nov 2022 15:14:15 +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="MSWx2b6Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3FCAF853B2; Sun, 20 Nov 2022 15:12:37 +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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 87174853FD for ; Sun, 20 Nov 2022 15:09:51 +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-qv1-xf2a.google.com with SMTP id k2so5317620qvo.1 for ; Sun, 20 Nov 2022 06:09:51 -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=BhVhWDAa6C/SKevo9MaWGaT2+9CFxldChVz7vjhPb6I=; b=MSWx2b6ZtlMJyledGGrr4138Sg9xSbVsTwZRHY/ZW0C22O37oyuGCJ382FJDIlLXZH 2I1EW/DBSi9AcCRy83u1CdlvQlK+M5IPvxVFDKAsPRKcuTf04XX/tcBOJXBLVaESivV+ JohkzWzi7v2lxs3SG1xv9T99vx0Z7VdP0Hj7E= 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=BhVhWDAa6C/SKevo9MaWGaT2+9CFxldChVz7vjhPb6I=; b=ZhCyDcoPF/Sv9XCtfOQkPgrew5yfNttvouipHkyj13yBO0nPq8bA2Q1Uq/Jyu7GO1/ F266hzkDvmTqQr6OCOqKlbYckR3LGEK4yztfHZthwVVdAcFRBVkKldKjnjNixwlcAddo JBp3TZuKIE+hYceZ3gGfbBkOsme4LnUHKry1WgbVVoA0LKP4zobyuHPmC06kxpuG0XMs xjL9Vx05XEgR92ygDBNezfbm5TDqTA2qorGmlFUUJW8aBBLCfUv9Qmdq53lH4Jyu/U7Y avTqputPgmEosMYwK23COr+nK5TVlsw+k3Dnw+2U9ROdOr1kav3M6K0LAq3Nnay5OMr5 H5Yg== X-Gm-Message-State: ANoB5plqA69tozFrX+fvH2kHlHl3Kt43XwGNUAnOS60wXRCt3Fi71NPs H7IqqwHM02nhAO+kk0Z1q5FOo+WTh8DwoA== X-Google-Smtp-Source: AA0mqf7jwaDn7m7yQjLjSwaX+ge9vwR2ASVCtz3MOrPUCRsKyQQfZO5bfUaCJu7WnMdkWJ8KI8zeIA== X-Received: by 2002:ad4:4f51:0:b0:4b9:1466:ceb6 with SMTP id eu17-20020ad44f51000000b004b91466ceb6mr745204qvb.71.1668953367989; Sun, 20 Nov 2022 06:09:27 -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.09.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:27 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 198/241] global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG Date: Sun, 20 Nov 2022 09:08:28 -0500 Message-Id: <20221120140829.3057894-89-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- include/configs/bayleybay.h | 2 +- include/configs/cherryhill.h | 2 +- include/configs/chromebook_coral.h | 4 ++-- include/configs/chromebook_samus.h | 4 ++-- include/configs/conga-qeval20-qa3-e3845.h | 2 +- include/configs/coreboot.h | 2 +- include/configs/cougarcanyon2.h | 2 +- include/configs/crownbay.h | 2 +- include/configs/dfi-bt700.h | 2 +- include/configs/efi-x86_app.h | 2 +- include/configs/efi-x86_payload.h | 2 +- include/configs/galileo.h | 2 +- include/configs/minnowmax.h | 2 +- include/configs/qemu-x86.h | 2 +- include/configs/slimbootloader.h | 4 ++-- include/configs/som-db5800-som-6867.h | 2 +- include/configs/theadorable-x86-common.h | 2 +- include/configs/x86-chromebook.h | 2 +- include/configs/x86-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index b347125f2fa0..b0df328cd84b 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -12,7 +12,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h index 726c43d35ea0..d6ce70a96aea 100644 --- a/include/configs/cherryhill.h +++ b/include/configs/cherryhill.h @@ -8,7 +8,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h index d14c1d445b25..43fdc394416d 100644 --- a/include/configs/chromebook_coral.h +++ b/include/configs/chromebook_coral.h @@ -13,8 +13,8 @@ #include #include -#undef CONFIG_STD_DEVICES_SETTINGS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ +#undef CFG_STD_DEVICES_SETTINGS +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h index e29be3fda4ac..03a1033c5735 100644 --- a/include/configs/chromebook_samus.h +++ b/include/configs/chromebook_samus.h @@ -15,8 +15,8 @@ #include #include -#undef CONFIG_STD_DEVICES_SETTINGS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ +#undef CFG_STD_DEVICES_SETTINGS +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 31cfd2b12923..1066da3f8326 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -12,7 +12,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index f73004386fda..b4f49bf5289d 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -15,7 +15,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h index b64c7df1b25f..31639e48da88 100644 --- a/include/configs/cougarcanyon2.h +++ b/include/configs/cougarcanyon2.h @@ -8,7 +8,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vga\0" \ "stderr=serial,vga\0" diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index ff74deb3d400..387bb8800e89 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -12,7 +12,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 1510f8df4378..36c2510628fc 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -16,7 +16,7 @@ /* Use BayTrail internal HS UART which is memory-mapped */ #endif -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h index 6061a6db0a40..96ad15b535d1 100644 --- a/include/configs/efi-x86_app.h +++ b/include/configs/efi-x86_app.h @@ -10,7 +10,7 @@ #undef CONFIG_TPM_TIS_BASE_ADDRESS -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=vidconsole\0" \ "stderr=vidconsole\0" diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h index f50c2ce4dd07..c72b067c367d 100644 --- a/include/configs/efi-x86_payload.h +++ b/include/configs/efi-x86_payload.h @@ -12,7 +12,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 472f236b9b6e..0380ac287be2 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -14,7 +14,7 @@ /* ns16550 UART is memory-mapped in Quark SoC */ -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 50c52f8839b1..f3f645f9d699 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -12,7 +12,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" \ "usb_pgood_delay=40\0" diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 5cd13887084c..33263a46a407 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -22,7 +22,7 @@ #include #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h index 748a423b0833..20b99a1021df 100644 --- a/include/configs/slimbootloader.h +++ b/include/configs/slimbootloader.h @@ -8,7 +8,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS \ +#define CFG_STD_DEVICES_SETTINGS \ "stdin=serial,i8042-kbd,usbkbd\0" \ "stdout=serial\0" \ "stderr=serial\0" @@ -18,7 +18,7 @@ */ #undef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_STD_DEVICES_SETTINGS \ + CFG_STD_DEVICES_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=0x4000000\0" \ diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h index ee038d83bc05..14cacbfe3f13 100644 --- a/include/configs/som-db5800-som-6867.h +++ b/include/configs/som-db5800-som-6867.h @@ -12,7 +12,7 @@ #include -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index f34063249e48..6b65fad50692 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -11,7 +11,7 @@ #ifndef __THEADORABLE_X86_COMMON_H #define __THEADORABLE_X86_COMMON_H -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index ec87eddd4c72..dfacecbdd501 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -13,7 +13,7 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ +#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 0470a90391b0..9cfaa02958c8 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -62,7 +62,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ DISTRO_BOOTENV \ - CONFIG_STD_DEVICES_SETTINGS \ + CFG_STD_DEVICES_SETTINGS \ SPLASH_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e5598eb4159d..1f79a45cda8a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -207,7 +207,7 @@ CFG_SPI_HALF_DUPLEX CFG_SPI_N25Q256A_RESET CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR -CONFIG_STD_DEVICES_SETTINGS +CFG_STD_DEVICES_SETTINGS CONFIG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD From patchwork Sun Nov 20 14:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706897 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=EaLO5IIU; 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 4NFXmp40txz23lt for ; Mon, 21 Nov 2022 01:23:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB2DC85490; Sun, 20 Nov 2022 15:14:16 +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="EaLO5IIU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D50B0853BA; Sun, 20 Nov 2022 15:12:37 +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-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 27B6D85363 for ; Sun, 20 Nov 2022 15:09:52 +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-qk1-x734.google.com with SMTP id z1so6527967qkl.9 for ; Sun, 20 Nov 2022 06:09:52 -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=3xUPldk/OgNN7ZzUF7DmVV+uyqnie85qb5/IqxVEIU0=; b=EaLO5IIUy9jUWRYdE/pBpowWLaAPeon48O/sqhHBb7wy4cbCGgwP+4QmWClFXFl9nN NivOQeAMJt7+uYNBSqtATjEqeYS976rApzr6UCwZ4CmGkCBx7GhufccRKrL4X4Pxm0wx Xdr7VI7aRnodfQ5oYvd34CEQfqQJYL0yGKAE4= 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=3xUPldk/OgNN7ZzUF7DmVV+uyqnie85qb5/IqxVEIU0=; b=jus3aB11XKLJ53mK2qrtVeZTM5YInE0EXpDv8lgemn+giAJp+nQK0j2SohbGTpOZOK 5iCHemmX1b4JCcXRrH5PBVDTBAQNp17A/RPNEz/UFB62D2ps7uCwNVrhoWlAoKIqvOQy Mn1lwc1WL84sVkQxpBDqx9CxKWeSeiV6S9kdOrISQYdNyQN7wW4D4mDvMPxqxlZTkuO0 C/Ezy87UzumX4C45yPlmf0v4zJa81sWSqanwvfwUhtOIJnT+MDPBGeMCAXz+OzriDw7w VUvySmH0c/6ECsvJZDG09f3DuRFl6r7hjJXbaIG6kHrWp4SOaWobJ0gYCDSifxz37WUR q2yQ== X-Gm-Message-State: ANoB5pnCxeP+1Xrz/hGwsPPGyzehMCBYe56rBClKk/p8kYC7hBVMDT1+ IAlOmmvBwvzKb1REkI5dX948AM7uSxvQrA== X-Google-Smtp-Source: AA0mqf4DiiNkhmC01AxE7/b/h7wZgCrTCrBP6AvqJwYvTgxWvGHZtuvasumzld2p46bmMl59EWi6tQ== X-Received: by 2002:a37:5846:0:b0:6fa:566f:eb1e with SMTP id m67-20020a375846000000b006fa566feb1emr13003607qkb.616.1668953368798; Sun, 20 Nov 2022 06:09:28 -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.09.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 199/241] global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG Date: Sun, 20 Nov 2022 09:08:29 -0500 Message-Id: <20221120140829.3057894-90-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 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/arm/mach-tegra/board2.c | 2 +- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/harmony.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/medcom-wide.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p2771-0000.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/paz00.h | 2 +- include/configs/plutux.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/venice2.h | 2 +- include/configs/ventana.h | 2 +- scripts/config_whitelist.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 54bbd8a776e9..c7a45f4ff82a 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -89,7 +89,7 @@ int checkboard(void) { int board_id = tegra_board_id(); - printf("Board: %s", CONFIG_TEGRA_BOARD_STRING); + printf("Board: %s", CFG_TEGRA_BOARD_STRING); if (board_id != -1) printf(", ID: %d\n", board_id); printf("\n"); diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 1a540c9f7122..c22cdaed3f74 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -14,7 +14,7 @@ #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 0a5eaf03d9a5..c9cf110147a2 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -14,7 +14,7 @@ #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Cardhu" #define BOARD_EXTRA_ENV_SETTINGS \ "board_name=cardhu-a04\0" \ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 3aaed94e15cb..045cd25104d7 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -16,7 +16,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "CEI tk1-som" +#define CFG_TEGRA_BOARD_STRING "CEI tk1-som" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 39e1aded3730..8f97848b1714 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -11,7 +11,7 @@ #include "tegra114-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 211dab4d2337..97914889092b 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index d3bb6d760376..4878e6526b5a 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -12,7 +12,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index a8d8d8b09e02..e0d947f7e3c5 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index fbba4ca701db..946759f4fb20 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -12,7 +12,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" +#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index dd756a5056c8..8b734e1e948c 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -12,7 +12,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 10b36e6a1657..7120ae7bd808 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -12,7 +12,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-2180" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 6578350990d7..f1b0faf0091e 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -12,7 +12,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2571" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index 84cdd5719623..e409cc3896d7 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -11,7 +11,7 @@ #include "tegra186-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" /* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h index 34ab82fe1173..9eda594b8980 100644 --- a/include/configs/p3450-0000.h +++ b/include/configs/p3450-0000.h @@ -11,7 +11,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P3450-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/paz00.h b/include/configs/paz00.h index a945f4e9b289..387e4fcaf2e5 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -13,7 +13,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00" +#define CFG_TEGRA_BOARD_STRING "Compal Paz00" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 99db59c489e0..82ef6959fd2f 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index f272fe9bf8f1..5cbc33461251 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 6566dc170ff6..966750539b5d 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -10,7 +10,7 @@ #include "tegra30-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/tec.h b/include/configs/tec.h index ddf753da4a9f..b8819909b6bc 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index e4cbc7da843e..62c785cc0e78 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice" +#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 1cf493a50373..164aebf3045b 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -12,7 +12,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/ventana.h b/include/configs/ventana.h index f7a507768ec1..e585fb93d308 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1f79a45cda8a..825379421095 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -208,7 +208,7 @@ CFG_SPI_N25Q256A_RESET CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR CFG_STD_DEVICES_SETTINGS -CONFIG_TEGRA_BOARD_STRING +CFG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_SLINK_CTRLS