From patchwork Sun Nov 20 13:29: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: 1706710 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=Nz2MoGnG; 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 4NFWhj0Z1zz23mR for ; Mon, 21 Nov 2022 00:34:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65BB685119; Sun, 20 Nov 2022 14:34: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="Nz2MoGnG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9F3FB851BB; Sun, 20 Nov 2022 14:34:01 +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 C2F9084F7C for ; Sun, 20 Nov 2022 14:33: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=trini@konsulko.com Received: by mail-qk1-x731.google.com with SMTP id p18so6506688qkg.2 for ; Sun, 20 Nov 2022 05:33:57 -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=bVuo/rbdSq+jcj9c6IUF8OUpix0Wv67yAeBeTYcDZWw=; b=Nz2MoGnG3C4XtDDFPZ3tXnHK1BisBC7IRDgIgEpWqXiylLEz1x0BwVBafo6ZqLjitX 5qHafMgarnqc2R4OCD/PlrnbTuWcoSM0TfS+m8b3qb15zyU4DhKngfpIL65QTTkF0th0 lLBOGXo+RQU8pA6TKJ1/r/f9D83j5fLpp4wKE= 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=bVuo/rbdSq+jcj9c6IUF8OUpix0Wv67yAeBeTYcDZWw=; b=Sv28hux5Hic7qb2cvXH1Z3NeNFMqcHxP8oCUcqPFgl7O/KaVKhRXYON6IlMaOctQDR NmxCvRS3++e4ElIQzyDenPFU5J7BglSpfH7RVzVBmTeqrJtOB77WgeLN1CgPt0x+36yh b9HEfvqncNF22D/bI6JsMWWDvL4BwUpKtcOv9/IBk/4Q8fp1glfC1HMwFvGdl/c3EceG fCXjbEJrI0LuT4zILTlXJk9qpnsJhVi7SPJL08pxvk2MrD6TnSffnVfZqnE7t6GIuIHG Hg1Fng4kMufyiQlmXzPuwFUd0uUeF306xnyMT+cuWDvUy0I9wuV9Ic6sd/GEd3WApmvP hb0Q== X-Gm-Message-State: ANoB5pn5lqC1V+77rlDtk3/8h9V0m7rwPeUfo0vh2FbP6AURGy2ZFSHm 2zyNtTcl6B8UPdVx8+plBJBeUgFxCmK8Tg== X-Google-Smtp-Source: AA0mqf5cZbb7ZPhMNQzqlCcNMoI+GnnbWfjxktTe5xiBcHtbUuWWctwigXDvAo8yZ3xoWQNXuecShw== X-Received: by 2002:a05:620a:c95:b0:6fa:91f9:c84d with SMTP id q21-20020a05620a0c9500b006fa91f9c84dmr12647293qki.724.1668951236424; Sun, 20 Nov 2022 05:33:56 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:56 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 001/241] global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG Date: Sun, 20 Nov 2022 08:29:52 -0500 Message-Id: <20221120133352.3055600-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- arch/arm/cpu/armv7/virt-v7.c | 4 ++-- include/configs/arndale.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 39aeeb423f08..b6d144f065d2 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry) ENDPROC(_do_nonsec_entry) .macro get_cbar_addr addr -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - ldr \addr, =CONFIG_ARM_GIC_BASE_ADDRESS +#ifdef CFG_ARM_GIC_BASE_ADDRESS + ldr \addr, =CFG_ARM_GIC_BASE_ADDRESS #else mrc p15, 4, \addr, c15, c0, 0 @ read CBAR bfc \addr, #0, #15 @ clear reserved bits diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index 5ffeca13d913..c82b215b6f9c 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void) static unsigned long get_gicd_base_address(void) { -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; +#ifdef CFG_ARM_GIC_BASE_ADDRESS + return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; #else unsigned periphbase; diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 7a244769e30a..8acc525b11c9 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -19,6 +19,6 @@ #define CONFIG_SMP_PEN_ADDR 0x02020000 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ -#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 +#define CFG_ARM_GIC_BASE_ADDRESS 0x10480000 #endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 39e1071236bd..0d2cbddeed40 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,4 +1,4 @@ -CONFIG_ARM_GIC_BASE_ADDRESS +CFG_ARM_GIC_BASE_ADDRESS CONFIG_BOARDDIR CONFIG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC From patchwork Sun Nov 20 13:29: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: 1706709 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=bqD+b4ES; 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 4NFWhT3FRfz23mR for ; Mon, 21 Nov 2022 00:34:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B7B26851DC; Sun, 20 Nov 2022 14:34: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="bqD+b4ES"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F3E9184CDF; Sun, 20 Nov 2022 14:33:59 +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-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (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 B555F84D58 for ; Sun, 20 Nov 2022 14:33: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=trini@konsulko.com Received: by mail-qt1-x82b.google.com with SMTP id s4so5904018qtx.6 for ; Sun, 20 Nov 2022 05:33:57 -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=DiA8/6dtfKP+KZuN+xLMf8jHmbgd3Tr0TwEXxHSt46c=; b=bqD+b4ESs4xfVjcyBm7PJnaCZSibCOaz/hxjP2AEQoAjP04Pgdd4OPI0L+xHHiC4cO Y3Q6ZNs2Y/xEvbtDPKjEkhode/Xd+CkYQqw2F/9v+xXcZt57dT49vhlhRnyzWUh3mBK3 IDHFB0CJUmOj8yi8QKBWAMM2y+NCpjtAAhsok= 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=DiA8/6dtfKP+KZuN+xLMf8jHmbgd3Tr0TwEXxHSt46c=; b=ABCy3bipOrWsVKR1KgwrBIu8XF8DwX0BFLQUo/bGh/7Ll/ZZJXJIc24bFmE46YGmUE fLdZZ/cDHcO7GNF3JoWuHd/ER43A3P1qDUFwUgUf+ZXa6qQndK6ernf9gnO7W4/PP8wQ E/tsSk5orTf2RS2f6McGFqX/urhP9Y056aaElX7vaTv9xL5VWEI0gXWjyvERYHS/nt51 c2IA/CXWhjjFibErRyqiw6HBmjJ/rWnyuhMl/njXGsKs5v0YVY8OATltZraY1VXrS4su LgYFBdXiN4OvFVYRnynFuImNoQG+j3uI/DIenij77HCcvu4Z/IAlHK3OfQkjYrbyk4pe arDw== X-Gm-Message-State: ANoB5pnpRVTnRQ6ySwGLk6tHnjVK6PoZmhDn0RCjSzw6BcEFE+76yw7O 5X/fDcksbWs5pT4jJn3adkp21ty2q1eDwQ== X-Google-Smtp-Source: AA0mqf7w2GBOJr8U7tkexo9MvlXu2y6IUfR6rtKeTlbspa6DpBnyimItFrgtzyf/O/kFw+m7l1koeA== X-Received: by 2002:ac8:5506:0:b0:3a2:9e2f:2ead with SMTP id j6-20020ac85506000000b003a29e2f2eadmr13785326qtq.555.1668951237187; Sun, 20 Nov 2022 05:33:57 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:56 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 002/241] global: Migrate CONFIG_BOARDDIR to CFG Date: Sun, 20 Nov 2022 08:29:53 -0500 Message-Id: <20221120133352.3055600-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/sh/cpu/u-boot.lds | 2 +- doc/README.kwbimage | 2 +- scripts/Makefile.autoconf | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index d360eea7eba3..c31deecec659 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -35,7 +35,7 @@ SECTIONS .text : { KEEP(*/start.o (.text)) - KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) + KEEP(CFG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) KEEP(*(.spiboot2.text)) . = ALIGN(8192); #ifdef CONFIG_ENV_IS_IN_FLASH diff --git a/doc/README.kwbimage b/doc/README.kwbimage index 762b2e3acb71..a1d247c32dd1 100644 --- a/doc/README.kwbimage +++ b/doc/README.kwbimage @@ -42,7 +42,7 @@ Board specific configuration file specifications: kwbimage.cfg. The name can be set as part of the full path to the file using CONFIG_SYS_KWD_CONFIG (probably in include/configs/.h). The path should look like: - $(CONFIG_BOARDDIR)/.cfg + $(CFG_BOARDDIR)/.cfg 2. This file can have empty lines and lines starting with "#" as first character to put comments 3. This file can have configuration command lines as mentioned below, diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 5a4a14895538..f5f5e4a4d540 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg # Prior to Kconfig, it was generated by mkconfig. Now it is created here. define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ - echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ + echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ echo \#include \; \ echo \#include \; \ echo \#include \; \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0d2cbddeed40..14863642e4d3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,5 +1,5 @@ CFG_ARM_GIC_BASE_ADDRESS -CONFIG_BOARDDIR +CFG_BOARDDIR CONFIG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC CONFIG_DFU_ALT_BOOT_SD From patchwork Sun Nov 20 13:29: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: 1706711 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=T5QaiXCS; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFWj03yNSz23mR for ; Mon, 21 Nov 2022 00:34:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AD76685249; Sun, 20 Nov 2022 14:34: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="T5QaiXCS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27644851D4; Sun, 20 Nov 2022 14:34:02 +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 3C744850C4 for ; Sun, 20 Nov 2022 14:33: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=trini@konsulko.com Received: by mail-qk1-x72f.google.com with SMTP id z17so6488542qki.11 for ; Sun, 20 Nov 2022 05:33:59 -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=mvkTFn/k3u40qlandaz3nWHOhkhwPEAGZVx7dEfdxOw=; b=T5QaiXCSjlKj7yiYwIiZ2NJnIT6eyKLn3fMT0Vzom4/ZT8Z2rDNAbSScq8jqtiuLSf MKYPZmPd9cGnNEXde/PFz87bwhVTN75Nvyk3u1neAm6HMRW4jE6fZli4vGTy6xRbpjhf DROAwpldTVbs3nFULb8gyc6FStVVarZReO7Sc= 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=mvkTFn/k3u40qlandaz3nWHOhkhwPEAGZVx7dEfdxOw=; b=VBISJOK5PcRsqNPN411eUhLVI35DvQaffc5yj5yJmDHpkPFG/5GSPLkmNguAP27+bY NebSE1CTT/uPg9I2kHUVFzJzHfys81GG7qvSXjp/wu6dgR7kCm3I1MiBLKSnnZqGJ8dT EjyMkxrToxAQMiLjqvYv9lxwcCDgIQ8w9p1qXMsrzfxM2MdMcaeuSFm9jzlVG5zrYEPC LbtzmYxaTnRgcmdXpmYGVMVXBi+KnpGdeyqt6USwCs1L4ZOeXw3uIEdQY+mSSGrme9Dh HoJ4ARX4JKTRzpHL4cgyHZcXkadpGkBSrj3yk7U86A7oDWNKC6YQoX6gzxLaV4cxVfvX dyeg== X-Gm-Message-State: ANoB5pmpZfNZoPnjPFA+uHDetrW27cu0/VpzW3gI1VDnHE7tKUx5d164 Kt33JvfyhkabPoQEWISjwMIE+HRHiTvOzg== X-Google-Smtp-Source: AA0mqf44a02TfLebi4rWR7RU2L6GK62bYxMhjUbGfpgpDYmBQj5C76SArjDVsy10kYrv23oH7mBwlg== X-Received: by 2002:a05:620a:10b4:b0:6fb:f17e:c8f8 with SMTP id h20-20020a05620a10b400b006fbf17ec8f8mr3033878qkk.404.1668951237840; Sun, 20 Nov 2022 05:33:57 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:57 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 003/241] global: Migrate CONFIG_DFU_ALT to CFG Date: Sun, 20 Nov 2022 08:29:54 -0500 Message-Id: <20221120133352.3055600-4-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/samsung/common/exynos5-dt.c | 4 ++-- board/samsung/odroid/odroid.c | 4 ++-- include/configs/odroid.h | 8 ++++---- include/configs/odroid_xu3.h | 8 ++++---- include/configs/s5p_goni.h | 4 ++-- include/configs/trats.h | 4 ++-- include/configs/trats2.h | 4 ++-- scripts/config_whitelist.txt | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 0d77a57f8082..cde77d79a0f6 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr) return NULL; if (IS_SD(mmc)) - alt_boot = CONFIG_DFU_ALT_BOOT_SD; + alt_boot = CFG_DFU_ALT_BOOT_SD; else - alt_boot = CONFIG_DFU_ALT_BOOT_EMMC; + alt_boot = CFG_DFU_ALT_BOOT_EMMC; return alt_boot; } diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index 35e4cee74f44..39a60e4ad295 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr) if (mmc_init(mmc)) return NULL; - alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD : - CONFIG_DFU_ALT_BOOT_EMMC; + alt_boot = IS_SD(mmc) ? CFG_DFU_ALT_BOOT_SD : + CFG_DFU_ALT_BOOT_EMMC; return alt_boot; } diff --git a/include/configs/odroid.h b/include/configs/odroid.h index f252b349437c..e2331e45cdfe 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -27,7 +27,7 @@ #define PARTS_BOOT "boot" #define PARTS_ROOT "platform" -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "uImage fat 0 1;" \ "zImage fat 0 1;" \ "Image.itb fat 0 1;" \ @@ -39,13 +39,13 @@ #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) -#define CONFIG_DFU_ALT_BOOT_EMMC \ +#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ "bl1 raw 0x0 0x1e mmcpart 1;" \ "bl2 raw 0x1e 0x1d mmcpart 1;" \ "tzsw raw 0x83e 0x138 mmcpart 1\0" -#define CONFIG_DFU_ALT_BOOT_SD \ +#define CFG_DFU_ALT_BOOT_SD \ "u-boot raw 0x3f 0x800;" \ "bl1 raw 0x1 0x1e;" \ "bl2 raw 0x1f 0x1d;" \ @@ -132,7 +132,7 @@ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ "mmcrootpart=2\0" \ - "dfu_alt_system="CONFIG_DFU_ALT \ + "dfu_alt_system="CFG_DFU_ALT \ "dfu_alt_info=Please reset the board\0" \ "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \ "consoleoff=set console console=ram; save; reset\0" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 5bbe7aadcb25..7a81585494a9 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -28,7 +28,7 @@ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 -#define CONFIG_DFU_ALT_SYSTEM \ +#define CFG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ "zImage fat 0 1;" \ "Image.itb fat 0 1;" \ @@ -42,14 +42,14 @@ "boot part 0 1;" \ "root part 0 2\0" -#define CONFIG_DFU_ALT_BOOT_EMMC \ +#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ "bl1 raw 0x0 0x1e mmcpart 1;" \ "bl2 raw 0x1e 0x1d mmcpart 1;" \ "tzsw raw 0x83e 0x200 mmcpart 1;" \ "params.bin raw 0x1880 0x20\0" -#define CONFIG_DFU_ALT_BOOT_SD \ +#define CFG_DFU_ALT_BOOT_SD \ "u-boot raw 0x3f 0x800;" \ "bl1 raw 0x1 0x1e;" \ "bl2 raw 0x1f 0x1d;" \ @@ -83,7 +83,7 @@ "mmcrootdev=0\0" \ "mmcbootpart=1\0" \ "mmcrootpart=2\0" \ - "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \ + "dfu_alt_system="CFG_DFU_ALT_SYSTEM \ "dfu_alt_info=Autoset by THOR/DFU command run.\0" #endif /* __CONFIG_H */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index fdade1ee66fa..b7a91af008c7 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -42,7 +42,7 @@ #define PARTS_CSC "csc" #define PARTS_UMS "ums" -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x400;" \ "uImage ext4 0 2;" \ "exynos3-goni.dtb ext4 0 2;" \ @@ -109,7 +109,7 @@ "ubiblock=8\0" \ "ubi=enabled\0" \ "opts=always_resume=1\0" \ - "dfu_alt_info=" CONFIG_DFU_ALT "\0" + "dfu_alt_info=" CFG_DFU_ALT "\0" /* Goni has 3 banks of DRAM, but swap the bank */ #define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */ diff --git a/include/configs/trats.h b/include/configs/trats.h index ec18842bbe8c..3eac66539dfe 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -39,7 +39,7 @@ "name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x400;" \ "/uImage ext4 0 2;" \ "/modem.bin ext4 0 2;" \ @@ -98,7 +98,7 @@ "mmcrootpart=5\0" \ "opts=always_resume=1\0" \ "partitions=" PARTS_DEFAULT \ - "dfu_alt_info=" CONFIG_DFU_ALT \ + "dfu_alt_info=" CFG_DFU_ALT \ "spladdr=0x40000100\0" \ "splsize=0x200\0" \ "splfile=falcon.bin\0" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 0aa331e39359..125d3e776a3f 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -40,7 +40,7 @@ "name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ -#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x800;" \ "/uImage ext4 0 2;" \ "/modem.bin ext4 0 2;" \ @@ -86,7 +86,7 @@ "mmcrootpart=5\0" \ "opts=always_resume=1\0" \ "partitions=" PARTS_DEFAULT \ - "dfu_alt_info=" CONFIG_DFU_ALT \ + "dfu_alt_info=" CFG_DFU_ALT \ "uartpath=ap\0" \ "usbpath=ap\0" \ "consoleon=set console console=ttySAC2,115200n8; save; reset\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 14863642e4d3..880e963e1d0f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,9 +1,9 @@ CFG_ARM_GIC_BASE_ADDRESS CFG_BOARDDIR -CONFIG_DFU_ALT -CONFIG_DFU_ALT_BOOT_EMMC -CONFIG_DFU_ALT_BOOT_SD -CONFIG_DFU_ALT_SYSTEM +CFG_DFU_ALT +CFG_DFU_ALT_BOOT_EMMC +CFG_DFU_ALT_BOOT_SD +CFG_DFU_ALT_SYSTEM CONFIG_DFU_ENV_SETTINGS CONFIG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED From patchwork Sun Nov 20 13:29:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706712 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=kQqs7o5V; 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 4NFWjC1p4Lz23mR for ; Mon, 21 Nov 2022 00:34:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E0C584F7C; Sun, 20 Nov 2022 14:34: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="kQqs7o5V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D0C20850C4; Sun, 20 Nov 2022 14:34:02 +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 53D97850D6 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x730.google.com with SMTP id z17so6488554qki.11 for ; Sun, 20 Nov 2022 05:34:00 -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=ObjF4iSztniyCdgF5qHVfMJXe2eMDzwCJXrefcV2v4w=; b=kQqs7o5VFgoElHCNIxHx/1zGmXKD941P/OOX6mM/oJdRjwqecZq6l3eLDcw2Wr0imw LVka1LD0IGWvDN7q/7bRwaJ9nt8q0ZGWngscr+OHj7HWknZpJ4YpX3+Pb/YcBYWA3P4U bAqggiGCWT55Fs2LQZHsxjZiNZSReE2mg/Gdo= 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=ObjF4iSztniyCdgF5qHVfMJXe2eMDzwCJXrefcV2v4w=; b=fEuhdqmZCQFJYlyPRSytea1WxCWVjHCMfHFSQMeoGubfSYTR79qzVSDlCM2sxr2Dpp 1wXW7QE9hWK2UIr+ZYTvamXqCJUlhJ8ucO+3fBP+ZIipZdK9sbT7ycsx8mZhvOMtZuYN 1/l6YS/vi+dllBORWuS7iMHlVyu+0jLxLLIF7vJjRtfNXjQ5gKbv0Jum3vPk5bFaDCC9 OURVuRyGXHHQxf+IrPV1pQVKfnZDyKwDbnYFXHg1uM2Qlz4pe3/h8gB6WBq+JTLqnMqL GCBXQXC3kXSUqoxBbwLWNmiSYb3NFTPzI/nTQxrzFB3bcN80bvhiROfbiqFuOqcNWsro o/qw== X-Gm-Message-State: ANoB5pkbo4DSLIS2xViIV1yfBe1JtQpjAgK1CRtc6xqygDWLwyN5xd35 Y5fdYjIE6730C8KwOQQxhBji6qm6W2k8fA== X-Google-Smtp-Source: AA0mqf4blh8gbmnPSufIYbcigUZqzhKO4zMtrtUVQFy30GSWkJcNtehUlqUnMTiFl6YuaK+nwv6z9Q== X-Received: by 2002:a05:620a:13b4:b0:6fa:b1e9:6f2d with SMTP id m20-20020a05620a13b400b006fab1e96f2dmr12924616qki.560.1668951238692; Sun, 20 Nov 2022 05:33:58 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 004/241] global: Migrate CONFIG_DFU_ENV_SETTINGS to CFG Date: Sun, 20 Nov 2022 08:29:55 -0500 Message-Id: <20221120133352.3055600-5-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/mx7dsabresd.h | 4 ++-- include/configs/pico-imx6.h | 4 ++-- include/configs/pico-imx6ul.h | 4 ++-- include/configs/pico-imx7d.h | 4 ++-- include/configs/warp7.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 6c165521f7a0..377e4d9c4b27 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -44,7 +44,7 @@ "initrd_high=0xffffffff\0" \ "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=image raw 0 0x800000;"\ "u-boot raw 0 0x4000;"\ "bootimg part 0 1;"\ @@ -53,7 +53,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ CONFIG_MFG_ENV_SETTINGS \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 6d7873daa0ad..719b70144051 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -21,7 +21,7 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ "u-boot raw 0x8a 0x1000;" \ @@ -47,7 +47,7 @@ "fdt_addr_r=0x18000000\0" \ "fdt_addr=0x18000000\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "finduuid=part uuid mmc 0:1 uuid\0" \ "findfdt="\ "if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 8af8883fad64..5dfd737cf7a4 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -30,7 +30,7 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ "u-boot raw 0x8a 0x400;" \ @@ -65,7 +65,7 @@ "ramdiskaddr=0x83000000\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "mmcautodetect=yes\0" \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "findfdt=" \ "if test $fdtfile = ask ; then " \ "bootmenu -1; fi;" \ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 83907b06ebb4..581921510426 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -15,7 +15,7 @@ /* MMC Config */ #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ "u-boot raw 0x8a 0x1000;" \ @@ -67,7 +67,7 @@ "ramdisk_addr_r=0x83000000\0" \ "ramdiskaddr=0x83000000\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "findfdt=" \ "if test $fdtfile = ask ; then " \ "bootmenu -1; fi;" \ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 56c90aa1032e..3cdf4a1ffc67 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -16,7 +16,7 @@ /* MMC Config*/ #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR -#define CONFIG_DFU_ENV_SETTINGS \ +#define CFG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \ /* When booting with FIT specify the node entry containing boot.scr */ @@ -27,7 +27,7 @@ #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_DFU_ENV_SETTINGS \ + CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "bootscr_fitimage_name=bootscr\0" \ "script_signed=boot.scr.imx-signed\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 880e963e1d0f..414f0078e4d7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4,7 +4,7 @@ CFG_DFU_ALT CFG_DFU_ALT_BOOT_EMMC CFG_DFU_ALT_BOOT_SD CFG_DFU_ALT_SYSTEM -CONFIG_DFU_ENV_SETTINGS +CFG_DFU_ENV_SETTINGS CONFIG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED CONFIG_DM9000_NO_SROM From patchwork Sun Nov 20 13:29:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706714 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=APwyUf0o; 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 4NFWjh29Z2z23lt for ; Mon, 21 Nov 2022 00:35:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E2D18524F; Sun, 20 Nov 2022 14:34: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="APwyUf0o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D93A0851E9; Sun, 20 Nov 2022 14:34:04 +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 1B0BA851A9 for ; Sun, 20 Nov 2022 14:34:01 +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 n12so418977qvr.11 for ; Sun, 20 Nov 2022 05:34:01 -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=hp+kFtbATPihNIJ/PNhIzhvW+mXy2YXp8Pd3qcLmrPs=; b=APwyUf0oYO7ht8+O5jHC5XcpCrkMAZB1iTPr5zgvlbmeWmckdsMf/ujlGFnb7sazva BCTrxNJMZ6e2xiiRedeRh484h58tyD5n0G9pdumE8ZLJaoEMmmbQ8hguZoXm4qcneMf/ +oRuQeb1Bx8ku6hO3aR19BqtGrmdWotNJ06KI= 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=hp+kFtbATPihNIJ/PNhIzhvW+mXy2YXp8Pd3qcLmrPs=; b=EQkYtQthp6HVv2oAHEbFOSLiHz5rwe+swfCQKWQVMqnYywzcDVAhIiRCW4G0dnNY9O UJWjM0qtTi3asYPyq3Lvj8RAjIey4AgvkaCKrRQB43o3sHh2pxKeuXaNFEV2IE7j48zG C6T5h2JM1yEOtwou/zxIBVMEFRiYGFGOryg/ETTOYSxbfqrUy98cROX9oFP++GEPaxth ZF7gu33eoqOCJcLN3n5cp2inW903vJADaofS2Sc1eX3TWpNlFWa2D7b2IhK9eOCdRz0H sAz2GpVarcv6bISJJKcc2l3yqfHiVzYASaU/8QV8cbVMTEuRj1C1WIlBeihy+ZGvuiyG H/oA== X-Gm-Message-State: ANoB5pmMyTjQYiIGhGemkYeka1DQsVVp5XIlBODUETq4OKS2MGF3ru2z cKlmde7900JmYInt6gq58RTLh/eJDI19hA== X-Google-Smtp-Source: AA0mqf4nSD5Ez47jxXQGsRKNZt/QD360UJOic3GepMb051a9gdSb4u6UMOhMBr32Vou3H0XPOZIrHA== X-Received: by 2002:a05:6214:3512:b0:4c6:9d70:b3a8 with SMTP id nk18-20020a056214351200b004c69d70b3a8mr4708940qvb.74.1668951239755; Sun, 20 Nov 2022 05:33:59 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 005/241] global: Migrate CONFIG_DM9000_BASE to CFG Date: Sun, 20 Nov 2022 08:29:56 -0500 Message-Id: <20221120133352.3055600-6-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/timll/devkit8000/devkit8000.c | 4 ++-- include/configs/M5253DEMO.h | 6 +++--- include/configs/at91sam9261ek.h | 6 +++--- include/configs/ci20.h | 6 +++--- include/configs/devkit8000.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 0808ca1a54c0..39103de02ed4 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -79,7 +79,7 @@ int board_init(void) static void gpmc_dm9000_config(void) { enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], - CONFIG_DM9000_BASE, GPMC_SIZE_16M); + CFG_DM9000_BASE, GPMC_SIZE_16M); } /* @@ -102,7 +102,7 @@ int misc_init_r(void) #ifdef CONFIG_DRIVER_DM9000 /* Configure GPMC registers for DM9000 */ enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], - CONFIG_DM9000_BASE, GPMC_SIZE_16M); + CFG_DM9000_BASE, GPMC_SIZE_16M); /* Use OMAP DIE_ID as MAC address */ if (!eth_env_get_enetaddr("ethaddr", enetaddr)) { diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 7e37c6d11997..223a843fc695 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -20,9 +20,9 @@ env/embedded.o(.text*); #ifdef CONFIG_DRIVER_DM9000 -# define CONFIG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300) -# define DM9000_IO CONFIG_DM9000_BASE -# define DM9000_DATA (CONFIG_DM9000_BASE + 4) +# define CFG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300) +# define DM9000_IO CFG_DM9000_BASE +# define DM9000_DATA (CFG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG # define CONFIG_DM9000_BYTE_SWAPPED diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 56247e390bf6..d58c0f4bbe24 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -35,9 +35,9 @@ #endif /* Ethernet */ -#define CONFIG_DM9000_BASE 0x30000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 4) +#define CFG_DM9000_BASE 0x30000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT #define CONFIG_DM9000_NO_SROM diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 3329c24fa68c..bc8b699b84f8 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -18,9 +18,9 @@ #define CFG_SYS_NS16550_CLK 48000000 /* Ethernet: davicom DM9000 */ -#define CONFIG_DM9000_BASE 0xb6000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 2) +#define CFG_DM9000_BASE 0xb6000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 2) /* Miscellaneous configuration options */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 46410595c2bc..824e0e448eea 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -18,9 +18,9 @@ /* Hardware drivers */ /* DM9000 */ -#define CONFIG_DM9000_BASE 0x2c000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 0x400) +#define CFG_DM9000_BASE 0x2c000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 0x400) #define CONFIG_DM9000_USE_16BIT 1 #define CONFIG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 414f0078e4d7..7c6fc0a07bf7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5,7 +5,7 @@ CFG_DFU_ALT_BOOT_EMMC CFG_DFU_ALT_BOOT_SD CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS -CONFIG_DM9000_BASE +CFG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT From patchwork Sun Nov 20 13:29: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: 1706713 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=rESqBMv5; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFWjS4svHz23lt for ; Mon, 21 Nov 2022 00:35:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F35F85235; Sun, 20 Nov 2022 14:34:13 +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="rESqBMv5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B42C851DB; Sun, 20 Nov 2022 14:34:04 +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-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 BBF0584F7C for ; Sun, 20 Nov 2022 14:34:01 +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-x72e.google.com with SMTP id x18so6504820qki.4 for ; Sun, 20 Nov 2022 05:34:01 -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=ikN0Br2KKthlo8LFnlp+d7tJzzu1SNQ/ONkE0/rdqAk=; b=rESqBMv5KBZkcCrhv9V++uOs/VQzw7jeiWRClsvqGCHcfahos1lv589mi+/R6zc587 Wl2ycXYDgAG9ekpuVY3AF4BUcyOYIpkG7Zc+auXKtMhAJKZ7UaOKeVhfVQSwzEE/xZ60 hxUEkPNys5i6df6OUzgl7Kp3AkUUemz+JobgI= 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=ikN0Br2KKthlo8LFnlp+d7tJzzu1SNQ/ONkE0/rdqAk=; b=nJbFl0apNI2Ql7G+8u+kCrabuTZdkuXzWNJHagfAOrN+yus+XOqfaq+VGHqKzPskFh pUiK3Ot2jmgM/drf5q7sCes3pFHO3DEWh5jjuedXp1ftMaB9z28JjJO4A2fXLm7yO4Cv 2CE3BV43rpNaBFio2zUkfItHxGa7BR8ZUeBAH6SvcuQGhgvbazoSRpzZBBSPZjwYOIuM pX0KWCyXZ+Rd3Eou2BVpxdOIHQlT4Yy7Ngo9Af4nc+HYySZHT4DV3Is8pS9uqAKv6jp5 Qj+aI44UGzjKn2NkskxqUe636k23EAgy/cStPy2puuff0eXJppsuVxC0JenRG4MGAArG er3Q== X-Gm-Message-State: ANoB5pk0MUUpRDjhThjvJpp+J9nriHo1zsiZVe+pHk8f9XKZ3hn/2a8o U7QqqJIRAjN0Ti8WTMR/IMF2R0PPBr7KEA== X-Google-Smtp-Source: AA0mqf70AzzJ/n1xpCU/0KBShIO6WZe6sw/kGmcs3rSEvLfv2Qst8RFVZ9MxH//bUwrb7VW8RoBveg== X-Received: by 2002:a37:6557:0:b0:6fa:16f2:7f58 with SMTP id z84-20020a376557000000b006fa16f27f58mr12445380qkb.204.1668951240320; Sun, 20 Nov 2022 05:34:00 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 006/241] global: Migrate CONFIG_DM9000_BYTE_SWAPPED to CFG Date: Sun, 20 Nov 2022 08:29:57 -0500 Message-Id: <20221120133352.3055600-7-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/net/dm9000x.c | 2 +- include/configs/M5253DEMO.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 07733df533e2..6bf316263d59 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -83,7 +83,7 @@ struct dm9000_priv { }; /* DM9000 network board routine ---------------------------- */ -#ifndef CONFIG_DM9000_BYTE_SWAPPED +#ifndef CFG_DM9000_BYTE_SWAPPED #define dm9000_outb(d, r) writeb((d), (r)) #define dm9000_outw(d, r) writew((d), (r)) #define dm9000_outl(d, r) writel((d), (r)) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 223a843fc695..4be4d0f84512 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -24,7 +24,7 @@ # define DM9000_IO CFG_DM9000_BASE # define DM9000_DATA (CFG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG -# define CONFIG_DM9000_BYTE_SWAPPED +# define CFG_DM9000_BYTE_SWAPPED # define CONFIG_OVERWRITE_ETHADDR_ONCE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7c6fc0a07bf7..005b893b317c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -6,7 +6,7 @@ CFG_DFU_ALT_BOOT_SD CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS CFG_DM9000_BASE -CONFIG_DM9000_BYTE_SWAPPED +CFG_DM9000_BYTE_SWAPPED CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DW_WDT_CLOCK_KHZ From patchwork Sun Nov 20 13:29:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706715 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=RE4ChGBh; 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 4NFWjx1hFzz23lt for ; Mon, 21 Nov 2022 00:35:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB7D485215; Sun, 20 Nov 2022 14:34: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="RE4ChGBh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0FDF1851EB; Sun, 20 Nov 2022 14:34:05 +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-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) (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 9EC4E83619 for ; Sun, 20 Nov 2022 14:34: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-qv1-xf36.google.com with SMTP id d13so756679qvj.8 for ; Sun, 20 Nov 2022 05:34: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=orcymJjjWRoFmRafDg7YpGym4FxvSUGTvCmyXz4VAr4=; b=RE4ChGBh/Q8o0xcbk1hUNTGVo0ITLh9q2lUsTJtdV/38RT5UtMW+c0QnOakyxcKXPE A5hC0hOLvYP5E1qtra6wyjC+p9PMnQY6HxB0qHPYSySxGGJz52ym83eOBfhdjfYKH0UV daHp6COjLua/4wvAuT/whboKJ27hDRraw0dcs= 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=orcymJjjWRoFmRafDg7YpGym4FxvSUGTvCmyXz4VAr4=; b=pPoCSg6e+cGVYmky9Bn4w7bXbzeeQisUDfSJhDI3K0dXNAJDHQcjP3ND+yWeUFaeid 2wM8Z2C7nN/qDDZ4nFJu1GTv+MRWwDIW48LYtk4Wu27iVC5NoUBJaqpyONoZ5wRgeSRe QbfofP/VozBRmOU/B/80RJcGiEikrAOD6R25EOR14lM6U7pV1PJmMkCDX5+Ex9A8iXXD qoBkR8Ni8tOtAJ47QRdkNIPfXFX+0PuZOtSmQwU7wbw3XvLr1hGa/r8+5cPCFZ7/KiCQ 3FaNwckTup7IgoGPTOSq28VO+Zs9ug5mEazSbY8KzSkmvulVidpjFh0cpRetuS4nrhVs rNNw== X-Gm-Message-State: ANoB5pnh58+pgZAWqUmxySRQCv12LshDTlFguWS2MwxxwQRzHQN/caLb jGa+R8WRiibegY7IHS6RUkFv2/36R4UMPw== X-Google-Smtp-Source: AA0mqf7V1UmLKF4EM7+ntb1ZA6e0CGEXS76efgbHMbOB9FAEzM/mQ5uPSgFAiJMmW4ynLsEAduBecA== X-Received: by 2002:a05:6214:2b48:b0:4bb:704b:e620 with SMTP id jy8-20020a0562142b4800b004bb704be620mr13676000qvb.127.1668951241017; Sun, 20 Nov 2022 05:34:01 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 007/241] global: Migrate CONFIG_DM9000_NO_SROM to CFG Date: Sun, 20 Nov 2022 08:29:58 -0500 Message-Id: <20221120133352.3055600-8-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/net/dm9000x.c | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/devkit8000.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 6bf316263d59..514b8db2ce1e 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -550,7 +550,7 @@ static int dm9000_recv_common(struct dm9000_priv *db, uchar *rdptr) /* * Read a word data from SROM */ -#if !defined(CONFIG_DM9000_NO_SROM) +#if !defined(CFG_DM9000_NO_SROM) static void dm9000_read_srom_word(struct dm9000_priv *db, int offset, u8 *to) { dm9000_iow(db, DM9000_EPAR, offset); diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index d58c0f4bbe24..a9bbbd39484a 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -39,7 +39,7 @@ #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT -#define CONFIG_DM9000_NO_SROM +#define CFG_DM9000_NO_SROM /* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9261_UHP_BASE */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 824e0e448eea..1694bf1cd3e1 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -22,7 +22,7 @@ #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 0x400) #define CONFIG_DM9000_USE_16BIT 1 -#define CONFIG_DM9000_NO_SROM 1 +#define CFG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG /* TWL4030 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 005b893b317c..85adbafa58fe 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7,7 +7,7 @@ CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS CFG_DM9000_BASE CFG_DM9000_BYTE_SWAPPED -CONFIG_DM9000_NO_SROM +CFG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DW_WDT_CLOCK_KHZ CONFIG_ENV_FLAGS_LIST_STATIC From patchwork Sun Nov 20 13:29: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: 1706716 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=LumF1OEf; 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 4NFWk90Fw9z23lt for ; Mon, 21 Nov 2022 00:35:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 01C7B85269; Sun, 20 Nov 2022 14:34:19 +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="LumF1OEf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9B67D851EB; Sun, 20 Nov 2022 14:34:05 +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-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 3423985119 for ; Sun, 20 Nov 2022 14:34: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-qk1-x72d.google.com with SMTP id k2so6488046qkk.7 for ; Sun, 20 Nov 2022 05:34: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=WPIvUkpA845eMMlizRjZFPzREwgap+6ARPhykIUrNeA=; b=LumF1OEfbULAzLrKilpoRULsPb37OGahEctF3dol9F/OBmf6UNz82hByxSP621eRHm XARCE+vBNuwCUuXV33Jm5qyO+yZX7OFSnEOBAo3ggTmbxJ/HkdiC4CPo6UbTI73XfQtE eY6/XP88EV92wWw/IRfwJVDuU+GBgtfJ6cwSU= 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=WPIvUkpA845eMMlizRjZFPzREwgap+6ARPhykIUrNeA=; b=g/OMgLhKbZ0QwSM6V0xEdCf0Ptdp9dZpXDWGDqEuoPwYRbF/nuwWno36uSkf3IeZvD JbYo1SwIUDQuMD0Z4occuLIMUFRpEkO+0BdQxgZM8ahiImFybRiwzW65j7mbUTGBz1C4 RjKD3lM3XRZ9JOjuWvsXPNbXm3Bniz9qxnhMZmdeQdnRQdg1EdxTkDx5wGwT5NvL5R3h l2tsJFzJlF8NIl4dFxuQ6pikE8oWQ0O3KOOwZwOzSlfe0wlR0AKhBaUaHJsiIEc3k6H8 WD1akQW1kxoPIP1cvukJR0W1BTkiTOebdTt4B6r8TqCnrd8W5oGlaoFzLqPfG174ZLx+ shyg== X-Gm-Message-State: ANoB5plN714P8Qz+WgADmhdPidd+UfmlplDcF6ZnKsW3HHGjtEen1W1P PHg1K4kSISmKLjjvSSOoQ8jxuPAAmmBYBg== X-Google-Smtp-Source: AA0mqf63LYLN07OKHfmG3fzBcbrrVDlvgqkq/XWlvsdcOQoT2Khr3bFxRstwPSMWq8uBalHpbSW0gw== X-Received: by 2002:a37:4043:0:b0:6ee:b095:a047 with SMTP id n64-20020a374043000000b006eeb095a047mr12847228qka.524.1668951241835; Sun, 20 Nov 2022 05:34:01 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 008/241] global: Migrate CONFIG_DM9000_USE_16BIT to CFG Date: Sun, 20 Nov 2022 08:29:59 -0500 Message-Id: <20221120133352.3055600-9-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/at91sam9261ek.h | 2 +- include/configs/devkit8000.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index a9bbbd39484a..9a3928f3fa87 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -38,7 +38,7 @@ #define CFG_DM9000_BASE 0x30000000 #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 4) -#define CONFIG_DM9000_USE_16BIT +#define CFG_DM9000_USE_16BIT #define CFG_DM9000_NO_SROM /* USB */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 1694bf1cd3e1..c8b176542d95 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -21,7 +21,7 @@ #define CFG_DM9000_BASE 0x2c000000 #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 0x400) -#define CONFIG_DM9000_USE_16BIT 1 +#define CFG_DM9000_USE_16BIT 1 #define CFG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 85adbafa58fe..43234d822457 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8,7 +8,7 @@ CFG_DFU_ENV_SETTINGS CFG_DM9000_BASE CFG_DM9000_BYTE_SWAPPED CFG_DM9000_NO_SROM -CONFIG_DM9000_USE_16BIT +CFG_DM9000_USE_16BIT CONFIG_DW_WDT_CLOCK_KHZ CONFIG_ENV_FLAGS_LIST_STATIC CONFIG_ENV_IS_EMBEDDED From patchwork Sun Nov 20 13:30: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: 1706717 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=t4JKzlx7; 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 4NFWkN12zKz23lt for ; Mon, 21 Nov 2022 00:35:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C4EEB85277; Sun, 20 Nov 2022 14:34: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=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="t4JKzlx7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B85F2851BB; Sun, 20 Nov 2022 14:34:06 +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 EBBAB851BB for ; Sun, 20 Nov 2022 14:34: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-qk1-x734.google.com with SMTP id s20so6511260qkg.5 for ; Sun, 20 Nov 2022 05:34: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=8P6yRwrM7B2gN59hVfil+YcE/m7VP6rGnxnosAdgNPo=; b=t4JKzlx7nmWHxh9ADOlJWugugmO7Twg3EcZUAby9tQnor7Fiylzn4vLFc8kHzPO3fL gAyJPsha7EhrsOXA8bF2Tz7qa8EGq1R/LzX/+jp7p+1OTdIEvQSXUn1xmG+o9FBd0moc /NUXGiqMTsNjcdijlwUhlnXBAn9loakkW5FtU= 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=8P6yRwrM7B2gN59hVfil+YcE/m7VP6rGnxnosAdgNPo=; b=w3sYwvgPIeFQS5lKJuUsjZikgcrntqMZbMKAGFQXMS9CqdKJh2fqzUh84ANeo1rXIn U7BemcoT+W7v2oe8LUi66kXlmYkJwKf/q18+Ph2KrYE4TFJF38sqq8Sv+zbc8HiyQ1ek A79nzXB91ctJQr134d7ngghjqOW+9onTBb+QTtDdVYyhtN5IDHHQ0wY8EZn0o21rXydS jXaQGTFC/C8Kpa6O7HrDuTG6Eilv7HV16VtjJ5qZf0hD4iibIcc8nA2D+AYdV8L+4IoA 8L3B5EWIh+i+DeqftEH0I0PNFYqrTdIVffwmDX5SG2OxJq/c3UjmB9kljMnCX3DSJOgu QXAA== X-Gm-Message-State: ANoB5plXmtFvpMZbxZu1eWT0+Br0/SmrDXit+jiOPgi4E/63ch/pvgcV VYHKywzgEeq/d+hGVWaocv7DI6loMU1hnQ== X-Google-Smtp-Source: AA0mqf4Ghq+8Tch4jO+v1/IN0o3dNCl+9/Ux1QPjeBq+nMtfe7XASNue5159Fg0DsDHrGQMq1Uh02A== X-Received: by 2002:a37:64c8:0:b0:6f9:6c61:ea58 with SMTP id y191-20020a3764c8000000b006f96c61ea58mr13131867qkb.518.1668951242546; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 009/241] global: Migrate CONFIG_DW_WDT_CLOCK_KHZ to CFG Date: Sun, 20 Nov 2022 08:30:00 -0500 Message-Id: <20221120133352.3055600-10-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/socfpga_soc64_common.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index cad756aeaf20..0eeb2efee2f5 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev) goto err; } #else - priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; + priv->clk_khz = CFG_DW_WDT_CLOCK_KHZ; #endif if (CONFIG_IS_ENABLED(DM_RESET)) { diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index bbbdea6664ca..807bff43e00a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -64,7 +64,7 @@ /* * L4 Watchdog */ -#define CONFIG_DW_WDT_CLOCK_KHZ 25000 +#define CFG_DW_WDT_CLOCK_KHZ 25000 /* * NAND Support diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 47089f312d2c..df3927297bbe 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -90,10 +90,10 @@ #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__ unsigned int cm_get_l4_sys_free_clk_hz(void); -#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000) +#define CFG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000) #endif #else -#define CONFIG_DW_WDT_CLOCK_KHZ 100000 +#define CFG_DW_WDT_CLOCK_KHZ 100000 #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43234d822457..97ad18677f1d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -9,7 +9,7 @@ CFG_DM9000_BASE CFG_DM9000_BYTE_SWAPPED CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT -CONFIG_DW_WDT_CLOCK_KHZ +CFG_DW_WDT_CLOCK_KHZ CONFIG_ENV_FLAGS_LIST_STATIC CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS From patchwork Sun Nov 20 13:30: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: 1706719 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=fbdmwLw3; 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 4NFWkt4LGWz23lt for ; Mon, 21 Nov 2022 00:36:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AD9C38527F; Sun, 20 Nov 2022 14:34: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="fbdmwLw3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E566851BB; Sun, 20 Nov 2022 14:34:07 +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 8AF8884F7C for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x82c.google.com with SMTP id z6so5900311qtv.5 for ; Sun, 20 Nov 2022 05:34: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=VOpETeu/hZVgVjoIxcqGv64rdv32ruCxDFuVpfSG1NI=; b=fbdmwLw3cFTmkFBCwaOnbalfMUZ2Ii6uh2Rdrh3LFKMKKILw0Bw1f+4mpU2Sh7YJzQ K3BEOYu3y+btoBpSJzvBl9HuBSgKD9Ipilb08SZhA49jklMfRom3vzqAPydFZ7gJeEfc ygWHoMN38U4x7c5wxNIOQ0A4sNkpeRK06alRg= 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=VOpETeu/hZVgVjoIxcqGv64rdv32ruCxDFuVpfSG1NI=; b=7VNiVh6F9X6AjyUU1Q1Ms9vXj3B2n8TkVOwoIImUFYOxiuYmUXgmqo3cGue10VY+gQ ANdXjBg4qqTlmFZclPIX74wfY2YqcsEe6p4sQWex4sQAVz0sZ564XKGGnbbhMSiA9Im0 26SVnNf4yDyC4I9iEIPbBpw4/vz5khln8rTIxTCBhSxpjFNbw7haCxR+oIA5ZPI0bjzp /ePoHdNT24BnH0k2VXU95f5MKNfFsgceqpb2I3fWTuT5BTaJJo6nnA0I+yWROoCpNm8R NAUwPQfiP8LbAqIOc0vdfiAjY1bFfQUCZoined2vIXagXKwjgmPxrUudslTtZ9LXyY/l N1eA== X-Gm-Message-State: ANoB5pk/1xsX+sM/8Vd13vTpq2YlAop/GtNfR74rcH49AKk/XHT/vjSn gNG5F64LaYYe87EdxHq9JqR+Vd4lBLk5+A== X-Google-Smtp-Source: AA0mqf7XfKwAe7xFujeSwVAV4kcJtNu3p2eguFz4DELKoaZOPX8eNQa/vhb2RMqQVHkmUoaa83WpwQ== X-Received: by 2002:ac8:4688:0:b0:3a5:3622:6831 with SMTP id g8-20020ac84688000000b003a536226831mr3255861qto.479.1668951243164; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 010/241] global: Migrate CONFIG_ENV_FLAGS_LIST_STATIC to CFG Date: Sun, 20 Nov 2022 08:30:01 -0500 Message-Id: <20221120133352.3055600-11-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- README | 6 +++--- include/configs/aristainetos2.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/env_flags.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index 103562bbbe8d..71767e32d11b 100644 --- a/README +++ b/README @@ -1132,7 +1132,7 @@ The following options need to be configured: The same can be accomplished in a more flexible way for any variable by configuring the type of access to allow for those variables in the ".flags" variable - or define CONFIG_ENV_FLAGS_LIST_STATIC. + or define CFG_ENV_FLAGS_LIST_STATIC. - Protected RAM: CONFIG_PRAM @@ -1496,7 +1496,7 @@ Configuration Settings: this option if you really know what you are doing. - CONFIG_ENV_FLAGS_LIST_DEFAULT -- CONFIG_ENV_FLAGS_LIST_STATIC +- CFG_ENV_FLAGS_LIST_STATIC Enable validation of the values given to environment variables when calling env set. Variables can be restricted to only decimal, hexadecimal, or boolean. If CONFIG_CMD_NET is also defined, @@ -1527,7 +1527,7 @@ Configuration Settings: Define this to a list (string) to define the ".flags" environment variable in the default or embedded environment. - - CONFIG_ENV_FLAGS_LIST_STATIC + - CFG_ENV_FLAGS_LIST_STATIC Define this to a list (string) to define validation that should be done if an entry is not found in the ".flags" environment variable. To override a setting in the static diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 6faf544d21b6..e80166b3c467 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -420,7 +420,7 @@ /* UBI support */ -#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ +#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ "sysnum:dw,panel:sw,ipaddr:iw,serverip:iw" #endif /* __ARISTAINETOS2_CONFIG_H */ diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 99da081cdae8..392f97050a65 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -45,7 +45,7 @@ "save_env=env save; env save\0" \ "altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0" -#define CONFIG_ENV_FLAGS_LIST_STATIC \ +#define CFG_ENV_FLAGS_LIST_STATIC \ "bootset:bw," \ "clone_pending:bw," \ "endurance_test:bw," \ diff --git a/include/env_flags.h b/include/env_flags.h index 313cb8c49a6d..e4e40169aed0 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -35,8 +35,8 @@ enum env_flags_varaccess { #define ENV_FLAGS_VARTYPE_LOC 0 #define ENV_FLAGS_VARACCESS_LOC 1 -#ifndef CONFIG_ENV_FLAGS_LIST_STATIC -#define CONFIG_ENV_FLAGS_LIST_STATIC "" +#ifndef CFG_ENV_FLAGS_LIST_STATIC +#define CFG_ENV_FLAGS_LIST_STATIC "" #endif #ifdef CONFIG_NET @@ -77,7 +77,7 @@ enum env_flags_varaccess { ETHADDR_FLAGS \ NET_FLAGS \ SERIAL_FLAGS \ - CONFIG_ENV_FLAGS_LIST_STATIC + CFG_ENV_FLAGS_LIST_STATIC #ifdef CONFIG_CMD_ENV_FLAGS /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 97ad18677f1d..8d9496e6edba 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -10,7 +10,7 @@ CFG_DM9000_BYTE_SWAPPED CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT CFG_DW_WDT_CLOCK_KHZ -CONFIG_ENV_FLAGS_LIST_STATIC +CFG_ENV_FLAGS_LIST_STATIC CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS CONFIG_ENV_SETTINGS_NAND_V1 From patchwork Sun Nov 20 13:30: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: 1706718 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=DDEQwBEc; 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 4NFWkd2nxLz23lt for ; Mon, 21 Nov 2022 00:36:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A24885271; Sun, 20 Nov 2022 14:34: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="DDEQwBEc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0456085201; Sun, 20 Nov 2022 14:34:07 +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 6BCD18500E for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72f.google.com with SMTP id z17so6488642qki.11 for ; Sun, 20 Nov 2022 05:34: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=R+tQCG8ONBUeJbWLonJiKgaDEZia+71w3dApcUC/VIo=; b=DDEQwBEcDvBKhHCkTSH3YOTO3Y61zPiHbL1sNzwGAu6T0KEiAyBpTxLNJeLq0lpoR3 CfHYUS2+LItcom0TGZcPbmDmyTuXbLAwC5oss/EVC+0dlA7jBh5SgWXarQ/dpktJ5W4Z g7drNZdgJKg+lSH/SjZvi8X1kuuz09cjxge1Q= 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=R+tQCG8ONBUeJbWLonJiKgaDEZia+71w3dApcUC/VIo=; b=tR0/dldOt/xmcOxFoW5gDq998r6B+H5OA/xH+IwygCpCL88/SSEpMOMveZyGOXnE/y Fs8qwQ09BxRGsslpSKHWwzb4XxWxDhMBX5djcVR+j/sqYsELhONyCTLL83yD/jBdcnRh tCi+oXc0HVK2nHisZ7mxTzK4u/fh3zSutbEBalB/cbQLOf/QUIjF2NvOiHesoriYKAcm pkje3Jg/ubONpvPUR0C5pC5tsMrgP2O3VDbmGbvSTnY6D9A/9zRSbTdBVeYHXiqb4O8H 0eSDrY3gKr4nOMvxCQ/vMAdyH95jKk9Abegj/YLXVgegvzhU7Snb4RsbIiDmxgZRTzcg /QHQ== X-Gm-Message-State: ANoB5pkAccNZDQ+wyRn+bV24ruHNzAxy+4O/MNvu7zvGVV1+W16fHzH1 Yydcjgmi21MImRVA2Im126gbDmN5H1D4ZA== X-Google-Smtp-Source: AA0mqf4e+VrIyejFi19lt8BRrn0UKLjf48pRr/THDQf6nzAqClv+Oda2/wf+BhEWFxdRjPTKhnkn7w== X-Received: by 2002:a05:620a:31d:b0:6fa:39f6:8c13 with SMTP id s29-20020a05620a031d00b006fa39f68c13mr12886417qkm.113.1668951243860; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:03 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 011/241] global: Migrate CONFIG_ENV_IS_EMBEDDED to CFG Date: Sun, 20 Nov 2022 08:30:02 -0500 Message-Id: <20221120133352.3055600-12-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- env/Makefile | 2 +- include/env_internal.h | 12 ++++++------ scripts/config_whitelist.txt | 2 +- tools/Makefile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/env/Makefile b/env/Makefile index c4ad65432865..78e82173507f 100644 --- a/env/Makefile +++ b/env/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o ifndef CONFIG_SPL_BUILD obj-y += callback.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o -extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o +extra-$(CFG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o diff --git a/include/env_internal.h b/include/env_internal.h index f30fd6159d87..690e6da81078 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -41,8 +41,8 @@ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) # define ENV_IS_EMBEDDED # endif -# ifdef CONFIG_ENV_IS_EMBEDDED -# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config" +# ifdef CFG_ENV_IS_EMBEDDED +# error "do not define CFG_ENV_IS_EMBEDDED in your board config" # error "it is calculated automatically for you" # endif #endif /* CONFIG_ENV_IS_IN_FLASH */ @@ -61,15 +61,15 @@ extern unsigned long nand_env_oob_offset; * For the flash types where embedded env is supported, but it cannot be * calculated automatically (i.e. NAND), take the board opt-in. */ -#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) +#if defined(CFG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) # define ENV_IS_EMBEDDED #endif /* The build system likes to know if the env is embedded */ #ifdef DO_DEPS_ONLY # ifdef ENV_IS_EMBEDDED -# ifndef CONFIG_ENV_IS_EMBEDDED -# define CONFIG_ENV_IS_EMBEDDED +# ifndef CFG_ENV_IS_EMBEDDED +# define CFG_ENV_IS_EMBEDDED # endif # endif #endif @@ -88,7 +88,7 @@ extern unsigned long nand_env_oob_offset; * If the environment is in RAM, allocate extra space for it in the malloc * region. */ -#if defined(CONFIG_ENV_IS_EMBEDDED) +#if defined(CFG_ENV_IS_EMBEDDED) #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #elif (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE < CONFIG_SYS_MONITOR_BASE) || \ (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) || \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d9496e6edba..040b0c89049a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -11,7 +11,7 @@ CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC -CONFIG_ENV_IS_EMBEDDED +CFG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS CONFIG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 diff --git a/tools/Makefile b/tools/Makefile index 26be0a7ba2ea..b76876307a74 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -36,7 +36,7 @@ endif subdir-$(HOST_TOOLS_ALL) += gdb # Merge all the different vars for envcrc into one -ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y +ENVCRC-$(CFG_ENV_IS_EMBEDDED) = y ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y From patchwork Sun Nov 20 13:30: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: 1706720 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=WnbXIQHy; 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 4NFWl63cwGz23lt for ; Mon, 21 Nov 2022 00:36:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D425A85221; Sun, 20 Nov 2022 14:34: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="WnbXIQHy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E85288503A; Sun, 20 Nov 2022 14:34:08 +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 123F583619 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x731.google.com with SMTP id p18so6506809qkg.2 for ; Sun, 20 Nov 2022 05:34: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=zMbBaXXI9MTp0YpCViUWIicVCyOhi0OlGApioW1d804=; b=WnbXIQHy0XPRcdUWWHA95ID26PswFS/G0WOEI+rIEC4rH+5VvCIQav6R0RQeJqIaqY 0cn3CZdaY3VB8Ly0oZy+BtierevCmcS3oMplvxTlmzVyCU/PD1oVTrc5QSM9SaZmqQjX 2LIhCzg9oMG5Fyf6wQj/DDBa+qDwpynv0J4jI= 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=zMbBaXXI9MTp0YpCViUWIicVCyOhi0OlGApioW1d804=; b=wOYK4MzbUZSU6GPvVMaDuY4/DlQqWMguLCtjnTjFufhpCMDoFfMZwFeP3vS9Q8A3Bi irmdRlsP2UiLOlXq8D0zB/dUFphHgt7ym8JK/KlUDRH7XW42SzY4GHa+w5s1fbWWrwYx G2crZX/Y7xGGdD8m+8kw/pIBwCxlwmDZwOV79vujlBJszrMiYFBulcuB2Tcfqr41oPAs UvrPjbDfQU5EhaLB14DTaQnR3x0bL3CjNRxU0qERDuUz6WuBQzvE7EVFwbJIIouI0nU/ wY/Yj0aHTJwk5SCeuIBnztrk4UrZZgGD79Dnq8WJz/Tgbn//C2g9mrFbOP38ldUn+2K4 augQ== X-Gm-Message-State: ANoB5pmO/PjUvxfhMQX0wEfqvpn0LCH8aTDsFzAmY0o2u76RQq6kYz6L 0Xfy97J7PLitLFsztoYk63r/7+68KCBTXQ== X-Google-Smtp-Source: AA0mqf7G0xkilM+y1wkwpvIXNUDedT9BR+M7srhdnI8Qy0CDEs1UBDRXyWSpBkTsfemhvM3ECwUMMw== X-Received: by 2002:a37:ac05:0:b0:6fb:4ef0:3f38 with SMTP id e5-20020a37ac05000000b006fb4ef03f38mr12945348qkm.439.1668951244508; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 012/241] global: Migrate CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG Date: Sun, 20 Nov 2022 08:30:03 -0500 Message-Id: <20221120133352.3055600-13-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/draco.h | 4 ++-- include/configs/etamin.h | 4 ++-- include/configs/pxm2.h | 4 ++-- include/configs/rastaban.h | 4 ++-- include/configs/thuban.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/configs/draco.h b/include/configs/draco.h index 4869008da440..d1c7abe1b392 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -19,7 +19,7 @@ #define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "led0=103,1,0\0" \ "led1=64,0,1\0" @@ -34,7 +34,7 @@ "nand_img_size=0x400000\0" \ "optargs=\0" \ "preboot=draco_led 0\0" \ - CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2 diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 6647148c96f4..d6c313d18e2a 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -56,7 +56,7 @@ #define BOARD_DFU_BUTTON_GPIO 27 #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ /* In dfu mode keep led1 on */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "button_dfu1=87\0" \ "led0=3,0,1\0" \ @@ -144,7 +144,7 @@ "nand_img_size=0x400000\0" \ "optargs=\0" \ "preboot=draco_led 0\0" \ - CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2 #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 586a7edcbb52..eafa6ae9a9a0 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -18,7 +18,7 @@ #define DDR_IOCTRL_VAL 0x18b #define DDR_PLL_FREQ 266 -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=59\0" \ "led0=117,0,1\0" \ @@ -34,7 +34,7 @@ "nand_img_size=0x500000\0" \ "optargs=\0" \ "preboot=draco_led 0\0" \ - CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ CONFIG_ENV_SETTINGS_V1 \ CONFIG_ENV_SETTINGS_NAND_V1 \ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 49cd11c17b44..2e002faf2e60 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -21,7 +21,7 @@ #define BOARD_DFU_BUTTON_GPIO 27 #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ /* In dfu mode keep led1 on */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "button_dfu1=87\0" \ "led0=3,0,1\0" \ @@ -44,7 +44,7 @@ "nand_img_size=0x400000\0" \ "optargs=\0" \ "preboot=draco_led 0\0" \ - CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2 diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 696306e46592..25c5a8ccd20e 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -19,7 +19,7 @@ #define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ +#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "button_dfu0=27\0" \ "led0=103,1,0\0" \ "led1=64,0,1\0" @@ -37,7 +37,7 @@ "nand_img_size=0x400000\0" \ "optargs=\0" \ "preboot=draco_led 0\0" \ - CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ + CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 040b0c89049a..cb880dc317fc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -12,7 +12,7 @@ CFG_DM9000_USE_16BIT CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC CFG_ENV_IS_EMBEDDED -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS +CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CONFIG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 CONFIG_ENV_SETTINGS_V1 From patchwork Sun Nov 20 13:30: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: 1706721 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=Uujk+ref; 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 4NFWlK3BwVz23lt for ; Mon, 21 Nov 2022 00:36:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DDAB68526F; Sun, 20 Nov 2022 14:34: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="Uujk+ref"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 143B38524B; Sun, 20 Nov 2022 14:34:09 +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 84EC6851EB for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x833.google.com with SMTP id e15so5910755qts.1 for ; Sun, 20 Nov 2022 05:34: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=S42wX+TNy77yHi+VxJ19UceJ9/aaEcTmtXeiqB2m2sg=; b=Uujk+refdjmg4Pkt5ApX48kkAS+qnrEthCiKWHlLdCkp0vuAYt+RFKKLtpOlprH3Rd Ryaj7MqjJcdsWy9qKyVFIcZQIgpg+r90GGmEouP5+WTMdxC8hoUuew2+8ZKi+0fjRSIs OJ/rUwhgSoNfAYM1tO4F97Rf0EWlcTFZd+FbM= 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=S42wX+TNy77yHi+VxJ19UceJ9/aaEcTmtXeiqB2m2sg=; b=Yi/2PF9FJOrUNNtSQtRleXFIc5UbsFdO/APwREh4DSzwKbO+OR06KLkkpeJA9rfk0O zych27umn2IgF8WKXpMTTHoerRKhr0+3LMYUVECo92blM1bp3CuHKwL1uc0rGbJzgYEQ /8P6E3oF6x61s13FVQJVLAVQ5oIvKZTgEijXcDCUoREvtT4yGFC6NGYmSEgNa8X6osTK gvv5sjgbqCuF5dM1HZy7Fr5A+SI9VuB4wKlWqlPJEzHroe4DKu8nCsZKylIZ+fuOV58U vUIk0DEfUmKWvlKwGEuOmyoaUn+GR4N974YGrzGQyk3Q6qMcQ2t8EVRz/mRI2X5XVvPv F/ZQ== X-Gm-Message-State: ANoB5pnJ5S5n7LCPUTWp2YQ4KAYnjJJvCDGpQZ46myGhJdxVY/MRpO6t MDNBDysEFCt9PhQbszb+7/SEGQIHdQyHgg== X-Google-Smtp-Source: AA0mqf4fmbFMvrZvCodC4y8NEVyHto7LVNeus7+NKRwEeJC3hJzEE1nh4qW4aHxS+f6iCs4xq6R4gw== X-Received: by 2002:a05:622a:5c90:b0:3a5:6de2:b400 with SMTP id ge16-20020a05622a5c9000b003a56de2b400mr13541909qtb.631.1668951245207; Sun, 20 Nov 2022 05:34:05 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 013/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG Date: Sun, 20 Nov 2022 08:30:04 -0500 Message-Id: <20221120133352.3055600-14-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index eafa6ae9a9a0..c6a01270a54d 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -37,7 +37,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ CONFIG_ENV_SETTINGS_V1 \ - CONFIG_ENV_SETTINGS_NAND_V1 \ + CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index ac48372b6c0b..f51771f9ca46 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -34,7 +34,7 @@ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ CONFIG_ENV_SETTINGS_V1 \ - CONFIG_ENV_SETTINGS_NAND_V1 \ + CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5a001716fb01..20efa468ac3d 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -201,7 +201,7 @@ "kernel_b part 0 8;" \ "rootfs partubi 0 10" -#define CONFIG_ENV_SETTINGS_NAND_V1 \ +#define CFG_ENV_SETTINGS_NAND_V1 \ "nand_active_ubi_vol=rootfs_a\0" \ "nand_active_ubi_vol_A=rootfs_a\0" \ "nand_active_ubi_vol_B=rootfs_b\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb880dc317fc..25bfb7ee89e7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -13,7 +13,7 @@ CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS -CONFIG_ENV_SETTINGS_NAND_V1 +CFG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 CONFIG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 From patchwork Sun Nov 20 13:30: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: 1706722 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=gJaIfniS; 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 4NFWlW23xpz23lt for ; Mon, 21 Nov 2022 00:36:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4071A85296; Sun, 20 Nov 2022 14:34: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="gJaIfniS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 150228500E; Sun, 20 Nov 2022 14:34:10 +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 464D08500E for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72a.google.com with SMTP id g10so6495147qkl.6 for ; Sun, 20 Nov 2022 05:34:07 -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=ACqubeTSUo9zwybKqWB+78BYKtuYopREofqCHLVSQmc=; b=gJaIfniS94PupzdiFkN0iq46nL1jji1JG2oLHThyPRkL7b6m1GbJhw/MUkqyxd76/2 6ei3IRDb1C4u3T4VTOaaXRYFv/aZH2oCaLDhPKCl6E/9j5MQr+CUXnfSHyyRBIo4TPo8 A1KFsWnCu+j+lQoV/EiUloyzWWU1Bkgg/iBJo= 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=ACqubeTSUo9zwybKqWB+78BYKtuYopREofqCHLVSQmc=; b=Ol21G4pCi1Xz7hy3EI6nO5vCsr8g+WpRL6xGRo+PRHbKRlhE2j+bPbKuiJ9XaLfM/0 JAsucUeXSOHC/XcC/vhynUSqRghOcJDgrEGTNjBJ9++GUzn2vPnGefuMCVk62xoYYzIJ zBvtoBT2GZw659DCUveA0N8NFDen2eihZDhny7MuYkWH89YpXVUhV57anNZoNqWyaVRg YColUhTfkgmp20l93aUHIQPdQQ018IeTUKnCOzGaRYjmI4R+2jVTJzbSCidUOXuphl+H FnmtNxmxicLvy/7uM185YW5QwMxCiqZKGZMUAdfNtU0oFvzQJ/fxr/lvl3el5RTjQwGk /ddQ== X-Gm-Message-State: ANoB5pmSrlLX5Z7r9s6+znUwarYJ1zmwlZMtIE9cU0sTSJHNnTy1cT0S Mx9+0Esp7bdAnoeFG+xsgsXVGMNYRvA28Q== X-Google-Smtp-Source: AA0mqf5ybOLr35Nwd20IsA/59OOo9KNH9Vj9m20M7MtAVIENombOwpPGOPtPkqwB+/mtkCS05njdDg== X-Received: by 2002:a05:620a:747:b0:6ee:c0c5:a70b with SMTP id i7-20020a05620a074700b006eec0c5a70bmr12454838qki.592.1668951245807; Sun, 20 Nov 2022 05:34:05 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:05 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 014/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG Date: Sun, 20 Nov 2022 08:30:05 -0500 Message-Id: <20221120133352.3055600-15-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/draco.h | 2 +- include/configs/etamin.h | 6 +++--- include/configs/rastaban.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/thuban.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/draco.h b/include/configs/draco.h index d1c7abe1b392..5b0daec11a6a 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -36,6 +36,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_DRACO_H */ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index d6c313d18e2a..fea69c7eafae 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -93,8 +93,8 @@ "u-boot.env1 mtddev;" \ "rootfs mtddevubi" \ -#undef CONFIG_ENV_SETTINGS_NAND_V2 -#define CONFIG_ENV_SETTINGS_NAND_V2 \ +#undef CFG_ENV_SETTINGS_NAND_V2 +#define CFG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ "rootfs_name=rootfs\0" \ "kernel_name=uImage\0"\ @@ -146,6 +146,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* CONFIG_SPL_BUILD */ #endif /* ! __CONFIG_ETAMIN_H */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 2e002faf2e60..f3435b2b8c6c 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -46,6 +46,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_RASTABAN_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 20efa468ac3d..b1cd614316d4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -278,7 +278,7 @@ "u-boot.env1 part 0 7;" \ "rootfs partubi 0 9" \ -#define CONFIG_ENV_SETTINGS_NAND_V2 \ +#define CFG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ "rootfs_name=rootfs\0" \ "kernel_name=uImage\0"\ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 25c5a8ccd20e..960b42dffd0e 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -39,6 +39,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_THUBAN_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 25bfb7ee89e7..e55368c5453c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -14,7 +14,7 @@ CFG_ENV_FLAGS_LIST_STATIC CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 -CONFIG_ENV_SETTINGS_NAND_V2 +CFG_ENV_SETTINGS_NAND_V2 CONFIG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK From patchwork Sun Nov 20 13:30: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: 1706724 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=T3sPkaJ8; 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 4NFWlx12djz23lt for ; Mon, 21 Nov 2022 00:37:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D16748529B; Sun, 20 Nov 2022 14:34: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="T3sPkaJ8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A267A85202; Sun, 20 Nov 2022 14:34:11 +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-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 3A6D4851DB for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x735.google.com with SMTP id i9so6486036qki.10 for ; Sun, 20 Nov 2022 05:34: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=oxlCNpZke1Un+pFSpWoldOh/R3PITZDgO7/KHFAL+nM=; b=T3sPkaJ8+RhoRNw8XtWPjREibxwqxZXuf//+PNpUe0M4NitYD4RyOMLRoE5Ry93oj9 j+mWpk3i8JlYppy52iLnwtyFgs4dZPhQ1Cj5Zg0Z3zDrW0flR6Uop9C3slQHBRafA6eV g9LtbVezKUk4cqpnsNKcTy+Z/yZLMic9gmON4= 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=oxlCNpZke1Un+pFSpWoldOh/R3PITZDgO7/KHFAL+nM=; b=Y+UeH0sVjczNiarNzxZUl47WSTUP/BpcVHOqzi2pd8YEO7Y1h9XQdiTfnwgIscrPTV T8LLePPoxM8mfQ18wylsJYaD5pke0WarR5QGbVWUiCT0ul0ZEXYvUpb3VdYootlcWjYn Ug2xqOVY2usKWIdm4/1szGzna8Bcf0vjY1E1bAlk9qP8XbG8xyhGAJW3xSBd6ER1TrL9 3wqvF9whoHcHJN3zfOEeGgBQKWRa+Fm52+9+YGs0AOUUFdx+L0Cd0G7wziOCU61WDYLu 6HBmQYMTUmDeUhriOwIaz69I0pK5+4miTr+kvaKw5Il5qSYDSmOt9k+eg7yx8Bv1WNKK GO7w== X-Gm-Message-State: ANoB5pkwrSv4kr1d1lVglSs3jdP4gbHImii6OkZMF3bQPiQu5+T9+h3y a2hGSbqwMwzUx11Kq2TyKKBfqtT4SJ/hEA== X-Google-Smtp-Source: AA0mqf7o4yfuaWjyTORj2odtkuYenJGTb8r5NUen0q+Rj1C8CHSQmj0cqY40p7dW3VQreZ97RIaJHQ== X-Received: by 2002:a37:9ad7:0:b0:6ee:aeae:6891 with SMTP id c206-20020a379ad7000000b006eeaeae6891mr12769751qke.717.1668951246637; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 015/241] global: Migrate CONFIG_ENV_SETTINGS_V1 to CFG Date: Sun, 20 Nov 2022 08:30:06 -0500 Message-Id: <20221120133352.3055600-16-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index c6a01270a54d..48f49906b84e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -36,7 +36,7 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index f51771f9ca46..b07d0c50604d 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -33,7 +33,7 @@ "nand_img_size=0x500000\0" \ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b1cd614316d4..c54b02c5919a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -234,7 +234,7 @@ "${nand_img_size}; bootm ${kloadaddr}\0" \ COMMON_ENV_NAND_CMDS -#define CONFIG_ENV_SETTINGS_V1 \ +#define CFG_ENV_SETTINGS_V1 \ COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e55368c5453c..26821890137d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -15,7 +15,7 @@ CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 -CONFIG_ENV_SETTINGS_V1 +CFG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE From patchwork Sun Nov 20 13:30: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: 1706723 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=rzV8e2mC; 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 4NFWlj2jBcz23lt for ; Mon, 21 Nov 2022 00:37:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D71208529A; Sun, 20 Nov 2022 14:34: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="rzV8e2mC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA6348524F; Sun, 20 Nov 2022 14:34:10 +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 D7CCA85201 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x734.google.com with SMTP id s20so6511328qkg.5 for ; Sun, 20 Nov 2022 05:34:07 -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=nA3QJJICrwhM8tV9bMbl4WHNrINdHr9FqyxDLGu05KI=; b=rzV8e2mCJvCeBhwn4++UDhDYRot5v68P55UCa2fhaNGGprIjZ497kwVUNKcu/ptj2e 8Ydu+bIDsdV1rHWHz/DhFMVutnJ6QAhAmKvZ/11o2coTbhmk87pVSgfwIbWiKBgTovcT /LnRa2ZoODfwb/84jyswSqC86J4O2vkzT6xRQ= 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=nA3QJJICrwhM8tV9bMbl4WHNrINdHr9FqyxDLGu05KI=; b=NVIzteTbK5VBWwor81tWqjsGRY28sy2rTXTvGTOtjigUoESxpqWhbZSSbatFy8MZT/ zZiImtS0ubHp4EV4cUwwpf3Usg8XI1anVyVq1CZs0xKL3ljbgaeqQNxaHBoFh9kNNNYs 6AwLUHDtmhp8A6vLJEyt8wjaIfOb1e//QjjPMMjvwHoaWe9oj3a4PW1w2J4ogjQADYJ1 zb9nLNZRGB9Kk7LhCe3G1sOr7O4pugQpDpzbjpdy3Mref5D6BYkGoM6LFzZkyTfLRrZd tpuiG0YH0t0G9oZFkIlQR6IC/x0KEWMlWyhahmeZfB/VNFj+XBwQFKs7rsajerBUi1H2 jQLA== X-Gm-Message-State: ANoB5pljqDFJbfokMWDiK6I6KpmMWK1UUzyGHoIKEozZ7/OtKId/9gJW 4DHfbx/SniLPTq51WQdmLq66nUG+cb9gvQ== X-Google-Smtp-Source: AA0mqf4KBM/gsfxCOF+mwI1nDruSUHQ+DuLsDsYE1gxddcfVxqlA5jxMhRMx8kYafr3irvBdRaVb3w== X-Received: by 2002:a05:620a:3706:b0:6e2:5472:345e with SMTP id de6-20020a05620a370600b006e25472345emr13002732qkb.391.1668951247226; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 016/241] global: Migrate CONFIG_ENV_SETTINGS_V2 to CFG Date: Sun, 20 Nov 2022 08:30:07 -0500 Message-Id: <20221120133352.3055600-17-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/draco.h | 2 +- include/configs/etamin.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/thuban.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/draco.h b/include/configs/draco.h index 5b0daec11a6a..ab3cf10d7793 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -35,7 +35,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_DRACO_H */ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index fea69c7eafae..9011940abe4b 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -145,7 +145,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2 #endif /* CONFIG_SPL_BUILD */ #endif /* ! __CONFIG_ETAMIN_H */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index f3435b2b8c6c..59d56d666242 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -45,7 +45,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_RASTABAN_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index c54b02c5919a..2a63b36a536a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -311,7 +311,7 @@ "bootm ${kloadaddr} - ${loadaddr}\0" \ COMMON_ENV_NAND_CMDS -#define CONFIG_ENV_SETTINGS_V2 \ +#define CFG_ENV_SETTINGS_V2 \ COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 960b42dffd0e..c8b27263e85e 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -38,7 +38,7 @@ "optargs=\0" \ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ - CONFIG_ENV_SETTINGS_V2 \ + CFG_ENV_SETTINGS_V2 \ CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_THUBAN_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 26821890137d..831f8a99ea5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -16,7 +16,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 -CONFIG_ENV_SETTINGS_V2 +CFG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE From patchwork Sun Nov 20 13:30: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: 1706725 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=UmsFheDz; 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 4NFWm82rg3z23lt for ; Mon, 21 Nov 2022 00:37:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BCE648529F; Sun, 20 Nov 2022 14:34: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="UmsFheDz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A45C85222; Sun, 20 Nov 2022 14:34: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-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 8FAD285222 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x731.google.com with SMTP id p18so6506849qkg.2 for ; Sun, 20 Nov 2022 05:34: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=+4eK+pZpSC1ykqjU8gud+o4KPgTAlOS26RCes2YFW/g=; b=UmsFheDzkxIL+aUmyFUn4dmqSn4mUCNyvMN2j/yLnUPIyhvYyzEzGFU2SyZTC6rJgh SPPjzH4SpbECSLFa4H3Y3YI6sKKbePHeXd6fZbMcSoAWKOd80gvi8JGmLP/UID0O7QyG inbL8q+eW9BGxBFWXU6zjCzUu2gixGgNISULo= 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=+4eK+pZpSC1ykqjU8gud+o4KPgTAlOS26RCes2YFW/g=; b=ZtqVv+ZAAD+9iz5G2fcrYgTlTB4PBVhHp9k68k/7rEKeQuX40a/MKU9yuodDd3gYjX IUlhMge3jqo35FoY25hC29xk6ufCAmIkGjNTYfVLgqV2cS0OYIoWMyRr098GNDWG8tbL F0JI6p479vHrO8zrPNwt7GiiMzxRJKJsLITyVzJEG/woKuryCWjnir/2jsZ4AW+4jbjU 0QJ1gIPXfd/3zL0hk4iTQPnVt1bkmFJ5cPOgXRg3tdER3t5AQXA2tKSLofdDZf/2TqM5 xrn+yRbcxdZmaH5PWfB01rMczLKOGhn1MVqB61EX1RaJoTrbK82n9BIvU3shuIuTejy8 IKKQ== X-Gm-Message-State: ANoB5pnxZeMu5+Rdy2U9Wzf+brR1Xq+pUzOHZTrWnk0mXX5OJgVbyVz8 CmgE3lWKg+JhacmeFPapux9npO0AiKrxug== X-Google-Smtp-Source: AA0mqf4YlxtC5YxVNWozkb4QWSukjU5NiuTIha/bVIj14EGFNBqxl1A/BcqfDjpZzI5eadHakJ9TJA== X-Received: by 2002:a37:9a15:0:b0:6fb:6221:18a3 with SMTP id c21-20020a379a15000000b006fb622118a3mr12986148qke.230.1668951248025; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:07 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 017/241] global: Migrate CONFIG_ENV_SROM_BANK to CFG Date: Sun, 20 Nov 2022 08:30:08 -0500 Message-Id: <20221120133352.3055600-18-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/samsung/smdkc100/smdkc100.c | 6 +++--- board/samsung/smdkv310/smdkv310.c | 6 +++--- include/configs/exynos5-common.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smdkv310.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index b944e44c1ac4..4f46911b0b4d 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -25,16 +25,16 @@ static void smc9115_pre_init(void) u32 smc_bw_conf, smc_bc_conf; /* gpio configuration GPK0CON */ - gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); + gpio_cfg_pin(S5PC100_GPIO_K00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); /* Ethernet needs bus width of 16 bits */ - smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bw_conf = SMC_DATA16_WIDTH(CFG_ENV_SROM_BANK); smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe) | SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4) | SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0); /* Select and configure the SROMC bank */ - s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); + s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); } int board_init(void) diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c index bb61ba1f81c6..47483a26a622 100644 --- a/board/samsung/smdkv310/smdkv310.c +++ b/board/samsung/smdkv310/smdkv310.c @@ -24,17 +24,17 @@ static void smc9115_pre_init(void) u32 smc_bw_conf, smc_bc_conf; /* gpio configuration GPK0CON */ - gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); + gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); /* Ethernet needs bus width of 16 bits */ - smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bw_conf = SROMC_DATA16_WIDTH(CFG_ENV_SROM_BANK); smc_bc_conf = SROMC_BC_TACS(0x0F) | SROMC_BC_TCOS(0x0F) | SROMC_BC_TACC(0x0F) | SROMC_BC_TCOH(0x0F) | SROMC_BC_TAH(0x0F) | SROMC_BC_TACP(0x0F) | SROMC_BC_PMC(0x0F); /* Select and configure the SROMC bank */ - s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); + s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); } int board_init(void) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index dd322c2b3a79..0490c2dad53e 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -50,7 +50,7 @@ /* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/ /* Enable Time Command */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index ffa1a1fcb0ef..ccb7ec38d033 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -94,7 +94,7 @@ * Ethernet Contoller driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ +#define CFG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ #endif /* CONFIG_CMD_NET */ #endif /* __CONFIG_H */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index af0c8200fc23..1f137dba90f7 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -42,7 +42,7 @@ /* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/ #endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 831f8a99ea5c..5de121b41ca0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -17,7 +17,7 @@ CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 -CONFIG_ENV_SROM_BANK +CFG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE CONFIG_ETHBASE From patchwork Sun Nov 20 13:30: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: 1706727 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=oWPGKGGr; 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 4NFWmb1V3qz23lt for ; Mon, 21 Nov 2022 00:37:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F1AA852AC; Sun, 20 Nov 2022 14:34: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="oWPGKGGr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14954851E9; Sun, 20 Nov 2022 14:34:14 +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 328FF85200 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x82c.google.com with SMTP id z6so5900381qtv.5 for ; Sun, 20 Nov 2022 05:34:09 -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=uf4J/BxnPRpzuQu/ry/axBy+NQ+EXfICF488M3fF1Zc=; b=oWPGKGGrXaPnZoiYqfQMwwnqeCfUIGwU9Ci3l6NTgITKs8CJh6riLvDou3wFDhoE9g gt56TEqVBANHpQ7e/khVnttKzm//zbGafGPppfP/kBceCNLYzII0i8PFqJOLEkfLyNlC 8tS46YBs1/Xt5Y6ise+ZhzBtlI+Xo8xNMcAes= 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=uf4J/BxnPRpzuQu/ry/axBy+NQ+EXfICF488M3fF1Zc=; b=DiFCWTV0uCwhcmucBrohfuqgPYmwoIG+vr2I+m0Dg5eiPTEvM+9MHIvMo/oHn9PnhE eiysxhA0wKLqk3LeHzC2JKQLk8+Iss9vDpKgEdmH+7j1Tb5O/lB/hRWof02mUpw1eVkE HogckcWgyNYwCX3CkgVvkLn6IpmJI3TmlYHNcoKWFXMznZf7/E2fPvi2fTzH06avuuer cpDOQocvTpdDYXLSAeJn+H9OOfltmhZztJchqD3stkjKejiqsV2MQX30AX0us98X8qtJ UrjCV9BFYBMViUW+1mXfk7PfryWFYU26mr0idXsNkgSK/UL+KeY5V3O2CdHswHacW4Du Yjjg== X-Gm-Message-State: ANoB5pmBhnHmH2+Fi6VnsXOQ4bBowh+msmPhYN6TekoWd/tEQGd657Q9 FjND7vrTI9GZbY5ldCwSuaLUGYEym2LstQ== X-Google-Smtp-Source: AA0mqf5yvEiFHQDIvkVzQep/+Da7zgXtATlg2CPf0BhtUVZqhUe4Bso+9WbfP2/980IPVKWm8QYCqg== X-Received: by 2002:ac8:6e8a:0:b0:39d:85a:2399 with SMTP id c10-20020ac86e8a000000b0039d085a2399mr13678479qtv.648.1668951248680; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:08 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 018/241] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG Date: Sun, 20 Nov 2022 08:30:09 -0500 Message-Id: <20221120133352.3055600-19-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/pg-wcom-ls102xa.h | 8 ++++---- include/configs/kmcent2.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index dfa81c037f48..05cdcbfba193 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -172,7 +172,7 @@ * Environment */ -#define CONFIG_ENV_TOTAL_SIZE 0x40000 +#define CFG_ENV_TOTAL_SIZE 0x40000 #define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND /* direct for newenv */ #ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ @@ -211,11 +211,11 @@ #define CONFIG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" #define CONFIG_HW_ENV_SETTINGS \ "hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 527f0383bc65..17eb9a7c2ea0 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -139,7 +139,7 @@ #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS /* Environment in parallel NOR-Flash */ -#define CONFIG_ENV_TOTAL_SIZE 0x040000 +#define CFG_ENV_TOTAL_SIZE 0x040000 #define ENV_DEL_ADDR 0xebf00000 /*direct for newenv*/ /* @@ -430,11 +430,11 @@ int get_scl(void); #define CONFIG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ #ifndef CONFIG_KM_DEF_ARCH diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5de121b41ca0..27923ec86bf5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -18,7 +18,7 @@ CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 CFG_ENV_SROM_BANK -CONFIG_ENV_TOTAL_SIZE +CFG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE CONFIG_ETHBASE CONFIG_EXTRA_ENV_SETTINGS From patchwork Sun Nov 20 13:30: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: 1706728 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=Zi0TSsq/; 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 4NFWmq1NrCz23lt for ; Mon, 21 Nov 2022 00:38:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD1F2852B2; Sun, 20 Nov 2022 14:34: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="Zi0TSsq/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9790785262; Sun, 20 Nov 2022 14:34:14 +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 CCE6085201 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x733.google.com with SMTP id 8so6517628qka.1 for ; Sun, 20 Nov 2022 05:34:10 -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=QFUmrkJ9bon2aTlKfqaE8106UgvMHgREHtVPwi4Ozoc=; b=Zi0TSsq/jO6VDiITdP1HZJkMcPL7oozblR58LR1bKq2F/gbOilfzHxh3O3KQoXl3VR 40ACcFF1Kup9KP76gd8DKy2CJiQdl2GrQYcnuK0st+gK0Ev9j09eTJI/rvbD1qJA9Thu rnYq1BcDNFh9OCqtZ3WQcLpMTOpRFRP0rYB4E= 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=QFUmrkJ9bon2aTlKfqaE8106UgvMHgREHtVPwi4Ozoc=; b=HpuRr9ZFDsA2wX0BqJDEptyf8t0JRR5H+Qo8PlbEQpEljWRdUILQcGmNmGdDrtYvR0 YfS+tGsSN36TZpJfvDtw4jsHuSh1mRQGeDqrQNrfUrCEUA4sMWjlDdx0fG9cqVnFgooD 2Wl4aMEAZRYoFnf99nhz1VHpDNEUdd2uh/1EsUxOy707DliqK0CEQ+H9CyXcD+JTA2Ry G2sMz3tL8KS5UPrDrfpfvbHRZjsKfIhIxT3MVMyNkNSmFr0wDTIMmeHiN7v6MWEWDeij Biu/03l8vP+CC/W2U7za+hc6qoN8jk2t8VaIhdx90VpnkD/P4XIwCHGffthhzWQ3chmb zNXg== X-Gm-Message-State: ANoB5pmML6BetvD8ZXoA59kJIqBsoI8U2Z9rQJjrajdJe/hhOOeoAJFJ EcuPDYUiEeCLQnSrmjvqgIJph4w1RvzNNg== X-Google-Smtp-Source: AA0mqf5vCOjDxGgvyI+pM8W5zu8RKLB8ZIVp0fADyrMPp/RkX5xwpEa0Ui/OKGr/RwHuLJuv2K7X7A== X-Received: by 2002:ae9:e207:0:b0:6ea:3768:1da1 with SMTP id c7-20020ae9e207000000b006ea37681da1mr12536167qkc.555.1668951249508; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:08 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 019/241] global: Migrate CONFIG_ET1100_BASE to CFG Date: Sun, 20 Nov 2022 08:30:10 -0500 Message-Id: <20221120133352.3055600-20-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/esd/meesc/meesc.c | 2 +- include/configs/meesc.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 21f4ba98b531..9e3621042241 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -163,7 +163,7 @@ int checkboard(void) u_char hw_type; /* hardware type */ /* read the "Type" register of the ET1100 controller */ - hw_type = readb(CONFIG_ET1100_BASE); + hw_type = readb(CFG_ET1100_BASE); switch (hw_type) { case 0x11: diff --git a/include/configs/meesc.h b/include/configs/meesc.h index d190e4b50392..38da55c70bfe 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -60,6 +60,6 @@ #endif /* hw-controller addresses */ -#define CONFIG_ET1100_BASE 0x70000000 +#define CFG_ET1100_BASE 0x70000000 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 27923ec86bf5..81353fa94e7c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -19,7 +19,7 @@ CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 CFG_ENV_SROM_BANK CFG_ENV_TOTAL_SIZE -CONFIG_ET1100_BASE +CFG_ET1100_BASE CONFIG_ETHBASE CONFIG_EXTRA_ENV_SETTINGS CONFIG_FB_ADDR From patchwork Sun Nov 20 13:30: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: 1706726 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=iwXrZjDT; 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 4NFWmN4NNLz23lt for ; Mon, 21 Nov 2022 00:37:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DED7852A9; Sun, 20 Nov 2022 14:34: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="iwXrZjDT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F382E8525B; Sun, 20 Nov 2022 14:34: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-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 A36CC85258 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x735.google.com with SMTP id i9so6486080qki.10 for ; Sun, 20 Nov 2022 05:34:10 -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=rKUN0jxummGN+q6HvF6/esNJcT13NlbxwlW2nzfI/oQ=; b=iwXrZjDTBOZSk5xRXZ1gv1M1hRK0Ghk2U5xlqIiMmcI4bNjn5p7nBaPV6oRKbWnxCs 79SXMrRz9TjOdN2VnGLeWgz3UZBOXkZwuGe4PVh3f+N1R2H1dzv27L3Z5SKsjgI+L4rU Gp0+Gsgcgm45dhpVeBMIhSziJ6GT5oFJgjH04= 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=rKUN0jxummGN+q6HvF6/esNJcT13NlbxwlW2nzfI/oQ=; b=iS7Rwe4+Pf+DNPS3fj8M7ebyiVRKSzu1+iSUovtS0819tO+BdAFiGZkQ+Co9kvCafE 78iefpAP5qcylP/ZaYvF+qPvzkK3cRZ0gPLHgoe/wfZjNtt/BY1meIZRHhj6kyFZtujF ou/SXZyCsfIjG1Sc1eLuIrMSaJuSO1/mmKBusoeBeSxfKLp+3Vzh09Xst7zNh37XOwTe 2RDNA1Bgka1NL+GTQwsGblO3CRAYXGMdNtfEYoMqwhYjMfQe35vEDCKel+pCmeHWa/0E nYGwDOCRSFZa0YXmNR0gCZSOdO6QNQqrtDamSlei/VyxzO9SIKe9ijRao7YvoXCXEqK5 lfOw== X-Gm-Message-State: ANoB5pm8Ns++iMgYzcHUUWinQpRmMEESAC7zjkxnadpDZOj6+XPrjASa 8S4fAhZ7w4nibtkXskzK0zrylnHVZXt4nA== X-Google-Smtp-Source: AA0mqf7WJgdJDZCDTFCijs0aZ0lcyP/+eeurpT3s2rZuzkbrabm/LkuVhS7aag6nWsGVuw2mbp5V7w== X-Received: by 2002:a05:620a:ce5:b0:6f9:dd9b:5450 with SMTP id c5-20020a05620a0ce500b006f9dd9b5450mr12860403qkj.156.1668951250104; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 020/241] global: Migrate CONFIG_ETHBASE to CFG Date: Sun, 20 Nov 2022 08:30:11 -0500 Message-Id: <20221120133352.3055600-21-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/cadence/xtfpga/xtfpga.c | 2 +- include/configs/xtfpga.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index f38f5564a06c..8e4081b4c6dd 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -89,7 +89,7 @@ int misc_init_r(void) char *s = env_get("ethaddr"); if (s == 0) { unsigned int x; - char s[] = __stringify(CONFIG_ETHBASE); + char s[] = __stringify(CFG_ETHBASE); x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW) & FPGAREG_MAC_MASK; sprintf(&s[15], "%02x", x); diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 9201dac7abce..6c5a9f566bee 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -136,7 +136,7 @@ /* Ethernet Driver Info */ /*======================*/ -#define CONFIG_ETHBASE 00:50:C2:13:6f:00 +#define CFG_ETHBASE 00:50:C2:13:6f:00 #define CFG_SYS_ETHOC_BASE IOADDR(0x0d030000) #define CFG_SYS_ETHOC_BUFFER_ADDR IOADDR(0x0D800000) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 81353fa94e7c..99b3796584d0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -20,7 +20,7 @@ CFG_ENV_SETTINGS_V2 CFG_ENV_SROM_BANK CFG_ENV_TOTAL_SIZE CFG_ET1100_BASE -CONFIG_ETHBASE +CFG_ETHBASE CONFIG_EXTRA_ENV_SETTINGS CONFIG_FB_ADDR CONFIG_FDTADDR From patchwork Sun Nov 20 13:30: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: 1706940 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=trr6upNl; 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 4NFXxg6QPPz23mR for ; Mon, 21 Nov 2022 01:30:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 316EA8554C; Sun, 20 Nov 2022 15:20: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="trr6upNl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5FA8A85291; Sun, 20 Nov 2022 14:34:31 +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 8B16085253 for ; Sun, 20 Nov 2022 14:34:13 +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 n12so419186qvr.11 for ; Sun, 20 Nov 2022 05:34:13 -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=59wQIppCpXUC8DCWwYfL89/q/zRW3jnQBh3V/HuWTto=; b=trr6upNlJ3zuE93q4tRtc7T6xcwUFpkX1Df+4JKTnI0HlW1h2Tt+WPlH5jwy2xAhsc Phm7JjvjPhXGw6byjSKnZAPv8EzMlgAXG7m2VefL+c1VjpxhZd89ogTamdWGp3rPtlE1 wGSuXG+kuUIsy97n8XpaQ9ja54hCRZeQgOUO0= 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=59wQIppCpXUC8DCWwYfL89/q/zRW3jnQBh3V/HuWTto=; b=cnhkSM3RBg/mwfMs2m6mTPoiz+AQXM65y76jRe551UFFJ3SJHxOxakJpW2uXwMzdNC N9TI2PPQzcUj8uQRIe+PYmfzcN9ssEVEcWwh6sjlNvvoV6g4xz7xrdJy+76dDSt7XxIr XxldXdDWUzUXVu9W+iUOIp+PU+ExIsXTG1Ulr+E2DOTYw1NAZeNx37n9I64faOXw/0Di o5tti92fh6Tll9cpNcudkgMKGXQABtw/xRbFf5r5Zh7zvLG2QrdPNCeRYN+5v2mPNQ3/ IyYESaX/Za4h1gnA/hVzMZskZwpjDFbBc5Ao3bzu25e9xgJFc1FtKxfzagfRgfYWLR+r r+1A== X-Gm-Message-State: ANoB5pnsQXKmOVu7B8DgK5VD4xd04sdzRENpk19ewnLvvA4yRPWCPFV0 jj0d7W1qPYTiFcEC+IJcJCwPOWzx3hL8KA== X-Google-Smtp-Source: AA0mqf5i8E3gDvwPWHcdE4nDJ9f0qodI89f83dYhRD78GXhCmdKL9U9F0P2ijMgyVqGHY4BTIhlahQ== X-Received: by 2002:a05:6214:2e09:b0:4bc:9d7f:d963 with SMTP id mx9-20020a0562142e0900b004bc9d7fd963mr13745415qvb.83.1668951251074; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:10 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 021/241] global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG Date: Sun, 20 Nov 2022 08:30:12 -0500 Message-Id: <20221120133352.3055600-22-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-1-trini@konsulko.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 20 Nov 2022 15:20:24 +0100 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 ++-- doc/README.fsl-ddr | 4 ++-- doc/README.link-local | 2 +- doc/arch/x86.rst | 4 ++-- doc/develop/devicetree/control.rst | 2 +- doc/develop/distro.rst | 2 +- doc/usage/environment.rst | 2 +- env/Kconfig | 4 ++-- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5275EVB.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/MPC837XERDB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.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/alt.h | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_guardian.h | 2 +- include/configs/am335x_igep003x.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 2 +- include/configs/am65x_evm.h | 2 +- include/configs/amcore.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/apple.h | 2 +- include/configs/arbel.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/astro_mcf5373l.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/ax25-ae350.h | 2 +- include/configs/axs10x.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bcm_ns3.h | 2 +- include/configs/bcmstb.h | 2 +- include/configs/beacon-rzg2m.h | 4 ++-- include/configs/bitmain_antminer_s9.h | 2 +- include/configs/bk4r1.h | 2 +- include/configs/brppt1.h | 2 +- include/configs/brppt2.h | 2 +- include/configs/brsmarc1.h | 2 +- include/configs/brxre1.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/chiliboard.h | 2 +- include/configs/cl-som-imx7.h | 4 ++-- include/configs/clearfog.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/cm_t43.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/conga-qeval20-qa3-e3845.h | 4 ++-- include/configs/controlcenterdc.h | 2 +- include/configs/crs3xx-98dx3236.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-xc3-24g4xg.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/dfi-bt700.h | 4 ++-- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/draco.h | 2 +- include/configs/dragonboard410c.h | 2 +- include/configs/dragonboard820c.h | 2 +- include/configs/dragonboard845c.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/ds414.h | 2 +- include/configs/durian.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/emsdp.h | 2 +- include/configs/etamin.h | 2 +- include/configs/evb_ast2500.h | 2 +- include/configs/evb_ast2600.h | 2 +- include/configs/evb_rv1108.h | 4 ++-- include/configs/exynos5-common.h | 2 +- include/configs/exynos7420-common.h | 2 +- include/configs/exynos78x0-common.h | 2 +- include/configs/gazerbeam.h | 2 +- include/configs/ge_b1x5v2.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/gose.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/helios4.h | 2 +- include/configs/highbank.h | 2 +- include/configs/hikey.h | 2 +- include/configs/hikey960.h | 2 +- include/configs/hsdk-4xd.h | 2 +- include/configs/hsdk.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/imx6-engicam.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 4 ++-- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm-mx8menlo.h | 4 ++-- 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/imx8mn_beacon.h | 2 +- include/configs/imx8mn_bsh_smm_s2.h | 2 +- include/configs/imx8mn_bsh_smm_s2pro.h | 2 +- include/configs/imx8mn_evk.h | 2 +- include/configs/imx8mn_var_som.h | 2 +- include/configs/imx8mn_venice.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mp_venice.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/imx8qm_rom7720.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/imxrt1050-evk.h | 2 +- include/configs/iot2050.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/j721s2_evm.h | 2 +- include/configs/km/km-mpc83xx.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/kp_imx53.h | 2 +- include/configs/kp_imx6q_tpc.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/lager.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/librem5.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/ls1012a2g5rdb.h | 4 ++-- include/configs/ls1012a_common.h | 2 +- include/configs/ls1012afrdm.h | 4 ++-- include/configs/ls1012afrwy.h | 4 ++-- include/configs/ls1012aqds.h | 4 ++-- include/configs/ls1012ardb.h | 4 ++-- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 4 ++-- include/configs/ls1021atsn.h | 2 +- include/configs/ls1021atwr.h | 4 ++-- include/configs/ls1028aqds.h | 4 ++-- include/configs/ls1028ardb.h | 4 ++-- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls1088aqds.h | 20 ++++++++++---------- include/configs/ls1088ardb.h | 6 +++--- include/configs/ls2080a_common.h | 2 +- include/configs/ls2080aqds.h | 10 +++++----- include/configs/ls2080ardb.h | 6 +++--- include/configs/lsxl.h | 2 +- include/configs/lx2160aqds.h | 2 +- include/configs/lx2160ardb.h | 2 +- include/configs/lx2162aqds.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/meson64.h | 4 ++-- include/configs/meson64_android.h | 2 +- include/configs/microblaze-generic.h | 4 ++-- include/configs/microchip_mpfs_icicle.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt8183.h | 2 +- include/configs/mt8512.h | 2 +- include/configs/mt8516.h | 2 +- include/configs/mt8518.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/mvebu_armada-37xx.h | 2 +- include/configs/mvebu_armada-8k.h | 2 +- include/configs/mx23_olinuxino.h | 2 +- include/configs/mx23evk.h | 2 +- include/configs/mx28evk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53ppd.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6sabre_common.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/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mx7ulp_evk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/octeontx2_common.h | 2 +- include/configs/octeontx_common.h | 4 ++-- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 4 ++-- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/openpiton-riscv64.h | 2 +- include/configs/openrd.h | 2 +- include/configs/origen.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pcm052.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pdu001.h | 2 +- include/configs/phycore_am335x_r2.h | 2 +- include/configs/phycore_imx8mm.h | 2 +- include/configs/phycore_imx8mp.h | 2 +- include/configs/pic32mzdask.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/pm9261.h | 2 +- include/configs/pm9263.h | 2 +- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/poleg.h | 2 +- include/configs/pomelo.h | 2 +- include/configs/poplar.h | 2 +- include/configs/porter.h | 2 +- include/configs/presidio_asic.h | 2 +- include/configs/px30_common.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/qcs404-evb.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/qemu-riscv.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3066_common.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3308_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rk3399_common.h | 2 +- include/configs/rk3568_common.h | 2 +- include/configs/rpi.h | 2 +- include/configs/rut.h | 2 +- include/configs/rv1108_common.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/s5pc210_universal.h | 2 +- include/configs/sdm845.h | 2 +- include/configs/sheevaplug.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/sifive-unmatched.h | 2 +- include/configs/silk.h | 2 +- include/configs/sipeed-maix.h | 4 ++-- include/configs/slimbootloader.h | 6 +++--- include/configs/smartweb.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smegw01.h | 2 +- include/configs/snapper9g45.h | 2 +- include/configs/sniper.h | 2 +- include/configs/socfpga_arria5_secu1.h | 2 +- include/configs/socfpga_chameleonv3.h | 2 +- include/configs/socfpga_common.h | 4 ++-- include/configs/socfpga_dbm_soc1.h | 2 +- include/configs/socfpga_mcvevk.h | 2 +- include/configs/socfpga_n5x_socdk.h | 4 ++-- include/configs/socfpga_soc64_common.h | 2 +- include/configs/socfpga_vining_fpga.h | 2 +- include/configs/socrates.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/stemmy.h | 2 +- include/configs/stih410-b2260.h | 2 +- include/configs/stm32f429-discovery.h | 2 +- include/configs/stm32f429-evaluation.h | 2 +- include/configs/stm32f469-discovery.h | 2 +- include/configs/stm32f746-disco.h | 2 +- include/configs/stm32h743-disco.h | 2 +- include/configs/stm32h743-eval.h | 2 +- include/configs/stm32h750-art-pi.h | 2 +- include/configs/stm32mp13_common.h | 2 +- include/configs/stm32mp15_common.h | 2 +- include/configs/stm32mp15_dh_dhsom.h | 2 +- include/configs/stm32mp15_st_common.h | 6 +++--- include/configs/stmark2.h | 2 +- include/configs/stout.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/syzygy_hub.h | 2 +- include/configs/taurus.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/tegra-common-post.h | 2 +- include/configs/ten64.h | 4 ++-- include/configs/theadorable-x86-common.h | 4 ++-- include/configs/theadorable.h | 2 +- include/configs/thuban.h | 2 +- include/configs/thunderx_88xx.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- include/configs/topic_miami.h | 4 ++-- include/configs/total_compute.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/configs/turris_mox.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/uniphier.h | 2 +- include/configs/usb_a9263.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vcoreiii.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/verdin-imx8mp.h | 2 +- include/configs/vexpress_aemv8.h | 2 +- include/configs/vexpress_common.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vinco.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/warp7.h | 2 +- include/configs/x530.h | 2 +- include/configs/x86-common.h | 2 +- include/configs/xea.h | 2 +- include/configs/xenguest_arm64.h | 6 +++--- include/configs/xilinx_versal.h | 4 ++-- include/configs/xilinx_versal_mini.h | 4 ++-- include/configs/xilinx_versal_net.h | 4 ++-- include/configs/xilinx_versal_net_mini.h | 4 ++-- include/configs/xilinx_zynqmp.h | 8 ++++---- include/configs/xilinx_zynqmp_mini.h | 4 ++-- include/configs/xilinx_zynqmp_r5.h | 2 +- include/configs/xpress.h | 2 +- include/configs/zynq-common.h | 4 ++-- include/configs/zynq_cse.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 383 files changed, 446 insertions(+), 446 deletions(-) diff --git a/README b/README index 71767e32d11b..52545b78a19b 100644 --- a/README +++ b/README @@ -1190,7 +1190,7 @@ The following options need to be configured: symbols. - Default Environment: - CONFIG_EXTRA_ENV_SETTINGS + CFG_EXTRA_ENV_SETTINGS Define this to contain any number of null terminated strings (variable = value pairs) that will be part of @@ -1199,7 +1199,7 @@ The following options need to be configured: For example, place something like this in your board's config file: - #define CONFIG_EXTRA_ENV_SETTINGS \ + #define CFG_EXTRA_ENV_SETTINGS \ "myvar1=value1\0" \ "myvar2=value2\0" diff --git a/doc/README.fsl-ddr b/doc/README.fsl-ddr index 10e63f3be1d3..f44bb2aa25d4 100644 --- a/doc/README.fsl-ddr +++ b/doc/README.fsl-ddr @@ -56,8 +56,8 @@ Table of 2-way interleaving modes supported in cpu/8xxx/ddr/ The ways to configure the ddr interleaving mode ============================================== 1. In board header file(e.g.MPC8572DS.h), add default interleaving setting - under "CONFIG_EXTRA_ENV_SETTINGS", like: - #define CONFIG_EXTRA_ENV_SETTINGS \ + under "CFG_EXTRA_ENV_SETTINGS", like: + #define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=bank" \ ...... diff --git a/doc/README.link-local b/doc/README.link-local index 148b4987f27c..ec2ef940e4c8 100644 --- a/doc/README.link-local +++ b/doc/README.link-local @@ -51,7 +51,7 @@ by env variables. It depends on CONFIG_CMD_LINK_LOCAL, CONFIG_CMD_DHCP, and CONFIG_BOOTP_MAY_FAIL. If both fail or are disabled, static settings are used. -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ipconfigcmd=if test \\\"$dhcpenabled\\\" -ne 0;" \ "then " \ "dhcpfail=0;dhcp || dhcpfail=1;" \ diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst index 634387ac095c..725a1ae58639 100644 --- a/doc/arch/x86.rst +++ b/doc/arch/x86.rst @@ -355,8 +355,8 @@ environment variables if you add this to minnowmax.h: "ext2load scsi 0:2 04000000 /boot/initrd.img-3.13.0-58-generic; " \ "run boot" - #undef CONFIG_EXTRA_ENV_SETTINGS - #define CONFIG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}" + #undef CFG_EXTRA_ENV_SETTINGS + #define CFG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}" and change CONFIG_BOOTARGS value in configs/minnowmax_defconfig to:: diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index c71570d64b47..0b3b32be1bb6 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -135,7 +135,7 @@ control the boot process of Linux with bootm/bootz commands. To use this, put something like this in your board header file:: - #define CONFIG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0" + #define CFG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0" Build: diff --git a/doc/develop/distro.rst b/doc/develop/distro.rst index bc72aa951ef7..8016acad098a 100644 --- a/doc/develop/distro.rst +++ b/doc/develop/distro.rst @@ -214,7 +214,7 @@ Required Environment Variables The U-Boot "syslinux" and "pxe boot" commands require a number of environment variables be set. Default values for these variables are often hard-coded into -CONFIG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that +CFG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that the user doesn't have to configure them. fdt_addr: diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 83f210d2d058..2c44e5da6aa0 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -89,7 +89,7 @@ Old-style C environment Traditionally, the default environment is created in `include/env_default.h`, and can be augmented by various `CONFIG` defines. See that file for details. In -particular you can define `CONFIG_EXTRA_ENV_SETTINGS` in your board file +particular you can define `CFG_EXTRA_ENV_SETTINGS` in your board file to add environment variables. Board maintainers are encouraged to migrate to the text-based environment as it diff --git a/env/Kconfig b/env/Kconfig index 4e506ae262b5..5a7e2f299b06 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -19,7 +19,7 @@ config ENV_SOURCE_FILE If this CONFIG is empty, U-Boot uses CONFIG SYS_BOARD as a default, if the file board///.env exists. Otherwise the environment is assumed to come from the ad-hoc - CONFIG_EXTRA_ENV_SETTINGS #define + CFG_EXTRA_ENV_SETTINGS #define config SAVEENV def_bool y if CMD_SAVEENV @@ -655,7 +655,7 @@ config USE_DEFAULT_ENV_FILE help Normally, the default environment is automatically generated based on the settings of various CONFIG_* options, as well - as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option, + as the CFG_EXTRA_ENV_SETTINGS. By selecting this option, you can instead define the entire default environment in an external file. diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index b360238b332a..ef3837e137c7 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -25,7 +25,7 @@ #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5208EVBe" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index ed45eccb62c9..a31d44177362 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -34,7 +34,7 @@ #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5235EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 4be4d0f84512..a1cb1a8a7022 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -28,7 +28,7 @@ # define CONFIG_OVERWRITE_ETHADDR_ONCE -# define CONFIG_EXTRA_ENV_SETTINGS \ +# define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index a9339e505257..501785ac82e0 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -37,7 +37,7 @@ #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5272C3" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index ff9f85358963..951209fbd750 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -42,7 +42,7 @@ # define CONFIG_OVERWRITE_ETHADDR_ONCE #endif /* FEC_ENET */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "uboot=u-boot.bin\0" \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index bde9e770e52a..3912aae750d4 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -37,7 +37,7 @@ #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5282EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 42b74aeb9b5d..ad27766cf0f4 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -38,7 +38,7 @@ #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M53017" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 72f0c63a1e21..f8aabe4944a4 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -30,7 +30,7 @@ #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5329EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 4e8b54e01f4e..228fcde98dc3 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -32,7 +32,7 @@ #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5373EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 232cf9e99845..6e7b6e81208f 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -9,7 +9,7 @@ /* High Level Configuration Options */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "sdram_type=SDRAM\0" \ "flash_type=AM29LV160DB\0" \ "loadaddr=0x400000\0" \ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 95a90199a429..2a71e0ad4dce 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -231,7 +231,7 @@ #define CONFIG_UBOOTPATH "u-boot.bin" #define CONFIG_FDTFILE "mpc8379_rdb.dtb" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 780ee5ae865a..515e88cf8206 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -335,7 +335,7 @@ #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index b1d6b15811dd..bc24be79366c 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -415,7 +415,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 8b901ca47a0c..834400f1d601 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -313,7 +313,7 @@ #define __USB_PHY_TYPE utmi -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 623d4cf5562d..f666683bcc4b 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -439,7 +439,7 @@ "fdtfile=t1023rdb/t1023rdb.dtb\0" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ARCH_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index b6938056bbe1..53bd8e85a627 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -431,7 +431,7 @@ #define FDTFILE "t1042rdb/t1042d4rdb.dtb" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index a93e05dd4d2d..5244c9d076f0 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -426,7 +426,7 @@ #define __USB_PHY_TYPE utmi -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index cf65a0da1883..022d483da763 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -392,7 +392,7 @@ #define __USB_PHY_TYPE utmi -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index b51762264ade..6cf8b75c86c2 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -382,7 +382,7 @@ #define CTRL_INTLV_PREFERED cacheline #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/alt.h b/include/configs/alt.h index fe303fda78a0..6d530f6d24bc 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -33,7 +33,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "usb_pgood_delay=2000\0" diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 755f7fae3e4f..1f473b5a1500 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -78,7 +78,7 @@ #ifndef CONFIG_SPL_BUILD #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=undefined\0" \ "finduuid=part uuid mmc 0:2 uuid\0" \ diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index 7c5e7ce475ef..1de78e5a55dd 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -45,7 +45,7 @@ "main_pcba_aux_3=0\0" \ "main_pcba_aux_4=0\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AM335XX_BOARD_FDTFILE \ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV \ diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index abd868c14538..e2beaf271859 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -20,7 +20,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 452887d6995c..c66650c8e8d1 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -23,7 +23,7 @@ #define CONFIG_HSMMC2_8BIT #ifndef CONFIG_SPL_BUILD -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "kloadaddr=0x84000000\0" \ "fdtaddr=0x85000000\0" \ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 342a068c855f..f3d3d18c0551 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -30,7 +30,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AM335XX_BOARD_FDTFILE \ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c57a0ddc21dd..b75c64838831 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -38,7 +38,7 @@ #endif /* CONFIG_MTD_RAW_NAND */ /* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyS2,115200n8\0" \ "fdtfile=am3517-evm.dtb\0" \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 7659c1cc0619..3a6ffd9de0bb 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -66,7 +66,7 @@ #ifndef CONFIG_SPL_BUILD #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=undefined\0" \ "finduuid=part uuid mmc 0:2 uuid\0" \ diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index 57f3f37908df..809d89119c42 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -55,7 +55,7 @@ "partitions=" PARTS_DEFAULT /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ EXTRA_ENV_AM625_BOARD_SETTINGS \ diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 25c71f00a20f..26a7f2521ecc 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -95,7 +95,7 @@ DFU_ALT_INFO_OSPI /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ EXTRA_ENV_AM642_BOARD_SETTINGS \ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 0307426e4aba..33dd6cfdfa45 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -88,7 +88,7 @@ #endif /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index ee0be972d243..78060d432a86 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -12,7 +12,7 @@ #define CFG_SYS_UART_PORT 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade_uboot=loady; " \ "protect off 0xffc00000 0xffc1ffff; " \ "erase 0xffc00000 0xffc1ffff; " \ diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index cf23837863be..15bedc0afc29 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -34,7 +34,7 @@ #define BOOTENV_RUN_NET_USB_START "" /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index a3c86545f077..4899dfb4dee1 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -70,7 +70,7 @@ "ramdisk_addr_r=0x18400000\0" \ "scriptaddr=0x18280000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ diff --git a/include/configs/apple.h b/include/configs/apple.h index b06660add4fa..fe7d11bcdb38 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -27,7 +27,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ BOOTENV diff --git a/include/configs/arbel.h b/include/configs/arbel.h index 60758b0ca02a..8e27fb52a1c3 100644 --- a/include/configs/arbel.h +++ b/include/configs/arbel.h @@ -12,7 +12,7 @@ #define CFG_SYS_INIT_RAM_SIZE 0x8000 /* Default environemnt variables */ -#define CONFIG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ +#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index e80166b3c467..b09e06ad4d85 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -96,7 +96,7 @@ "done\0" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "disable_giga=yes\0" \ "usb_pgood_delay=2000\0" \ "nor_bootdelay=-2\0" \ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 62aa99342a0e..8f4419f402f7 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -96,7 +96,7 @@ * u-boot: 'set' command */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loaderversion=11\0" \ "card_id="__stringify(ASTRO_ID)"\0" \ "alterafile=0\0" \ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index afdb74785f8a..4101440ff5d5 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -36,7 +36,7 @@ /* Address and size of Primary Environment Sector */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "monitor_base=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=" \ "protect off ${monitor_base} +${filesize};" \ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 0f9e2cfb582d..c59d4bb38ca8 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -28,7 +28,7 @@ #define CFG_SYS_NAND_READY_PIN GPIO_PIN_PD(5) #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\ "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0" diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 03e04e6e6805..b743066ea7c3 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -85,7 +85,7 @@ func(RAM, ram, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x00080000\0" \ "pxefile_addr_r=0x01f00000\0" \ "scriptaddr=0x01f00000\0" \ diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 04dc50b1cb22..a82dfc902948 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -39,7 +39,7 @@ /* * Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \ "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 6f6552e6dc34..e7946389eff3 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -49,7 +49,7 @@ #define NANDARGS "" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "boot_fdt=try\0" \ "bootpart=0:2\0" \ diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index b5469880fe2f..70dd2802686f 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -795,7 +795,7 @@ QSPI_FLASH \ FLASH_IMAGES -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ARCH_ENV_SETTINGS #endif /* __BCM_NS3_H */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 57360b60ca9c..d1de3561af63 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -131,7 +131,7 @@ extern phys_addr_t prior_stage_fdt_address; /* * Enable in-place RFS with this initrd_high setting. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtsaveaddr=" __stringify(CONFIG_SYS_FDT_SAVE_ADDRESS) "\0" \ "initrd_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h index 2713b158438e..65c01835cc6e 100644 --- a/include/configs/beacon-rzg2m.h +++ b/include/configs/beacon-rzg2m.h @@ -8,9 +8,9 @@ #include "rcar-gen3-common.h" -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "usb_pgood_delay=2000\0" \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h index 556bfa08ebba..3662668c6a6b 100644 --- a/include/configs/bitmain_antminer_s9.h +++ b/include/configs/bitmain_antminer_s9.h @@ -9,7 +9,7 @@ #define CFG_SYS_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_SIZE 0x40000000 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "pxefile_addr_r=0x2000000\0" \ "scriptaddr=0x3000000\0" \ "kernel_addr_r=0x2000000\0" \ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 0842a4a8f543..5df8d03c7065 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -57,7 +57,7 @@ /* boot command, including the target-defined one if any */ /* Extra env settings (including the target-defined ones if any) */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BK4_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 2c5236aa58bb..236d720a55a8 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -67,7 +67,7 @@ MMC_TGTS \ #define LOAD_OFFSET(x) 0x8##x -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "verify=no\0" \ "scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \ diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index d35c7c4a591e..7e4e8ee262bf 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -26,7 +26,7 @@ /* Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "cfgaddr=0x106F0000\0" \ "scraddr=0x10700000\0" \ diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index f9908352b0dc..ffb4cd3027a1 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -24,7 +24,7 @@ #define V_SCLK (V_OSCK) /* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "cfgscr=mw ${dtbaddr} 0;" \ diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 410b3e641c5c..9ca6d6f863d1 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -20,7 +20,7 @@ #define V_SCLK (V_OSCK) /* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootaddr=0x80001100\0" \ diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 474ad69d996c..a8273a7fcd8d 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -67,7 +67,7 @@ "emmc_dev=0\0" /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ AHAB_ENV \ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 6f3396bad4c8..263981860e86 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -55,7 +55,7 @@ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 1e5154af0a15..850eb892db79 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -25,7 +25,7 @@ "nand read ${loadaddr} NAND.kernel; " \ "bootz ${loadaddr} - ${fdt_addr}\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "fdt_addr=0x87800000\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 5c9004cbd93a..2d56d37f06f8 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -24,9 +24,9 @@ #define CFG_SYS_I2C_PCA953X_ADDR 0x20 #define CFG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0" \ "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0" \ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 9c9e9506dc64..062d3d870269 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -110,7 +110,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "console=ttyS0,115200\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 9df8baa8a969..c66cf721870c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -30,7 +30,7 @@ /* Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index fcc17fc6b7ce..06de4dbeb6d5 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -43,7 +43,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x81200000\0" \ "bootm_size=0x8000000\0" \ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index c0c3b4e0359a..a748d4f3169f 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -83,7 +83,7 @@ #endif #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ UBI_BOOTCMD \ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 6002d8d5c9f0..e4bb71d47d62 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -60,7 +60,7 @@ "${fdt_addr};\0" \ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ BOOTENV \ CONFIG_MFG_ENV_SETTINGS \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 60a3862a4d12..0486db6b51ed 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -64,7 +64,7 @@ "ramdisk_addr_r=0x18400000\0" \ "scriptaddr=0x18280000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 32a79b025545..99ed8183ef21 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -123,7 +123,7 @@ #endif #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ MODULE_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index fa778ec9e2b7..122b599a6f21 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -55,7 +55,7 @@ #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ UBI_BOOTCMD \ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 823d37fc38ca..31cfd2b12923 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -19,8 +19,8 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "kernel-ver=4.4.0-22\0" \ "boot=zboot 03000000 0 04000000 ${filesize}\0" \ "upd_uboot=tftp 100000 conga/u-boot.rom;" \ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 5da2778b67be..8b31e14df31a 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -24,7 +24,7 @@ #define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth1\0" \ "consoledev=ttyS1\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h index 25bcc2a6841c..6535730731a6 100644 --- a/include/configs/crs3xx-98dx3236.h +++ b/include/configs/crs3xx-98dx3236.h @@ -13,7 +13,7 @@ /* Environment in SPI NOR flash */ /* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index a818a4b39f83..cfc8330e35ae 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -145,7 +145,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ "bootpart=0:2\0" \ diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 4b31bbf4e11a..323703ac5c90 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -68,7 +68,7 @@ "mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \ /* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "console=ttymxc0,115200n8\0" \ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index b9d03d253d99..c4ae397e3e68 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -17,7 +17,7 @@ /* NAND */ /* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index bba2b607aa86..6dbf582d733b 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -18,7 +18,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h index 84ea1baa9979..0ee914e91d08 100644 --- a/include/configs/db-xc3-24g4xg.h +++ b/include/configs/db-xc3-24g4xg.h @@ -11,7 +11,7 @@ /* NAND */ /* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 66aa6d5c3c45..ab10101f20a9 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -67,7 +67,7 @@ * Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ethaddr=00:01:90:00:C0:81\0" \ "dtbaddr=0x81000000\0" \ "nfsroot=/opt/projects/images/vladimir/oe/devkit3250/rootfs\0" \ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index c8b176542d95..7993aa8af176 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -33,7 +33,7 @@ DEFAULT_LINUX_BOOT_ENV /* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "console=ttyO2,115200n8\0" \ "mmcdev=0\0" \ diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 52f2d50118a4..1510f8df4378 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -23,8 +23,8 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "kernel-ver=4.4.0-24\0" \ "boot=zboot 03000000 0 04000000 ${filesize}\0" \ "upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;" \ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index f9b3d19480ed..56bb856a6dc2 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -45,7 +45,7 @@ #endif #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/display5.h b/include/configs/display5.h index 7636d2869a9f..f95c1602e676 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -167,7 +167,7 @@ "sf write ${loadaddr} 0x0 ${filesize};" \ "fi\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ PARTS_DEFAULT \ "gpio_recovery=93\0" \ "check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 015bc78648f3..2a70db5e9382 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -35,7 +35,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 33ae7d654b0b..07cec38b50d0 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -22,7 +22,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/uImage\0" \ "initrd=/boot/uInitrd\0" \ diff --git a/include/configs/draco.h b/include/configs/draco.h index ab3cf10d7793..b56ba9132af2 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -28,7 +28,7 @@ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ /* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=draco\0" \ "ubi_off=2048\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index daf7ecd7975b..73aec348458a 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -28,6 +28,6 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV #endif diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 31cd8536de4b..499708371113 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -26,7 +26,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x95000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ diff --git a/include/configs/dragonboard845c.h b/include/configs/dragonboard845c.h index bd88c42a3ba5..c1e590fae2a5 100644 --- a/include/configs/dragonboard845c.h +++ b/include/configs/dragonboard845c.h @@ -13,7 +13,7 @@ #define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 } -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x5000000\0" \ "bootm_low=0x80000000\0" \ "bootcmd=bootm $prevbl_initrd_start_addr\0" diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index fbd83d629c02..733020d3e261 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -17,7 +17,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "x_bootcmd_ethernet=ping 192.168.2.1\0" \ "x_bootcmd_usb=usb start\0" \ "x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 8553ea0b95f2..ede21a4e2c57 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -26,7 +26,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "x_bootcmd_ethernet=ping 192.168.1.2\0" \ "x_bootcmd_usb=usb start\0" \ "x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 76d1713fdc68..e69883ba73bc 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -43,7 +43,7 @@ /* Default Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "initrd_high=0xffffffff\0" \ "ramdisk_addr_r=0x8000000\0" \ "usb0Mode=host\0usb1Mode=host\0usb2Mode=device\0" \ diff --git a/include/configs/durian.h b/include/configs/durian.h index 001596c00a45..9f11e18d34ad 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -15,7 +15,7 @@ /* BOOT */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "load_kernel=ext4load scsi 0:1 0x90100000 uImage-2004\0" \ "load_fdt=ext4load scsi 0:1 0x95000000 ft2004-pci-64.dtb\0"\ "boot_fdt=bootm 0x90100000 -:- 0x95000000\0" \ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 89e071c0df66..a5e2dc063a74 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -23,7 +23,7 @@ #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "board=EL6Q\0" \ "cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \ "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 22e0fa5aabfd..4a929937b416 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -76,7 +76,7 @@ CONSOLE_STDIN_SETTINGS \ CONSOLE_STDOUT_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdtfile=" CONFIG_FDTFILE "\0" \ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index c2b921e7cb8b..83aaa09cdbb0 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -15,7 +15,7 @@ * Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade_image=u-boot.bin\0" \ "upgrade=emsdp rom unlock && " \ "fatload mmc 0 ${loadaddr} ${upgrade_image} && " \ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 9011940abe4b..32b45b1e5b8d 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -138,7 +138,7 @@ #define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80 /* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=etamin\0" \ "ubi_off=4096\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index bec1660cf485..f304929263e9 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -14,7 +14,7 @@ #define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* Misc */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "" #endif /* __CONFIG_H */ diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index c9c988b93740..e1cce58fa933 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -14,7 +14,7 @@ #define STR_HELPER(s) #s #define STR(s) STR_HELPER(s) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=" STR(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootspi=fdt addr 20100000 && fdt header get fitsize totalsize && " \ "cp.b 20100000 ${loadaddr} ${fitsize} && bootm; " \ diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h index 13e3cb2ffeb1..e7d866551a5f 100644 --- a/include/configs/evb_rv1108.h +++ b/include/configs/evb_rv1108.h @@ -11,8 +11,8 @@ /* * Default environment settings */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "ipaddr=172.16.12.50\0" \ "serverip=172.16.12.69\0" \ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 0490c2dad53e..860fd1601a66 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -94,7 +94,7 @@ #define EXYNOS_FDTFILE_SETTING #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS \ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index cff910c1bd5b..c8408eb39200 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -67,7 +67,7 @@ #define EXYNOS_FDTFILE_SETTING #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS \ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h index 8672b9e95270..92c84cd8ce05 100644 --- a/include/configs/exynos78x0-common.h +++ b/include/configs/exynos78x0-common.h @@ -74,7 +74,7 @@ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS #endif /* __CONFIG_EXYNOS78x0_COMMON_H */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 36dcee87c5fb..7ab504f35531 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -59,7 +59,7 @@ #define CONFIG_HOSTNAME "gazerbeam" #define CONFIG_ROOTPATH "/opt/nfsroot" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 1458b187de28..9dc1d7394afd 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -36,7 +36,7 @@ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE /* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=/boot/fitImage\0" \ "fdt_addr_r=0x18000000\0" \ "splash_addr_r=0x20000000\0" \ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index f62b8f175e1f..32960fb93256 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -41,7 +41,7 @@ #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ NETWORKBOOT \ "image=/boot/fitImage\0" \ "dev=mmc\0" \ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 66eed9e14f81..bc517286b113 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -31,7 +31,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/uImage\0" \ "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" diff --git a/include/configs/gose.h b/include/configs/gose.h index d1fe375a2c1f..45f0ec6f6a0e 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -29,7 +29,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" #endif /* __GOSE_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 4954c5ca0800..c4f53e6e4004 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -23,7 +23,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ "kernel=/boot/zImage\0" \ diff --git a/include/configs/helios4.h b/include/configs/helios4.h index fc32487e1c7b..7d81d1cf1e4c 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -110,7 +110,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 4aef0b4abd12..76e6054b0cc1 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -16,7 +16,7 @@ #define CFG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x20000000\0" \ "initrd_high=0x20000000\0" diff --git a/include/configs/hikey.h b/include/configs/hikey.h index d4280decc9f0..36bf22b1870e 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -42,7 +42,7 @@ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_name=Image\0" \ "kernel_addr_r=0x00080000\0" \ "fdtfile=hi6220-hikey.dtb\0" \ diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index fad1f980481e..40d5e653c3f1 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -28,7 +28,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "fdtfile=hi3660-hikey960.dtb\0" \ "fdt_addr_r=0x10000000\0" \ diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index 59ea8960071a..f59da4177316 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -37,7 +37,7 @@ /* * Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index fbfcded47123..2177fafcdc06 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -36,7 +36,7 @@ /* * Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 05192218d225..242f92e6fd72 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -18,7 +18,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/zImage\0" \ "fdt=/boot/ib62x0.dtb\0" \ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index f2e3608d3a3f..f719ecb5fe0b 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -11,7 +11,7 @@ #include "mv-common.h" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/uImage\0" \ "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 36b6b95b84de..4208ba95915e 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -24,7 +24,7 @@ #endif /* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 4e23f1a2dc5d..0df61916b7d2 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -21,7 +21,7 @@ /* Ethernet Configs */ #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "bootm_size=0x10000000\0" \ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 402f83c18eae..b6006c021d5c 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -20,7 +20,7 @@ /* Environment in MMC */ #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x14000000\0" \ "fdt_addr_r=0x13000000\0" \ "kernel_addr_r=0x10008000\0" \ diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 392f97050a65..e28185f24dd3 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -72,7 +72,7 @@ #endif /* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootconf=conf-imx6q-bosch-acc.dtb\0"\ "mmcfit_name=fitImage\0" \ "mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \ diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h index 2d9d3c34b0db..c95038eaa537 100644 --- a/include/configs/imx6ulz_smm_m2.h +++ b/include/configs/imx6ulz_smm_m2.h @@ -54,7 +54,7 @@ #devtypel #instance " " /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ NANDARGS \ BOOTENV diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 76771fd66ce9..438e79df3cc1 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -12,7 +12,7 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS /* * Use: @@ -22,7 +22,7 @@ */ #define MY_CONFIG_BOOT_MODE "boot-mode=sd\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MY_CONFIG_BOOT_MODE \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index c228cf7f37ba..00ce7fb62a93 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -63,7 +63,7 @@ BOOT_TARGET_DHCP(func) /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h index 938c5406b821..a86bd76a3c72 100644 --- a/include/configs/imx8mm-mx8menlo.h +++ b/include/configs/imx8mm-mx8menlo.h @@ -9,8 +9,8 @@ #include /* Custom initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "devtype=mmc\0" \ diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 03325e6c3a7a..ee524f0e63f2 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -20,7 +20,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 80321cf2d8d3..44d74bb1a788 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -34,7 +34,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "altbootcmd=setenv devpart 2 && run bootcmd ; reset\0" \ "bootlimit=3\0" \ "devtype=mmc\0" \ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 8a694c88a53a..d28f3f1972b9 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -37,7 +37,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 41ab9307793f..e718daa07c3e 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -30,7 +30,7 @@ "ramdisk_addr_r=0x46400000\0" \ "scriptaddr=0x46000000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 28ce834769c3..c490e3829f9a 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -25,7 +25,7 @@ func(USB, usb, 1) \ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "splblk=0x42\0" \ BOOTENV diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 85fd5e2371f9..bb3dfe3fa0d2 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -13,7 +13,7 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "ramdiskimage=rootfs.cpio.uboot\0" \ diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h index a768ff355109..e97b8e871d22 100644 --- a/include/configs/imx8mn_bsh_smm_s2.h +++ b/include/configs/imx8mn_bsh_smm_s2.h @@ -35,7 +35,7 @@ #devtypel #instance " " /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ NANDARGS \ BOOTENV diff --git a/include/configs/imx8mn_bsh_smm_s2pro.h b/include/configs/imx8mn_bsh_smm_s2pro.h index 035e5c7bd90f..8619fdde7fdb 100644 --- a/include/configs/imx8mn_bsh_smm_s2pro.h +++ b/include/configs/imx8mn_bsh_smm_s2pro.h @@ -22,7 +22,7 @@ "emmc_ack=1\0" \ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ EMMCARGS \ BOOTENV diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 024b86c7f1d0..b759b834b808 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -32,7 +32,7 @@ "scriptaddr=0x40000000\0" \ "pxefile_addr_r=0x40100000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h index 4633843d1bbb..205337948cfc 100644 --- a/include/configs/imx8mn_var_som.h +++ b/include/configs/imx8mn_var_som.h @@ -37,7 +37,7 @@ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index a585cbf87e44..80c2df9f30ff 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -19,7 +19,7 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "splblk=0x40\0" \ BOOTENV diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h index 5443022b04c7..b8fdedefa21f 100644 --- a/include/configs/imx8mp_dhcom_pdk2.h +++ b/include/configs/imx8mp_dhcom_pdk2.h @@ -28,7 +28,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "altbootcmd=run bootcmd ; reset\0" \ "bootlimit=3\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 738677ff37cd..63ea25d9788b 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -34,7 +34,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h index d67bad8971dd..8fac898403f1 100644 --- a/include/configs/imx8mp_icore_mx8mp.h +++ b/include/configs/imx8mp_icore_mx8mp.h @@ -36,7 +36,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 58f7dc6518c1..ed4da0e69b5b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -71,7 +71,7 @@ BOOT_TARGET_DHCP(func) /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index e79aa5707537..4b32d5a77ef6 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -19,7 +19,7 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "splblk=0x40\0" \ BOOTENV diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 4df98e3f3735..f6f356d27ba2 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -30,7 +30,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=0x43500000\0" \ "kernel_addr_r=0x40880000\0" \ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 688c0bf70080..c40448715f8a 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -35,7 +35,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 3b4cd6562235..8fed3e31964c 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -29,7 +29,7 @@ "initrd_high=0xffffffff\0" \ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index f1f907f3e5a4..7772e71013ef 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -23,7 +23,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 2e2e5ed43cde..5692e3d00007 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -47,7 +47,7 @@ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index d75b8bf0c18f..669da591fa2b 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -23,7 +23,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index d313bdc2a448..30dd5af03b00 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -34,7 +34,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h index 895c50f60253..5cd6492dd503 100644 --- a/include/configs/imx93_evk.h +++ b/include/configs/imx93_evk.h @@ -28,7 +28,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=0x83500000\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index 84228676c7fd..7688464841eb 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -19,7 +19,7 @@ DMAMEM_SZ_ALL) #ifdef CONFIG_VIDEO -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 0f6150fc9c7e..7d087413362c 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -40,7 +40,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ BOOTENV \ EXTRA_ENV_IOT2050_BOARD_SETTINGS diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index e66f994a375f..a7210b5cf3ae 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -170,7 +170,7 @@ #include /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index ab204c62b7d6..54dfea6952e9 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -127,7 +127,7 @@ DFU_ALT_INFO_OSPI /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 840a4d5401f5..227c45f0634a 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -82,7 +82,7 @@ #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ "newenv=" \ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 05cdcbfba193..a67301b9ecd6 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -222,7 +222,7 @@ "can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \ "asrc,spdif,lpuart1,ftm1\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ CONFIG_KM_DEF_ENV \ CONFIG_HW_ENV_SETTINGS \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 17eb9a7c2ea0..639f2075e69f 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -441,7 +441,7 @@ int get_scl(void); #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 736865ad80af..61ff80d2c983 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -29,7 +29,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" /* SPL support */ diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 6fcacdb0c664..81ca83fdbfab 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -46,6 +46,6 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif -#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV #endif /* __KONTRON_MX6UL_CONFIG_H */ diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 80a32304606a..2e21aacd1893 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -50,6 +50,6 @@ #define CONFIG_MALLOC_F_ADDR 0x930000 #endif -#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV #endif /* __KONTRON_MX8MM_CONFIG_H */ diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 17c63d834107..d909bbbbcfda 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -50,7 +50,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "console=ttymxc2,115200\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 9c3174d0e02c..218e9d9b3013 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -65,7 +65,7 @@ func(PXE, pxe, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "env_addr=0x203e0004\0" \ "envload=env import -d -b ${env_addr}\0" \ "install_rcw=source 20200000\0" \ diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index c551585a2062..da8a67b4ab63 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -16,7 +16,7 @@ /* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ "fdt_addr=0x75000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 136e228682a6..99321b320f5f 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -22,7 +22,7 @@ #define CONFIG_MXC_USB_FLAGS 0 #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 828f91096344..db45585ba313 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -51,7 +51,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/lager.h b/include/configs/lager.h index f3feaa539fcc..777d5b94d1cd 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -30,7 +30,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" /* SPL support */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index abe470fe890b..b9ec7f379354 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -49,7 +49,7 @@ */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_SETUP_INITRD_TAG -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootenvfile=uEnv.txt\0" \ "fdtfile=da850-lego-ev3.dtb\0" \ "memsize=64M\0" \ diff --git a/include/configs/librem5.h b/include/configs/librem5.h index 11b3fa6c857d..1818a57e49c5 100644 --- a/include/configs/librem5.h +++ b/include/configs/librem5.h @@ -64,7 +64,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x80000000\0" \ "pxefile_addr_r=0x80100000\0" \ "kernel_addr_r=0x80800000\0" \ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 721da818633a..938ab5ade9a7 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index f0a9e9ab3155..d1e0ed5817e9 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -11,8 +11,8 @@ /* DDR */ #define CFG_SYS_SDRAM_SIZE 0x40000000 -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 9e4f949016ef..a5f680db2d37 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -34,7 +34,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index c19ed2f43ecf..4243a21f1f18 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -16,8 +16,8 @@ #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "fdt_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index 1b417c72e704..872296749c0a 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -25,8 +25,8 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 495bb3911b3a..35e8ff057986 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -55,8 +55,8 @@ #define I2C_VOL_MONITOR_BUS_V_OVF 0x1 #define I2C_VOL_MONITOR_BUS_V_SHIFT 3 -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "kernel_addr=0x01000000\0" \ "kernelheader_addr=0x600000\0" \ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index d74936d1281d..1e843f896c7e 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -36,8 +36,8 @@ #define __PHY_ETH2_MASK 0xFB #define __PHY_ETH1_MASK 0xFD -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 024a71852753..0a08619384b6 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -94,7 +94,7 @@ #define HWCONFIG_BUFFER_SIZE 256 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5a91cc3efec0..3bfb014adf11 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -279,12 +279,12 @@ #define HWCONFIG_BUFFER_SIZE 256 #ifdef CONFIG_LPUART -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 5612c60ae904..d4855819bd7f 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -75,7 +75,7 @@ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr=0x61000000\0" \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 3c4c207edd06..8a36620bf3ab 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -166,7 +166,7 @@ #include #ifdef CONFIG_LPUART -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 " \ "cma=64M@0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \ @@ -222,7 +222,7 @@ "cp.b $kernel_addr $load_addr " \ "$kernel_size && bootm $load_addr#$board\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200 " \ "cma=64M@0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 228fb122f5f3..769ece901c19 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -61,8 +61,8 @@ /* SATA */ #ifndef SPL_NO_ENV -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "board=ls1028aqds\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 5c134612576c..8c53636beac3 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -56,8 +56,8 @@ /* Initial environment variables */ #ifndef SPL_NO_ENV -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "board=ls1028ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index a3fa92d1ff47..e259cf810c0a 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -120,7 +120,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 4ed5481c3e74..e566ad4eed33 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -98,7 +98,7 @@ #endif #ifndef SPL_NO_MISC /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 57429d4bbe32..e229ba2eea64 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -118,7 +118,7 @@ unsigned long long get_qixis_addr(void); #ifndef SPL_NO_ENV /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index a35045d640ff..a34a71f649f6 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -297,8 +297,8 @@ /* Initial environment variables */ #ifdef CONFIG_NXP_ESBC -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -329,8 +329,8 @@ #define IFC_MC_INIT_CMD \ "fsl_mc start mc 0x580A00000 0x580E00000\0" -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -391,8 +391,8 @@ "$kernel_size && bootm $kernel_load#$BOARD\0" #else #if defined(CONFIG_QSPI_BOOT) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -409,8 +409,8 @@ "fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0" #elif defined(CONFIG_SD_BOOT) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -427,8 +427,8 @@ "fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0" #else /* NOR BOOT */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 7bc4fc6a6652..bd543a37e879 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -238,9 +238,9 @@ #endif #endif /* CONFIG_TFABOOT */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ @@ -308,7 +308,7 @@ " && esbc_validate ${kernelheader_addr_r};" \ "bootm $load_addr#$BOARD\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index e82456fd8148..631392cb8dd2 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -110,7 +110,7 @@ unsigned long long get_qixis_addr(void); #define HWCONFIG_BUFFER_SIZE 128 /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 924d4057d936..12b5af1b4f2f 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -230,9 +230,9 @@ #define CFG_SYS_I2C_RTC_ADDR 0x68 /* Initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #ifdef CONFIG_NXP_ESBC -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ @@ -257,7 +257,7 @@ #define IFC_MC_INIT_CMD \ "fsl_mc start mc 0x580a00000" \ " 0x580e00000 \0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "loadaddr_sd=0x90100000\0" \ @@ -313,7 +313,7 @@ "$kernel_addr_sd $kernel_size_sd && " \ "bootm $load_addr#$BOARD\0" #elif defined(CONFIG_SD_BOOT) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x800\0" \ @@ -329,7 +329,7 @@ "fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index c50b6030680c..1259df8f3a9a 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -279,9 +279,9 @@ #endif /* Initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ @@ -343,7 +343,7 @@ "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ "bootm $load_addr#$board\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index c82eb8b04bf8..47d7ec57b80a 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -22,7 +22,7 @@ /* * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootsource=legacy\0" \ "hdpart=0:1\0" \ "kernel_addr_r=0x00800000\0" \ diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 9f891064bd5d..3a316e73308f 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -14,7 +14,7 @@ /* MAC/PHY configuration */ /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "boot_scripts=lx2160aqds_boot.scr\0" \ "boot_script_hdr=hdr_lx2160aqds_bs.out\0" \ diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index 58c0ff36571e..8cc4e0db03f0 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -18,7 +18,7 @@ #define I2C_EMC2305_PWM 0x80 /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "boot_scripts=lx2160ardb_boot.scr\0" \ "boot_script_hdr=hdr_lx2160ardb_bs.out\0" \ diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h index 157688ef7d7a..54d7cea4c599 100644 --- a/include/configs/lx2162aqds.h +++ b/include/configs/lx2162aqds.h @@ -14,7 +14,7 @@ #define CFG_SYS_RTC_BUS_NUM 0 /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "boot_scripts=lx2162aqds_boot.scr\0" \ "boot_script_hdr=hdr_lx2162aqds_bs.out\0" \ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 66591390d903..9c37212463e1 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -86,7 +86,7 @@ */ #define CONFIG_HOSTNAME "m53menlo" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttymxc0\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 7c401a2cfd6c..7ea682049261 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -34,7 +34,7 @@ /* Ethernet Configuration */ #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/meson64.h b/include/configs/meson64.h index f06fe73485fb..e2800df87869 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -76,8 +76,8 @@ #include -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=" STDIN_CFG "\0" \ "stdout=" STDOUT_CFG "\0" \ "stderr=" STDOUT_CFG "\0" \ diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h index 1266851196d2..c0e977abb01f 100644 --- a/include/configs/meson64_android.h +++ b/include/configs/meson64_android.h @@ -279,7 +279,7 @@ "fi;" \ "fi;" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ANDROID_ENV_SETTINGS \ "partitions=" PARTS_DEFAULT "\0" \ "mmcdev=2\0" \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index edd2466caa98..ede4ffd53f4e 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -78,8 +78,8 @@ #include -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "unlock=yes\0"\ "nor0=flash-0\0"\ "mtdparts=mtdparts=flash-0:"\ diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h index 3def93d61e8a..0350f7a62da7 100644 --- a/include/configs/microchip_mpfs_icicle.h +++ b/include/configs/microchip_mpfs_icicle.h @@ -21,7 +21,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "kernel_addr_r=0x84000000\0" \ "fdt_addr_r=0x88000000\0" \ diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index cfe926c0a141..ef2111cd20ab 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -30,7 +30,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 39a7ba76633b..031c1aea0c00 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -44,7 +44,7 @@ #include /* Extra environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h index 3da7619d78d7..1f973829bba4 100644 --- a/include/configs/mt8183.h +++ b/include/configs/mt8183.h @@ -21,7 +21,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x40000000\0" \ BOOTENV diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 3a35527da10d..c0fc8688ca67 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -26,7 +26,7 @@ #define ENV_BOOT_CMD \ "mtk_boot=run boot_rd_img;bootm;\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6c000000\0" \ ENV_DEVICE_SETTINGS \ ENV_BOOT_READ_IMAGE \ diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index 0f7981a56611..73776e3705b7 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -21,7 +21,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x40000000\0" \ BOOTENV diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 8a8bc85ca70e..d6bd1a103866 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -33,7 +33,7 @@ "serial#=1234567890ABCDEF\0" \ "board=mt8518\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6c000000\0" \ ENV_DEVICE_SETTINGS \ ENV_BOOT_READ_IMAGE \ diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 5c9620371e3c..c8c0fc671ab0 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -27,7 +27,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "kernel_addr_r=0x202000000\0" \ "fdt_addr_r=0x201000000\0" \ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 9bfc48c52d90..76e148f55ebf 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -89,7 +89,7 @@ "" /* fdt_addr and kernel_addr are needed for existing distribution boot scripts */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x6d00000\0" \ "pxefile_addr_r=0x6e00000\0" \ "fdt_addr=0x6f00000\0" \ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index beac3ae6496d..239a09763ae1 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -41,7 +41,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x6d00000\0" \ "pxefile_addr_r=0x6e00000\0" \ "fdt_addr_r=0x6f00000\0" \ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index aa3d7a1a3fc8..e769ba2e8377 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -19,7 +19,7 @@ /* Ethernet */ /* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "update_sd_firmware_filename=u-boot.sd\0" \ "update_sd_firmware=" /* Update the SD firmware partition */ \ "if mmc rescan ; then " \ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index f597cdb30563..5ceba8b15fa4 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -16,7 +16,7 @@ #define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Extra Environments */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "update_sd_firmware_filename=u-boot.sd\0" \ "update_sd_firmware=" /* Update the SD firmware partition */ \ "if mmc rescan ; then " \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index c740d8533274..f9f65f6968e1 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -18,7 +18,7 @@ /* UBI and NAND partitioning */ /* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ubifs_file=filesystem.ubifs\0" \ "update_nand_full_filename=u-boot.nand\0" \ "update_nand_firmware_filename=u-boot.sb\0" \ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index ddd37b3936ff..8ab1ee79a79c 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -39,7 +39,7 @@ /* Framebuffer and LCD */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdt_file=imx51-babbage.dtb\0" \ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index cd806cb698e9..baffe65c3697 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -37,7 +37,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x75000000\0" \ "pxefile_addr_r=0x73000000\0" \ "scriptaddr=0x74000000\0" \ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index d0107fcc8cb1..0ac93d6e0432 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -27,7 +27,7 @@ /* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdt_addr=0x71000000\0" \ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 9464d6e44aea..94d2191af91d 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -35,7 +35,7 @@ "nfs=run choose_ip setargs bootargs_nfs; ${getcmd} ${loadaddr} " \ "${nfsserver}:${image}; bootm ${loadaddr}\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ PPD_CONFIG_NFS \ "image=/boot/fitImage\0" \ "dev=mmc\0" \ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index f7f209c20b59..d4af96b51ea4 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -21,7 +21,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "som_rev=undefined\0" \ "has_emmc=undefined\0" \ "fdtfile=undefined\0" \ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 6294fd1e2c42..e1cdedf27680 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -35,7 +35,7 @@ #define EMMC_ENV "" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdtfile=undefined\0" \ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 358d9f47c0f3..4fbd06783a6d 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -15,7 +15,7 @@ /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 8731f6a3e4ad..cf4871cbae39 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -12,7 +12,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "epdc_waveform=epdc_splash.bin\0" \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 0dd40563c29b..9d8737c19425 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -12,7 +12,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 6f5dffe4fbb8..8372f979dc86 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -34,7 +34,7 @@ #define UPDATE_M4_ENV "" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index cb1019bd56a7..90c788468710 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -30,7 +30,7 @@ #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 0e986093f35a..4a27fd22902b 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -24,7 +24,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 377e4d9c4b27..183e67857ca1 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -50,7 +50,7 @@ "bootimg part 0 1;"\ "rootfs part 0 2\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ CONFIG_MFG_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 85922fa436cb..5ee5129801d2 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -28,7 +28,7 @@ #define PHYS_SDRAM 0x60000000 #define CFG_SYS_SDRAM_BASE PHYS_SDRAM -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttyLP0\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 99e01896c71b..5f4cd9306231 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -28,7 +28,7 @@ #define PHYS_SDRAM_SIZE SZ_1G #define CFG_SYS_SDRAM_BASE PHYS_SDRAM -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttyLP0\0" \ diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index a32fcd57f8fc..43261824d3cf 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -33,7 +33,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "fdt_addr_r=0x82000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 1b7eb3433483..9676ccc982f5 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -35,7 +35,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=console=ttyS0,115200\0" \ "autostart=no\0" diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 5020b3bb71db..e1689679e5f6 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -66,7 +66,7 @@ #include #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 04bff3ca4f67..96c23b5b5af7 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -58,7 +58,7 @@ #define CFG_SYS_ONENAND_BASE ONENAND_MAP /* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \ "stdin=usbtty,serial,keyboard\0" \ "stdout=usbtty,serial,vidconsole\0" \ diff --git a/include/configs/novena.h b/include/configs/novena.h index 4e46dfc526ce..19b40070be92 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -64,7 +64,7 @@ #endif /* Extra U-Boot environment. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "consdev=ttymxc1\0" \ diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 09c4ddb6646b..07580f409492 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -40,7 +40,7 @@ #define CONFIG_FEC_ENET_DEV 1 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "image=zImage\0" \ "fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 62f07011809c..76c4aed6fd91 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -36,7 +36,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/zImage\0" \ "fdt=/boot/nsa310s.dtb\0" \ diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h index ea1edab9fc12..0e1083a2130c 100644 --- a/include/configs/o4-imx6ull-nano.h +++ b/include/configs/o4-imx6ull-nano.h @@ -15,7 +15,7 @@ # define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* CONFIG_CMD_USB */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "mmcdev=0\0" \ "mmcpart=2\0" \ "mmcargs=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcpart} console=ttymxc0,${baudrate} panic=30\0" \ diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 03d1a8e7b5fc..c4db38562d83 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -15,7 +15,7 @@ /** Stack starting address */ /** Extra environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=20080000\0" \ "ethrotate=yes\0" diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 58275ccffa01..0be26ef3287f 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -17,7 +17,7 @@ #include /* Extra environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x20080000\0" \ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x03000000\0" \ @@ -27,7 +27,7 @@ #else /** Extra environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=20080000\0" \ "autoload=0\0" diff --git a/include/configs/odroid.h b/include/configs/odroid.h index e2331e45cdfe..3ac13a65d63f 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -71,7 +71,7 @@ * 1. BOOT: 100MiB 2MiB * 2. ROOT: - */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \ "boot.scr\0" \ "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} " \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 7a81585494a9..a1542f3f8025 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -68,8 +68,8 @@ */ /* Define new extra env settings, including DFU settings */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS \ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index f4e23bbb0f30..efeb7bf10078 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -73,7 +73,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 8bb8521f1c1c..adb25a62970c 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -69,7 +69,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index a6b5e55b5415..93d36353ffb0 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -59,7 +59,7 @@ "if test ${fdtfile} = ''; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_FINDFDT \ ENV_DEVICE_SETTINGS \ MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 389553775100..957f1c369e6d 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -30,7 +30,7 @@ /* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "mmcdev=0\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 788a1113868b..02b88da28efa 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -138,7 +138,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ "bootpart=0:2\0" \ diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h index 5b097e9fef29..5adfc6719585 100644 --- a/include/configs/openpiton-riscv64.h +++ b/include/configs/openpiton-riscv64.h @@ -20,7 +20,7 @@ * Board boot configuration */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x86000000\0" \ "kernel_addr_r=0x80200000\0" \ "image=boot/Image\0" \ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 006f06e6af5c..ec3a0e0676d7 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -27,7 +27,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console=ttyS0,115200 " \ +#define CFG_EXTRA_ENV_SETTINGS "x_bootargs=console=ttyS0,115200 " \ CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ "x_bootcmd_usb=usb start\0" \ diff --git a/include/configs/origen.h b/include/configs/origen.h index 6633d541a31b..d4ba599d72a4 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -23,7 +23,7 @@ /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x40007000\0" \ "rdaddr=0x48000000\0" \ "kerneladdr=0x40007000\0" \ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 9738e9fa9cb7..88182fde972b 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -424,7 +424,7 @@ #include "p1_p2_bootsrc.h" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 2a1660bf188d..146f87e9ce33 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -45,7 +45,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "fdt_addr_r=0x82000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 4421e740d9ea..0890c115700c 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -65,7 +65,7 @@ "mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \ /* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "console=ttymxc0,115200n8\0" \ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 5c2ff5d02ee7..34994016c54c 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -29,7 +29,7 @@ /* boot command, including the target-defined one if any */ /* Extra env settings (including the target-defined ones if any) */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ PCM052_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 3674e4cddaed..2991076c50a1 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -39,7 +39,7 @@ "nandloadfit=ubi part rootfs;ubi readvol ${loadaddr} fit\0" \ "nandboot=run nandloadfit;run nandargs;bootm ${loadaddr}\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x30000000\0" \ "optargs=rw rootwait\0" \ ENV_MMC \ diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 71807837673f..80b14b002a92 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -32,7 +32,7 @@ #define CONSOLE_DEV "ttyO5" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=am335x-pdu001.dtb\0" \ "bootfile=zImage\0" \ diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index f922491637d9..4e6dc79f41b2 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -62,7 +62,7 @@ #include #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_MMC_TI_ARGS \ DEFAULT_LINUX_BOOT_ENV \ "bootfile=zImage\0" \ diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 7f73117ac1c8..9160c78c0464 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -20,7 +20,7 @@ /* For RAW image gives a error info not panic */ #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "console=ttymxc2,115200\0" \ "fdt_addr=0x48000000\0" \ diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 11a833bb1276..16505529afc7 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -19,7 +19,7 @@ #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x48000000\0" \ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 3cc2a693ceee..60c747327588 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -69,7 +69,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ CONFIG_LEGACY_BOOTCMD_ENV \ BOOTENV diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 719b70144051..66258a3ab73b 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -38,7 +38,7 @@ "bootmenu_3=Boot using PICO-Nymph baseboard=" \ "setenv baseboard nymph; saveenv; run base_boot\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTMENU_ENV \ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 5dfd737cf7a4..a4b97451cfdc 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -47,7 +47,7 @@ "bootmenu_2=Boot using PICO-Pi baseboard=" \ "setenv fdtfile imx6ul-pico-pi.dtb\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "splashpos=m,m\0" \ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 581921510426..7fc6211ff732 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -51,7 +51,7 @@ BOOTENV #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index f9301a5524b9..ac25991703f2 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -25,7 +25,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc0,115200\0" \ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index a233fb8ed746..f4a34f261a6e 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -144,7 +144,7 @@ /* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "partition=nand0,0\0" \ "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 9fd897958a4f..4994d7367fe8 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -168,7 +168,7 @@ /* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "partition=nand0,0\0" \ "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 085732214e50..af750e86ee98 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -18,7 +18,7 @@ * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs_console=console=ttyS0,115200\0" \ "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \ "ext2load usb 0:1 0x01100000 /uInitrd\0" diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index b5ce2dd13d08..016da6d04b0b 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -61,7 +61,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 518d7a3639c5..7998ef7347fb 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -17,7 +17,7 @@ #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_IPADDR 192.168.0.2 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ +#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h index 1c11685f49e4..8e74dc488875 100644 --- a/include/configs/pomelo.h +++ b/include/configs/pomelo.h @@ -21,7 +21,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ "scriptaddr=0x90100000\0" \ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index c58105597e47..6e8adf91877c 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -31,7 +31,7 @@ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loader_mmc_blknum=0x0\0" \ "loader_mmc_nblks=0x780\0" \ "env_mmc_blknum=0xf80\0" \ diff --git a/include/configs/porter.h b/include/configs/porter.h index 88fa65e0ffc1..969e175883bb 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -34,7 +34,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" /* SPL support */ diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 2b25c31b1d8d..df07df6a5a72 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -54,7 +54,7 @@ #define GLOBAL_IO_DRIVE_CONTROL_OFFSET 0x4c /* max command args */ -#define CONFIG_EXTRA_ENV_SETTINGS "silent=y\0" +#define CFG_EXTRA_ENV_SETTINGS "silent=y\0" /* nand driver parameters */ #ifdef CONFIG_TARGET_PRESIDIO_ASIC diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 99376155b491..003686930a4b 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -27,7 +27,7 @@ "ramdisk_addr_r=0x0a200000\0" #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 48f49906b84e..10eaeb49de62 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -28,7 +28,7 @@ /* Use common default */ /* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=pxm2\0" \ "ubi_off=2048\0"\ "nand_img_size=0x500000\0" \ diff --git a/include/configs/qcs404-evb.h b/include/configs/qcs404-evb.h index c41bb341d82e..8ea59aa21ca6 100644 --- a/include/configs/qcs404-evb.h +++ b/include/configs/qcs404-evb.h @@ -13,7 +13,7 @@ #define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 } -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x5000000\0" \ "bootm_low=0x80000000\0" \ "bootcmd=bootm $prevbl_initrd_start_addr\0" diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index a67af73fd56f..45bd94ee5c76 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -76,7 +76,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr=0x40000000\0" \ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index 72f35cc05420..11c795787887 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -36,7 +36,7 @@ #define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \ "qemu " -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 59d56d666242..777df4c11259 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -38,7 +38,7 @@ #define EEPROM_ADDR_CHIP 0x120 /* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=rastaban\0" \ "ubi_off=2048\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index e9cbd2538240..54844fe69662 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -33,7 +33,7 @@ /* ENV setting */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" #endif /* __RCAR_GEN3_COMMON_H */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index a4cae697181d..ea6073f29446 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -25,7 +25,7 @@ /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, * so limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x7fffffff\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index 99c86edeaa40..c4758e148ba7 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -24,7 +24,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6fffffff\0" \ "initrd_high=0x6fffffff\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 302546630ac6..5b0ec3700040 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -27,7 +27,7 @@ "ramdisk_addr_r=0x64000000\0" #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 334fb3affa5e..58f491c2f320 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -31,7 +31,7 @@ /* Linux fails to load the fdt if it's loaded above 256M on a Rock board, * so limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x6fffffff\0" \ "initrd_high=0x6fffffff\0" \ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 58ad62afe165..b95268df87c2 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -27,7 +27,7 @@ /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, * so limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x7fffffff\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 6b55c57dd770..d3b8a5150f6b 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -30,7 +30,7 @@ /* Linux fails to load the fdt if it's loaded above 256M on a Rock 2 board, so * limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x0fffffff\0" \ "initrd_high=0x0fffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 4b510b139910..bc03e113fef0 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -22,7 +22,7 @@ "ramdisk_addr_r=0x04000000\0" #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 132b7d0fe9bc..85d2186f23e0 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -22,7 +22,7 @@ "ramdisk_addr_r=0x06000000\0" #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 92cdc1a51fbd..17636250510b 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -25,7 +25,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 78f624d31ca2..43066933d02f 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -44,7 +44,7 @@ #include #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index d43dc2580e46..750f16d03999 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -21,7 +21,7 @@ "ramdisk_addr_r=0x0a200000\0" #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index e3549275138b..c3f8e7bf85cd 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -157,7 +157,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ ENV_DFU_SETTINGS \ diff --git a/include/configs/rut.h b/include/configs/rut.h index b07d0c50604d..99799f8494e0 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -27,7 +27,7 @@ /* Use common default */ /* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=rut\0" \ "ubi_off=2048\0"\ "nand_img_size=0x500000\0" \ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 84a5ae6965dd..6e17b23b624c 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -26,7 +26,7 @@ "ramdisk_addr_r=0x64000000\0" #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index e071d4da5e86..02c469049adb 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -142,7 +142,7 @@ #define EXTRA_ENV_BOOT_LOGO EXTRA_ENV_DTB_RESERVE #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "rootdev=" __stringify(CONFIG_ROOT_DEV) "\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index b7a91af008c7..f898d2d9ee52 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -61,7 +61,7 @@ #define COMMON_BOOT "${console} ${meminfo} ${mtdparts}" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x100000;" \ "onenand write 0x32008000 0x0 0x100000\0" \ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 80d3fc9258cc..bf2d04a169b3 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -29,7 +29,7 @@ ",100M(swap)"\ ",-(UMS)\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x100000;" \ "onenand write 0x42008000 0x0 0x100000\0" \ diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h index f7cdd5a19568..9a4fe530a20b 100644 --- a/include/configs/sdm845.h +++ b/include/configs/sdm845.h @@ -13,7 +13,7 @@ #define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 } -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x4000000\0" \ "bootm_low=0x80000000\0" \ "stdout=vidconsole\0" \ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 19701ccce22e..a228dac2ee92 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -15,7 +15,7 @@ /* * Environment variables configurations */ -#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ +#define CFG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \ "x_bootcmd_usb=usb start\0" \ diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 5ad2124bddab..59e40710de48 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -39,7 +39,7 @@ "name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \ "name=system,size=-,bootable,type=${type_guid_gpt_system};" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index f4b1a16019ec..3cf300a2e459 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -36,7 +36,7 @@ "name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \ "name=system,size=-,bootable,type=${type_guid_gpt_system};" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x84000000\0" \ "kernel_comp_addr_r=0x88000000\0" \ "kernel_comp_size=0x4000000\0" \ diff --git a/include/configs/silk.h b/include/configs/silk.h index 58613effaf47..025d56671122 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -34,7 +34,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" /* SPL support */ diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 974531ea0d82..760a0a5b9135 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -11,8 +11,8 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 #define CFG_SYS_SDRAM_SIZE SZ_8M -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80060000\0" \ "fdt_addr_r=0x80400000\0" \ "scriptaddr=0x80020000\0" \ diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h index ff0ed180e92e..748a423b0833 100644 --- a/include/configs/slimbootloader.h +++ b/include/configs/slimbootloader.h @@ -14,10 +14,10 @@ "stderr=serial\0" /* - * Override CONFIG_EXTRA_ENV_SETTINGS in x86-common.h + * Override CFG_EXTRA_ENV_SETTINGS in x86-common.h */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index b988b96e58d8..762f61470b15 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -73,7 +73,7 @@ * Predefined environment variables. * Usefull to define some easy to use boot commands. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ \ "basicargs=console=ttyS0,115200\0" \ \ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index ccb7ec38d033..c148757915a2 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -28,7 +28,7 @@ " mem=128M " \ " " CONFIG_MTDPARTS_DEFAULT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x40000;" \ "onenand write 0x32008000 0x0 0x40000\0" \ diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 14f9cf560286..11031744bef8 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -17,7 +17,7 @@ /* MMC Config*/ #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttymxc0\0" \ "fdtfile=imx7d-smegw01.dtb\0" \ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index b7aa49ce435e..df8ed451a43a 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -41,7 +41,7 @@ /* Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ethaddr=00:00:00:00:00:00\0" \ "serial=0\0" \ "stdout=serial_atmel\0" \ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index afca7e18e9be..eaee8dd37396 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -62,7 +62,7 @@ * Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x82000000\0" \ "loadaddr=0x82000000\0" \ "fdt_addr_r=0x88000000\0" \ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 29b4b22b3988..f12163ccc990 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -52,7 +52,7 @@ "develop=" \ "tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CONFIG_KM_DEF_ENV_BOOTTARGETS \ CONFIG_KM_NEW_ENV \ diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h index aa13878177ef..2ce7011529a4 100644 --- a/include/configs/socfpga_chameleonv3.h +++ b/include/configs/socfpga_chameleonv3.h @@ -19,7 +19,7 @@ */ #define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200} -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "autoload=no\0" \ "bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \ "distro_bootcmd=bridge enable; run bootcmd_mmc\0" \ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 807bff43e00a..3603bb9f4a0b 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -148,8 +148,8 @@ #include -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "bootm_size=0xa000000\0" \ "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \ diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index 8f1c2de998ea..565a661258fd 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -13,7 +13,7 @@ /* Environment is in MMC */ /* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index e76438e228d5..ac70d91e2081 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -13,7 +13,7 @@ /* Environment is in MMC */ /* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ diff --git a/include/configs/socfpga_n5x_socdk.h b/include/configs/socfpga_n5x_socdk.h index c295e91e3d3e..fe5286e12cd1 100644 --- a/include/configs/socfpga_n5x_socdk.h +++ b/include/configs/socfpga_n5x_socdk.h @@ -9,8 +9,8 @@ #include -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootfile=" CONFIG_BOOTFILE "\0" \ "fdt_addr=1100000\0" \ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index df3927297bbe..66ecb168a0a0 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -36,7 +36,7 @@ /* * Environment variable */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootfile=" CONFIG_BOOTFILE "\0" \ "fdt_addr=8000000\0" \ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 70d9f3607a67..cd48650dd554 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -28,7 +28,7 @@ * Linux system after 5 seconds */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 95393d3ab25e..fb2b76eb829a 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -139,7 +139,7 @@ #define CFG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consdev=ttyS0\0" \ "uboot_file=/home/tftp/syscon3/u-boot.bin\0" \ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index de0f48b79a15..e13280563513 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 #endif /* CONFIG_FSL_USDHC */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "console=ttymxc0\0" \ "initrd_addr=0x86800000\0" \ diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index a5987c5e17a1..e58ddd752cd3 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -38,7 +38,7 @@ #define BOOTCMD_ENV \ "fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOT_ENV \ CONSOLE_ENV \ FASTBOOT_ENV \ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 9294d57ca84e..b3fce5031687 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -29,7 +29,7 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x40000000\0" \ "fdtfile=stih410-b2260.dtb\0" \ "fdt_addr_r=0x47000000\0" \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index afd7d50428bf..de5019a364a0 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -15,7 +15,7 @@ #define CFG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \ "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \ "bootm 0x08044000 - 0x08042000\0" diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index c8aad47966fe..a4f3e43dc5a1 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -24,7 +24,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x00008000\0" \ "fdtfile=stm32429i-eval.dtb\0" \ "fdt_addr_r=0x00408000\0" \ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 573a6b179561..62a7e9af0c56 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -24,7 +24,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x00008000\0" \ "fdtfile=stm32f469-disco.dtb\0" \ "fdt_addr_r=0x00408000\0" \ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 14e883a35892..34856d300403 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -24,7 +24,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xC0008000\0" \ "fdtfile="CONFIG_DEFAULT_DEVICE_TREE".dtb\0" \ "fdt_addr_r=0xC0408000\0" \ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 67e6a3a19d21..d36cd6fdd44a 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -21,7 +21,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xD0008000\0" \ "fdtfile=stm32h743i-disco.dtb\0" \ "fdt_addr_r=0xD0408000\0" \ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 4786eb001bc1..8f242bf0ff6e 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -21,7 +21,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xD0008000\0" \ "fdtfile=stm32h743i-eval.dtb\0" \ "fdt_addr_r=0xD0408000\0" \ diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index e667fe6f6ac2..d27b6a3d1de2 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -21,7 +21,7 @@ func(MMC, mmc, 0) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xC0008000\0" \ "fdtfile=stm32h750i-art-pi.dtb\0" \ "fdt_addr_r=0xC0408000\0" \ diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h index c259a616133b..7c59c69e0bdc 100644 --- a/include/configs/stm32mp13_common.h +++ b/include/configs/stm32mp13_common.h @@ -81,7 +81,7 @@ "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \ "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ STM32MP_MEM_LAYOUT \ STM32MP_BOOTCMD \ BOOTENV \ diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index c9cfadd9ce0b..ec8c8fba91f1 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -138,7 +138,7 @@ "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \ "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ STM32MP_MEM_LAYOUT \ STM32MP_BOOTCMD \ STM32MP_PARTS_DEFAULT \ diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 910d7ef107b5..919216906249 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -12,7 +12,7 @@ #define PHY_ANEG_TIMEOUT 20000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "dfu_alt_info_ram=u-boot.itb ram " \ __stringify(CONFIG_SPL_LOAD_FIT_ADDRESS) \ " 0x800000\0" diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h index 38b5aa7319cf..d0cd4130cec2 100644 --- a/include/configs/stm32mp15_st_common.h +++ b/include/configs/stm32mp15_st_common.h @@ -18,7 +18,7 @@ 230400, 460800, 921600, \ 1000000, 2000000 } -#ifdef CONFIG_EXTRA_ENV_SETTINGS +#ifdef CFG_EXTRA_ENV_SETTINGS /* * default bootcmd for stm32mp1 STMicroelectronics boards: * for serial/usb: execute the stm32prog command @@ -42,8 +42,8 @@ "run distro_bootcmd;" \ "fi;\0" -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ STM32MP_MEM_LAYOUT \ ST_STM32MP1_BOOTCMD \ STM32MP_PARTS_DEFAULT \ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index faff8d6ed6d1..be0193105b4b 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -15,7 +15,7 @@ #define LDS_BOARD_TEXT \ board/sysam/stmark2/sbf_dram_init.o (.text*) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kern_size=0x700000\0" \ "loadaddr=0x40001000\0" \ "-(rootfs)\0" \ diff --git a/include/configs/stout.h b/include/configs/stout.h index f49e88cb17cb..5058e0a204d7 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -38,7 +38,7 @@ /* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" /* SPL support */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1677aafad03b..f3c8f7002342 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -324,7 +324,7 @@ #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_EXTRA_SETTINGS \ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 699268900109..271080303fb6 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -92,7 +92,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x9fe00000\0" \ "kernel_addr_r=0x90000000\0" \ "ramdisk_addr_r=0xa0000000\0" \ diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h index 7af7b08eb485..e8a207f54167 100644 --- a/include/configs/syzygy_hub.h +++ b/include/configs/syzygy_hub.h @@ -10,7 +10,7 @@ #ifndef __CONFIG_SYZYGY_HUB_H #define __CONFIG_SYZYGY_HUB_H -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ "bitstream_image=download.bit\0" \ "loadbit_addr=0x1000000\0" \ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 30f842558207..855218a8901e 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -72,7 +72,7 @@ /* bootstrap in spi flash , u-boot + env + linux in nandflash */ #if defined(CONFIG_BOARD_AXM) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ "${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \ "addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index fcc967494220..61f252cb638c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -33,7 +33,7 @@ #endif /* CONFIG_CMD_USB_MASS_STORAGE */ #endif /* CONFIG_CMD_USB */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \ "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 69acabf19fdd..31c82822a2af 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -65,7 +65,7 @@ #define INITRD_HIGH "ffffffff" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdt_high=" FDT_HIGH "\0" \ diff --git a/include/configs/ten64.h b/include/configs/ten64.h index 57724719a9d6..e86c16313293 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -34,9 +34,9 @@ func(PXE, pxe, 0) #include -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ten64\0" \ "fdt_addr_r=0x90000000\0" \ "fdt_high=0xa0000000\0" \ diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index af0a095dfc8c..f34063249e48 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -20,9 +20,9 @@ /* Environment settings */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "tftpdir=" DEF_ENV_TFTPDIR "\0" \ "eth_init=" DEF_ENV_ETH_INIT "\0" \ "ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0" \ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 76b496303f3e..9722b0db72aa 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -35,7 +35,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" diff --git a/include/configs/thuban.h b/include/configs/thuban.h index c8b27263e85e..1753fa410d18 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -31,7 +31,7 @@ #define EEPROM_ADDR_CHIP 0x120 /* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=thuban\0" \ "ubi_off=2048\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 7becf1eb7cb4..8ba40546b2c0 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -35,7 +35,7 @@ /* Initial environment variables */ #define UBOOT_IMG_HEAD_SIZE 0x40 /* C80000 - 0x40 */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr=08007ffc0\0" \ "fdt_addr=0x94C00000\0" \ "fdt_high=0x9fffffff\0" diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 03849adb5abe..28dba4aa95b6 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -20,7 +20,7 @@ /* commands to include */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x80F80000\0" \ "rdaddr=0x81000000\0" \ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 7b04292d2188..2d9d2fd66e9a 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -12,7 +12,7 @@ #include #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV /* Clock Defines */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ea45bba409cb..479ab46e4edd 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -106,7 +106,7 @@ "rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; " \ "rproc start ${dev_pmmc}\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ ENV_KS2_BOARD_SETTINGS \ DFUARGS \ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 64ec59d78eb6..49f4263e16ba 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -58,7 +58,7 @@ #include #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 37ab2e446724..e9723ed5b3dd 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -247,7 +247,7 @@ #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 83abaeddf125..3795e6152fa9 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -44,8 +44,8 @@ # define EXTRA_ENV_USB #endif -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_image=uImage\0" \ "kernel_addr=0x2080000\0" \ "ramdisk_image=uramdisk.image.gz\0" \ diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 0f28690612ab..e007be8e4564 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -28,7 +28,7 @@ #define PHYS_SDRAM_2 0x8080000000 #define PHYS_SDRAM_2_SIZE 0x180000000 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ "load_addr=0xa0000000\0" \ "kernel_addr_r=0x80080000\0" \ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 7a1ad9544a30..14d7730f67bf 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -197,7 +197,7 @@ /* set to a resonable value, changeable by user */ #define TQMA6_CMA_SIZE 160M -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "board=tqma6\0" \ "uimage=uImage\0" \ "zimage=zImage\0" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index 3eac66539dfe..2067327918a2 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -54,7 +54,7 @@ "params.bin raw 0x38 0x8;" \ "/Image.itb ext4 0 2\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootk=" \ "run loaduimage;" \ "if run loaddtb; then " \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 125d3e776a3f..21372243bbc8 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -55,7 +55,7 @@ "params.bin raw 0x38 0x8;" \ "/Image.itb ext4 0 2\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootk=" \ "run loaduimage;" \ "if run loaddtb; then " \ diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index fdb420ed874e..3443c80d06ef 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -35,7 +35,7 @@ "lzmadec 0x5000000 0x5800000 && " \ "bootm 0x5800000" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr=0x4c00000\0" \ "scriptaddr=0x4d00000\0" \ "pxefile_addr_r=0x4e00000\0" \ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 52de4cdc7893..47b220ff9ee7 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -80,7 +80,7 @@ "fi; " \ "bootz 0x1000000" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index fac8c1eeb4e2..f0092eff1494 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -15,7 +15,7 @@ /* MMC Configuration */ #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index d4c92233acaa..5d7d734daa2d 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -19,7 +19,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* Linux only */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 8cd81f1cdddc..2fe056cfef4a 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -92,7 +92,7 @@ "run boot_common\0" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r_offset=0x05100000\0" \ "kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \ "ramdisk_addr_r_offset=0x06000000\0" \ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 657dbadd3396..b90e047955b9 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -43,6 +43,6 @@ #endif /* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ #endif diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index a2bc3cd23a5b..f273533be429 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -41,7 +41,7 @@ "pxefile_addr_r=0x70800000\0" \ "ramdisk_addr_r=0x73000000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \ "fdtfile=imx53-usbarmory.dtb\0" \ diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index b03159805c15..2e150276e7a4 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -25,7 +25,7 @@ #error Unknown DDR size - please add! #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x81000000\0" \ "spi_image_off=0x00100000\0" \ "console=ttyS0,115200\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 18ac6b2b0895..7f3fa795afdc 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -34,7 +34,7 @@ #include /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 88839a6e561a..3ce2714e196e 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -46,7 +46,7 @@ #endif /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 30c1f5025b05..87b8c5d57ee7 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -244,7 +244,7 @@ #include /* Default load addresses and names for the different payloads. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \ "ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \ "pxefile_addr_r=" __stringify(VEXPRESS_PXEFILE_ADDR) "\0" \ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index e8b6acf8b8fe..705a941e3603 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -145,7 +145,7 @@ func(DHCP, dhcp, na) #include -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x60100000\0" \ "fdt_addr_r=0x60000000\0" \ "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 14e6b2bac91c..0e0b3a7b594d 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -44,7 +44,7 @@ "rdaddr=0x84080000\0" \ "ramdisk_addr_r=0x84080000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 9f72bdde8167..74ee61f09238 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -48,7 +48,7 @@ /* Update the bootcommand according to our mapping for the VInCo platform */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_start=0x20000\0" \ "kernel_size=0x800000\0" \ "mmcblksize=0x200\0" \ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 6923009d4598..1e765439fabe 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -20,7 +20,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 3cdf4a1ffc67..709bb046d018 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -26,7 +26,7 @@ #define BOOT_SCR_STRING "source ${bootscriptaddr}\0" #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "bootscr_fitimage_name=bootscr\0" \ diff --git a/include/configs/x530.h b/include/configs/x530.h index dee87cb77325..f20a85cfa19a 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -49,7 +49,7 @@ #include /* Keep device tree and initrd in low memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0" diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 3e17b53dde2d..7705d31a313a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -60,7 +60,7 @@ #define SPLASH_SETTINGS #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DISTRO_BOOTENV \ CONFIG_STD_DEVICES_SETTINGS \ SPLASH_SETTINGS \ diff --git a/include/configs/xea.h b/include/configs/xea.h index b432ab2dc8ef..50b96f31e163 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -28,7 +28,7 @@ /* Extra Environment */ #define CONFIG_HOSTNAME "xea" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootmode=update\0" \ "bootpri=mmc_mmc\0" \ "bootsec=sf_swu\0" \ diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h index 612436aeb48f..bc268d25dc3a 100644 --- a/include/configs/xenguest_arm64.h +++ b/include/configs/xenguest_arm64.h @@ -9,12 +9,12 @@ #include #endif -#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS #undef CFG_SYS_SDRAM_BASE -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \ "pvblockboot=run loadimage;" \ "booti 0x90000000 - 0x88000000;\0" diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index ee3130ed3277..836a6506b1ad 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -127,8 +127,8 @@ #include /* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index e1f95de3c34f..23655a475221 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -10,11 +10,11 @@ #ifndef __CONFIG_VERSAL_MINI_H #define __CONFIG_VERSAL_MINI_H -#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS #include /* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #endif /* __CONFIG_VERSAL_MINI_H */ diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h index 7d77189693e2..b8d2685246f3 100644 --- a/include/configs/xilinx_versal_net.h +++ b/include/configs/xilinx_versal_net.h @@ -124,8 +124,8 @@ #include /* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV \ DFU_ALT_INFO diff --git a/include/configs/xilinx_versal_net_mini.h b/include/configs/xilinx_versal_net_mini.h index 1939832a848e..50bacc39ac58 100644 --- a/include/configs/xilinx_versal_net_mini.h +++ b/include/configs/xilinx_versal_net_mini.h @@ -11,11 +11,11 @@ #ifndef __CONFIG_VERSAL_NET_MINI_H #define __CONFIG_VERSAL_NET_MINI_H -#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS #include /* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #endif /* __CONFIG_VERSAL_NET_MINI_H */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index efe241df97eb..f07e7d3f0ac3 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -174,16 +174,16 @@ #include /* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif /* SPL can't handle all huge variables - define just DFU */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) -#undef CONFIG_EXTRA_ENV_SETTINGS -# define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +# define CFG_EXTRA_ENV_SETTINGS \ "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \ "atf-uboot.ub ram 0x10000000 0x1000000;" \ "Image ram 0x80000 0x3f80000;" \ diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 1c0ab25c6440..9af05456640b 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -10,11 +10,11 @@ #ifndef __CONFIG_ZYNQMP_MINI_H #define __CONFIG_ZYNQMP_MINI_H -#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS #include /* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #endif /* __CONFIG_ZYNQMP_MINI_H */ diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index 3a7b7e03d6af..918aa3d7402a 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -6,7 +6,7 @@ #ifndef __CONFIG_ZYNQMP_R5_H #define __CONFIG_ZYNQMP_R5_H -#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS /* Serial drivers */ /* The following table includes the supported baudrates */ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 3e604894ad48..a480bb720b58 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -37,7 +37,7 @@ #define CONFIG_UBOOT_SECTOR_START 0x2 #define CONFIG_UBOOT_SECTOR_COUNT 0x3fe -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc6\0" \ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index b8c142fed37b..7f739d9ada0e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -174,8 +174,8 @@ #endif /* CONFIG_SPL_BUILD */ /* Default environment */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x20000\0" \ "script_size_f=0x40000\0" \ "fdt_addr_r=0x1f00000\0" \ diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index ac6e8c4ff867..a9bb5bb90ad1 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -12,7 +12,7 @@ #include /* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #undef CFG_SYS_INIT_RAM_ADDR #undef CFG_SYS_INIT_RAM_SIZE diff --git a/include/env_default.h b/include/env_default.h index 4e461c815a79..1621815f257a 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -118,8 +118,8 @@ const char default_environment[] = { /* This is created in the Makefile */ CONFIG_EXTRA_ENV_TEXT #endif -#ifdef CONFIG_EXTRA_ENV_SETTINGS - CONFIG_EXTRA_ENV_SETTINGS +#ifdef CFG_EXTRA_ENV_SETTINGS + CFG_EXTRA_ENV_SETTINGS #endif "\0" #else /* CONFIG_USE_DEFAULT_ENV_FILE */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 99b3796584d0..62bb86b56fd6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -21,7 +21,7 @@ CFG_ENV_SROM_BANK CFG_ENV_TOTAL_SIZE CFG_ET1100_BASE CFG_ETHBASE -CONFIG_EXTRA_ENV_SETTINGS +CFG_EXTRA_ENV_SETTINGS CONFIG_FB_ADDR CONFIG_FDTADDR CONFIG_FDTFILE From patchwork Sun Nov 20 13:30: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: 1706729 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=ZCUhucTC; 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 4NFWn25Nrxz23lt for ; Mon, 21 Nov 2022 00:38:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2576E852B7; Sun, 20 Nov 2022 14:34: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=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="ZCUhucTC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A10BD85262; Sun, 20 Nov 2022 14:34: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-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 ED930851BB for ; Sun, 20 Nov 2022 14:34: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-x832.google.com with SMTP id l2so5885002qtq.11 for ; Sun, 20 Nov 2022 05:34:12 -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=BqIGvIFxDHvm6mdZSjHb3RLU3clDMd4/CHspM05sT9M=; b=ZCUhucTCs9GYkDddW/YphO/msMnIpDCBc5cp7ga9b29qQStJ3loYI12CbuzXLaoSlI 2ta6e2xJic8SKKzEXx+QKCS483g++6VKf/Mvb4v35LWYBv/YAIGk4Zunaf90cBYNjlE0 8Z5tE3S5D+o+6pSSp+4hVZzZUxOSU2MzSwI5E= 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=BqIGvIFxDHvm6mdZSjHb3RLU3clDMd4/CHspM05sT9M=; b=5rwlJt321O8u/xnO7lKUI8lQuTkpjiAgmI22RbjQaKaeNVSFhLGWeBfaEOFtqv9B5+ 8qxvrbL9mwEycn7wEbtKpgSRI99CdixLZusBOOiiNZN4fKDMNW5kA+M9/VMf5hoMEp0R E5eME2bHQfo3bV5F5q15WxdRVME4VPNxB3mn4kzM3zQZxK/SSvSDYIgvzAMr23Jz+ghl a02u8wdnoyVwMuFIPQzHPSM8Yi5dw6s2qUjxpdIkcwBIaT2uJ50p0pbqhVNXYWLad/Te XoOb1pAk+XWYzEmCSBW68ZXCYWYvGLZIF1mYAeId4D+/MvBWKyqEpPo4TVqtaI1pFxly A/Fw== X-Gm-Message-State: ANoB5pk/XqgeHiQTf4OVDj71sctKEE5FPh1PzRwB6MCLRZaLVmWrfMza H5txGkHIHQAdX0Af+6N+0Wb38sL+yuyAFQ== X-Google-Smtp-Source: AA0mqf421Ky08h5CeQyBrRHGGNLw01rl6x6OoQUATaylDWbSYfhKzCka2DLw26NQkb6Sp7yrVy54xg== X-Received: by 2002:ac8:6697:0:b0:3a5:24ad:73d with SMTP id d23-20020ac86697000000b003a524ad073dmr14061341qtp.167.1668951251614; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:11 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 022/241] global: Migrate CONFIG_FB_ADDR to CFG Date: Sun, 20 Nov 2022 08:30:13 -0500 Message-Id: <20221120133352.3055600-23-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/video/nexell_display.c | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index 5595796a678b..af2698ffca84 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -560,7 +560,7 @@ static int nx_display_bind(struct udevice *dev) /* Datasheet S5p4418: * Resolution up to 2048 x 1280, up to 12 Bit per color (HDMI) * Actual (max.) size is 0x1000000 because in U-Boot nanopi2-2016.01 - * "#define CONFIG_FB_ADDR 0x77000000" and next address is + * "#define CFG_FB_ADDR 0x77000000" and next address is * "#define BMP_LOAD_ADDR 0x78000000" */ plat->size = 0x1000000; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 62bb86b56fd6..66728d47db38 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -22,7 +22,7 @@ CFG_ENV_TOTAL_SIZE CFG_ET1100_BASE CFG_ETHBASE CFG_EXTRA_ENV_SETTINGS -CONFIG_FB_ADDR +CFG_FB_ADDR CONFIG_FDTADDR CONFIG_FDTFILE CONFIG_FEC_ENET_DEV From patchwork Sun Nov 20 13:30: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: 1706731 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=Xin4gSB9; 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 4NFWnT1jbLz23lt for ; Mon, 21 Nov 2022 00:38:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6ACF9852C7; Sun, 20 Nov 2022 14:34: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="Xin4gSB9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2F71685213; Sun, 20 Nov 2022 14:34:16 +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 8F6208525A for ; Sun, 20 Nov 2022 14:34:13 +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 w4so5944993qts.0 for ; Sun, 20 Nov 2022 05:34:13 -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=Ob6bE+mPI7dWk7r2oDhTP+341xSk4fIE1c6v7NKicWs=; b=Xin4gSB991A76N2zS1X24y69sFb5VYQp/0nE+RgNgKSe4slhElvueCln2jwoEtBmYA tVR1h0DTkUBlvbfbw4XQjU5LFY78hTG+sdRjTF5RjI5lMA/xj1Q6b3MUDHACiOP32XIn hHDpKXPQUgGW3o1d8vImqF3uiUo/itp9aPRt8= 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=Ob6bE+mPI7dWk7r2oDhTP+341xSk4fIE1c6v7NKicWs=; b=aM8jZKkt/yp4I0oisjxhrBzpCTRyJWXHLwmcnm6V2gaiJefEpg8HEOOcCtsuAjZIV8 ruhB89tNhXAUABLKgQXSG8Jd937tclJe6WOa4bf0effbvDxOmgiK9eeoGLUUunBhvmhG 8yEvYsedpapy9dgy/4vji56JP/2i972oP1On3Hab+qvDkR9g17k+DRwMy0rXTTYAg9Fk g9fh9/ve3emX2vW+QDOPEsyake4/Isp4DUeBkGBhUFS/7ws4FPMHvOLdz1A0BV+DB0In +mPpce/5W4J3gP98RyRubL9xQBIx+NoJEK1c/AZ8ov9yh0mrFTFg7j/uzZNa/rm+GKNk fv+w== X-Gm-Message-State: ANoB5pnePltUE/lmm7vgzXESdB0fAClTmqo0MBAB0ftFoSCAGbxU6DvM rz/YjeEC6LRVruSScMNWwOMC24kMLu303Q== X-Google-Smtp-Source: AA0mqf6wr5pzjzLmvRHYXx3rm7khy4a65R50bA/LJkUb8TD4sYsdgzcEjHM3K39/+QSMQGOqV+/XDA== X-Received: by 2002:a05:622a:514e:b0:3a5:2988:c67c with SMTP id ew14-20020a05622a514e00b003a52988c67cmr1445380qtb.487.1668951252188; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:11 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 023/241] global: Migrate CONFIG_FDTADDR to CFG Date: Sun, 20 Nov 2022 08:30:14 -0500 Message-Id: <20221120133352.3055600-24-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/colibri_vf.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 122b599a6f21..ef49969598c9 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -20,7 +20,7 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_FDTADDR 0x84000000 +#define CFG_FDTADDR 0x84000000 #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 66728d47db38..e436bf55d94d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -23,7 +23,7 @@ CFG_ET1100_BASE CFG_ETHBASE CFG_EXTRA_ENV_SETTINGS CFG_FB_ADDR -CONFIG_FDTADDR +CFG_FDTADDR CONFIG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED From patchwork Sun Nov 20 13:30: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: 1706730 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=dNcMlSdm; 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 4NFWnF6snVz23lt for ; Mon, 21 Nov 2022 00:38:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE16B852B0; Sun, 20 Nov 2022 14:34: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="dNcMlSdm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2145F851EF; Sun, 20 Nov 2022 14:34:16 +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-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 7054E85213 for ; Sun, 20 Nov 2022 14:34:13 +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-x72e.google.com with SMTP id x18so6505013qki.4 for ; Sun, 20 Nov 2022 05:34:13 -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=sKBez5Kp/87gRMc5brA0YOP9rK4hDZMw7OFdPpIC1NE=; b=dNcMlSdmOn538vlxcmAQ/Nt1/SHL+e/Uwl7yppXRyvWF9lyHBYrfxVUWTepB66nr5I dGAjKjt+7m8fTXUvsN5bBeXAJLEAXVBSo3ZGouHLoJDz4VE7LJijs7tlo3x53dQofpGI LA0EAjuTGeI69jScu+h3JyT0KDue1V135Txpg= 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=sKBez5Kp/87gRMc5brA0YOP9rK4hDZMw7OFdPpIC1NE=; b=0gLA8Z3I+KTkK1R626SALP4aBD4aAvZP8Mb6Wn+/b/RQyKNAzbx3Ep1YQWcJ+qeHPb dTiAaWoIZnSxnnS1OI1aZCp83nn+lHAG0fKcxI/h+QkBz2E5bilOPOL9N8sGVirMpCUy nScnSS+TiC9OOdmpgjU580IDp8fw8DD2vn0Y1H36YQ10xFKfdkeJC3OjQKo3lfN/2WiA QBdd04bVDo/RXrkeRCnnWik/IWxRj5vxLp//cbsM/6G0Pv3JmZIdvpf3g5lOM5MNpoo9 c84mbn+SYNgCuOdeUKjmYRtpNWJICv5O8ots3uMtgcyo4pNrr4DyQHoSym9wn3BnHDX4 vVag== X-Gm-Message-State: ANoB5pmAU4hIMdV4Zaj7SOVO15DGCyx2zGPozlu9gNNp8Xk+ictmbbO/ hu7K/5ozr5UV44qzAQzOxwS7x1QTzdT8Zg== X-Google-Smtp-Source: AA0mqf58qhCEbBkMU7e0hVDLyuLIM9pzILq3Lartud8ej7+LKBW9SHBe1rMfH6C4j7bXjzQPtIj3Ww== X-Received: by 2002:a05:620a:15d5:b0:6ee:988f:84b7 with SMTP id o21-20020a05620a15d500b006ee988f84b7mr12831811qkm.315.1668951252881; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:12 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 024/241] global: Migrate CONFIG_FDTFILE to CFG Date: Sun, 20 Nov 2022 08:30:15 -0500 Message-Id: <20221120133352.3055600-25-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/MPC837XERDB.h | 4 ++-- include/configs/embestmx6boards.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2a71e0ad4dce..2eea26d7bee7 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -229,7 +229,7 @@ #define CONFIG_ROOTPATH "/nfsroot" /* U-Boot image on TFTP server */ #define CONFIG_UBOOTPATH "u-boot.bin" -#define CONFIG_FDTFILE "mpc8379_rdb.dtb" +#define CFG_FDTFILE "mpc8379_rdb.dtb" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ @@ -246,7 +246,7 @@ "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \ " $filesize\0" \ "fdtaddr=780000\0" \ - "fdtfile=" CONFIG_FDTFILE "\0" \ + "fdtfile=" CFG_FDTFILE "\0" \ "ramdiskaddr=1000000\0" \ "ramdiskfile=rootfs.ext2.gz.uboot\0" \ "console=ttyS0\0" \ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 4a929937b416..8f03c2ff3c0d 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -35,11 +35,11 @@ #if defined(CONFIG_ENV_IS_IN_MMC) /* RiOTboard */ -#define CONFIG_FDTFILE "imx6dl-riotboard.dtb" +#define CFG_FDTFILE "imx6dl-riotboard.dtb" #define CFG_SYS_FSL_USDHC_NUM 3 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) /* MarSBoard */ -#define CONFIG_FDTFILE "imx6q-marsboard.dtb" +#define CFG_FDTFILE "imx6q-marsboard.dtb" #define CFG_SYS_FSL_USDHC_NUM 2 #endif @@ -79,7 +79,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - "fdtfile=" CONFIG_FDTFILE "\0" \ + "fdtfile=" CFG_FDTFILE "\0" \ "finduuid=part uuid mmc 0:1 uuid\0" \ BOOTENV diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e436bf55d94d..6a20473cd6ea 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -24,7 +24,7 @@ CFG_ETHBASE CFG_EXTRA_ENV_SETTINGS CFG_FB_ADDR CFG_FDTADDR -CONFIG_FDTFILE +CFG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR From patchwork Sun Nov 20 13:30: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: 1706732 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=mFyPzujs; 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 4NFWng6GGpz23lt for ; Mon, 21 Nov 2022 00:38:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E44FC852CD; Sun, 20 Nov 2022 14:34: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="mFyPzujs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9135B85268; Sun, 20 Nov 2022 14:34: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-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 2D11D85258 for ; Sun, 20 Nov 2022 14:34: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-x832.google.com with SMTP id w4so5945013qts.0 for ; Sun, 20 Nov 2022 05:34: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=KasTc+Dm1Pi3x89tmAFpzLTlt/5g3dXNgvvivrbpWQE=; b=mFyPzujsOEYPag1ru3P05grcw3xHwwHWW1V+t9EKoHeZtX5Eeixp8nHoej8Iu1C6zc bwFKVpMoqsH3kD5Sx1Q24bIQY/7jXsRxVZ+BgnZegMvKaOxOMMox7PcmvQNTxkOZ7I5Q y2WFd6vOx6I9zlYKNEk27oMYijWEDVx+4enwI= 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=KasTc+Dm1Pi3x89tmAFpzLTlt/5g3dXNgvvivrbpWQE=; b=R4VQv4unkS/cQgXPVaxH52kmy8x6kB4VWBhQaJHXlT6lm22jp44T5NS5rvQYxQhYM/ YWeXXXWKKh4gFZPgF5zZWLaTRVpqh3ILWlGHXHNKlFf+1xKr62iGe9XT8OVNhmExLXaH i++mKiya4CNVvmycWjKAc9h4C+L+5JwH6suMN0XEj56s2wC3sMLzxV0BgWlG89GJqjCM wi/Nwx3mB/5s9wpnd2HEr9MBiocUz+zxj1YZm7+z+1kqgmycGnenq/eHAanWAeWea4eR uzb+Yn7v8GKRHpzlHA8Fw3bmw6VAHfFPkRBn1hX+0EnrQloQAxPWWEsyNnWf/rIQbDpY kOUg== X-Gm-Message-State: ANoB5pmlg0nLfd45dZVvZaX2jr6V3xE03UuGnLyNuPp1+fjlrJ7D3wjp gdFctASian3P/kBKOsv+PYvpWN/zNzWGtQ== X-Google-Smtp-Source: AA0mqf730SxfvagbqGtWizjT7HUp5QSyIRTwOph2e1CKsERbpExLRLhS2QCpuo747N+TyyQIvZBmhA== X-Received: by 2002:a05:622a:1187:b0:3a5:58f9:cd0b with SMTP id m7-20020a05622a118700b003a558f9cd0bmr4258226qtk.404.1668951253613; Sun, 20 Nov 2022 05:34:13 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:13 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 025/241] global: Migrate CONFIG_FEC_ENET_DEV to CFG Date: Sun, 20 Nov 2022 08:30:16 -0500 Message-Id: <20221120133352.3055600-26-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/seeed/npi_imx6ull/npi_imx6ull.c | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/mx6ul_14x14_evk.h | 6 +++--- include/configs/mx6ullevk.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 1eec048a66fa..570b5014dbb1 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -281,7 +281,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; #ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif #ifdef CONFIG_USB_EHCI_MX6 diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 86c11c7bd3a5..e24738064757 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -110,7 +110,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; #ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif return 0; diff --git a/board/seeed/npi_imx6ull/npi_imx6ull.c b/board/seeed/npi_imx6ull/npi_imx6ull.c index eb9ee555c854..c610d2c30696 100644 --- a/board/seeed/npi_imx6ull/npi_imx6ull.c +++ b/board/seeed/npi_imx6ull/npi_imx6ull.c @@ -100,7 +100,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; #ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif return 0; diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c index 7326daa1798d..98d8d1c31205 100644 --- a/board/variscite/dart_6ul/dart_6ul.c +++ b/board/variscite/dart_6ul/dart_6ul.c @@ -147,7 +147,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; #ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif #ifdef CONFIG_NAND_MXS diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index a8273a7fcd8d..63afa6e18969 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -19,7 +19,7 @@ #endif /* CONFIG_SPL_BUILD */ /* ENET1 connects to base board and MUX with ESAI */ -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 #define CONFIG_FEC_MXC_PHYADDR 0x0 /* EEPROM */ diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 323703ac5c90..c2ed9c7c56af 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -18,7 +18,7 @@ #endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0 #endif /* Environment settings */ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 938ab5ade9a7..7200c69bd9e6 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -100,7 +100,7 @@ #endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0 #define CONFIG_FEC_MXC_PHYADDR 0x0 #endif diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 90c788468710..efc599f37a6d 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -121,11 +121,11 @@ #endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 -#if (CONFIG_FEC_ENET_DEV == 0) +#if (CFG_FEC_ENET_DEV == 0) #define CONFIG_FEC_MXC_PHYADDR 0x2 -#elif (CONFIG_FEC_ENET_DEV == 1) +#elif (CFG_FEC_ENET_DEV == 1) #define CONFIG_FEC_MXC_PHYADDR 0x1 #endif #endif diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 4a27fd22902b..58d1a744ae99 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -109,7 +109,7 @@ /* environment organization */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 #endif #endif diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 07580f409492..8f052c5ae38f 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -38,7 +38,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1 #endif -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index a480bb720b58..d095e63182ee 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -31,7 +31,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0 #define CONFIG_FEC_MXC_PHYADDR 0x0 #define CONFIG_UBOOT_SECTOR_START 0x2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6a20473cd6ea..0a60216b8050 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -25,7 +25,7 @@ CFG_EXTRA_ENV_SETTINGS CFG_FB_ADDR CFG_FDTADDR CFG_FDTFILE -CONFIG_FEC_ENET_DEV +CFG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR CONFIG_FLASH_BR_PRELIM From patchwork Sun Nov 20 13:30: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: 1706733 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=T9uHMZXI; 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 4NFWnt2Zpwz23lt for ; Mon, 21 Nov 2022 00:38:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E0AEB852C6; Sun, 20 Nov 2022 14:34: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="T9uHMZXI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE03085263; Sun, 20 Nov 2022 14:34: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-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 BC1C4851E9 for ; Sun, 20 Nov 2022 14:34: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-x832.google.com with SMTP id l2so5885032qtq.11 for ; Sun, 20 Nov 2022 05:34: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=H5zfFSe8fK4IoDF15S6wpfg4NzeMkzDEpCCS+ZmHTD4=; b=T9uHMZXI6zsWp4yJV/H7jWu0JPWjDKHRB37EhRd1UWMi4IJupSDwz0v3vav4GFKI+g cd6TVDU0nOs5U61LAuIGAhBLI8uHgnv/TlfaDUuJidhHiiX2A27FaE4TYXSkc+dvPQ4j TKJtP8jLTnFpcC2Po8JoPraUBdui8kZlsdHvk= 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=H5zfFSe8fK4IoDF15S6wpfg4NzeMkzDEpCCS+ZmHTD4=; b=eAa6FjjowT59WK5phjkCpmCVaNjjfuhmv6JtI+l9ycSUyStl7eIaOJDE8VCCfY74Nb SdDClBw58PB2ZQLNs9G3h2x1EXmZJ9RgtHffWyRyZ6Ey8LXxYvAaDmuSGExtWNJPmvg6 BPncNC5kycpCamlmhTW4udp4MdAmJOJOu2J/5Sfu8lfEKlAWHS63d66+9RA9BxM3sCyj LKtWvoJmdWtrsDEhCCYwaTGUyh3BFyIISlYD+ZE1Et52Y264ib+ekAGwDibLV2lZBogH I97zk9Efn96Smgppg9zpBFbGOFapOYklVbZVGIXfSMx6PYw5aiHYjxAjItyGOW1oyrYO p2Kg== X-Gm-Message-State: ANoB5pm4O4O644IFT1zyiVy3zTQ53IsGWqreg7TLQpEHroEL9+Ro/sCr ozfGHxatNE1qn5FPeJ40t90a6lb1mnKWCA== X-Google-Smtp-Source: AA0mqf5bGLeys0l8hDOfQcMolB9f/Qy6q08ThFUznvLbJAsCgGvwzV4fXbDrTcf7MiHcpZn875FWXQ== X-Received: by 2002:ac8:60d:0:b0:39c:e8cc:ff69 with SMTP id d13-20020ac8060d000000b0039ce8ccff69mr14071651qth.245.1668951254266; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:13 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 026/241] global: Migrate CONFIG_FEC_FIXED_SPEED to CFG Date: Sun, 20 Nov 2022 08:30:17 -0500 Message-Id: <20221120133352.3055600-27-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- doc/README.fec_mxc | 2 +- drivers/net/fec_mxc.c | 8 ++++---- include/configs/brppt2.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc index d17dfb676f79..d27276b8783e 100644 --- a/doc/README.fec_mxc +++ b/doc/README.fec_mxc @@ -22,7 +22,7 @@ CONFIG_FEC_MXC_PHYADDR Optional, selects the exact phy address that should be connected and function fecmxc_initialize will try to initialize it. -CONFIG_FEC_FIXED_SPEED +CFG_FEC_FIXED_SPEED Optional, selects a fixed speed on the MAC interface without asking some phy. This is usefull if there is a direct MAC <-> MAC connection, for example if the CPU is connected directly via the RGMII interface to a diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index a61a1fc75738..659625a29d39 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -268,7 +268,7 @@ static int miiphy_restart_aneg(struct eth_device *dev) return ret; } -#ifndef CONFIG_FEC_FIXED_SPEED +#ifndef CFG_FEC_FIXED_SPEED static int miiphy_wait_aneg(struct eth_device *dev) { uint32_t start; @@ -294,7 +294,7 @@ static int miiphy_wait_aneg(struct eth_device *dev) return 0; } -#endif /* CONFIG_FEC_FIXED_SPEED */ +#endif /* CFG_FEC_FIXED_SPEED */ #endif static int fec_rx_task_enable(struct fec_priv *fec) @@ -536,8 +536,8 @@ static int fec_open(struct udevice *dev) } speed = fec->phydev->speed; } -#elif CONFIG_FEC_FIXED_SPEED - speed = CONFIG_FEC_FIXED_SPEED; +#elif CFG_FEC_FIXED_SPEED + speed = CFG_FEC_FIXED_SPEED; #else miiphy_wait_aneg(edev); speed = miiphy_speed(edev->name, fec->phy_id); diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index 7e4e8ee262bf..92f34407b401 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -81,7 +81,7 @@ BUR_COMMON_ENV \ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE /* Ethernet */ -#define CONFIG_FEC_FIXED_SPEED _1000BASET +#define CFG_FEC_FIXED_SPEED _1000BASET /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0a60216b8050..1917a8d090b2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -26,7 +26,7 @@ CFG_FB_ADDR CFG_FDTADDR CFG_FDTFILE CFG_FEC_ENET_DEV -CONFIG_FEC_FIXED_SPEED +CFG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR CONFIG_FLASH_BR_PRELIM CONFIG_FLASH_OR_PRELIM From patchwork Sun Nov 20 13:30: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: 1706736 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=kZZq14C1; 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 4NFWph5gZ2z23lt for ; Mon, 21 Nov 2022 00:39:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 176ED852DC; Sun, 20 Nov 2022 14:34: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="kZZq14C1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B450285276; Sun, 20 Nov 2022 14:34: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-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 9835B851EF for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x82c.google.com with SMTP id w9so5879709qtv.13 for ; Sun, 20 Nov 2022 05:34:16 -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=aMmyqf8JJj8sQ5aMh2bgznHkZI93wbqjMaV+2f80blQ=; b=kZZq14C1tlVWVxoaq9ai5H2lw5XshjdZfYktxX1zp3uUdt1fSK2tIPDpa3MHMGj7f7 +PFcPxeCR4hpXgh8gGhXrngms/DuuUj1B4B3yTbOfAxvxZgiddo1UmIA+ekGLlRkLi6M Sq+wSz6dnXhexy3J19B1PypekEi5l0ofSswAw= 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=aMmyqf8JJj8sQ5aMh2bgznHkZI93wbqjMaV+2f80blQ=; b=hcjTLLkC5/VBymkdsS8scxGjz416dUz35A7c2tvhSEiDCzkypAQidc9T32R7mJwKmu jLNuvpm0YrPbnr5JoY1cGuO8kOcXrkgfFxZb8mDw8CgK7pRWyyWl87iCyfTFBVfWnCLp Y3K4xcaiktPLAA/QJqw7kJDg8K08XRJhtaCmPqdU9iDknCsuVG6qnJMIFU7hkcEZlmh8 tABsnLTUi9nqve2gsKGNsAkekSA+Dwfn5PsVV+JWJiel+H+1iF02YLC/+5spidjCmNMk SPp7s+IAy1JwniCp1BTDeSqIgRFGZh8necbmFwJkVaHfM5BOmpADPGdHUJVw1P38qON7 NIlw== X-Gm-Message-State: ANoB5pmznGj0k7shUkg9XP6wQhdAVmiKv+udH+ga7RgIwWD56gVXvG3i 1iGX1CVgZ3UcntWb7Mlv0YnuVxCZSsk8dg== X-Google-Smtp-Source: AA0mqf4veSISuGBq94tovYs1XrUkVc1/O2XpfpzMQ5f9eojTWJMEOZOKd5uN0xQL1gcMii04O2zWIg== X-Received: by 2002:a05:622a:1386:b0:3a6:18ff:c6c1 with SMTP id o6-20020a05622a138600b003a618ffc6c1mr13614146qtk.683.1668951255051; Sun, 20 Nov 2022 05:34:15 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:14 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 027/241] global: Migrate CONFIG_FEC_MXC_PHYADDR to CFG Date: Sun, 20 Nov 2022 08:30:18 -0500 Message-Id: <20221120133352.3055600-28-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- doc/README.fec_mxc | 2 +- drivers/net/fec_mxc.c | 4 ++-- include/configs/aristainetos2.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/nitrogen6x.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c index 9733a33ee2c2..1b08a2c5abf2 100644 --- a/board/compulab/cl-som-imx7/cl-som-imx7.c +++ b/board/compulab/cl-som-imx7/cl-som-imx7.c @@ -214,7 +214,7 @@ int board_eth_init(struct bd_info *bis) gpio_set_value(CL_SOM_IMX7_ETH1_PHY_NRST, 1); /* MAC initialization */ return fecmxc_initialize_multi(bis, CL_SOM_IMX7_FEC_DEV_ID_PRI, - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE); + CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE); } /* diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c index 7340a3440231..9205d5ef6ddb 100644 --- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c @@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis) setup_fec(); ret = fecmxc_initialize_multi(bis, 1, - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE); + CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE); if (ret) printf("FEC%d MXC: %s:failed\n", 1, __func__); diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc index d27276b8783e..7aadea222f85 100644 --- a/doc/README.fec_mxc +++ b/doc/README.fec_mxc @@ -18,7 +18,7 @@ CONFIG_PHYLIB CONFIG_FEC_MXC_NO_ANEG Relevant only if PHYLIB not used. Skips auto-negotiation restart. -CONFIG_FEC_MXC_PHYADDR +CFG_FEC_MXC_PHYADDR Optional, selects the exact phy address that should be connected and function fecmxc_initialize will try to initialize it. diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 659625a29d39..8c231ec80066 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1090,8 +1090,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) int addr; addr = device_get_phy_addr(priv, dev); -#ifdef CONFIG_FEC_MXC_PHYADDR - addr = CONFIG_FEC_MXC_PHYADDR; +#ifdef CFG_FEC_MXC_PHYADDR + addr = CFG_FEC_MXC_PHYADDR; #endif phydev = phy_connect(priv->bus, addr, dev, priv->interface); diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index b09e06ad4d85..9b11934546c1 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -28,7 +28,7 @@ /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #ifdef CONFIG_IMX_HAB #define HAB_EXTRA_SETTINGS \ diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 63afa6e18969..19c7fca03b29 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -20,7 +20,7 @@ /* ENET1 connects to base board and MUX with ESAI */ #define CFG_FEC_ENET_DEV 1 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 /* EEPROM */ #define EEPROM_I2C_BUS 0 /* I2C0 */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 263981860e86..caa1498acead 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -118,6 +118,6 @@ #define PHYS_SDRAM_2_SIZE 0x100000000 /* 4 GB */ /* Networking */ -#define CONFIG_FEC_MXC_PHYADDR -1 +#define CFG_FEC_MXC_PHYADDR -1 #endif /* __CGTQMX8_H */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 2d56d37f06f8..cde7d3c891ab 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -13,7 +13,7 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 /* ENET1 */ #define IMX_FEC_BASE ENET_IPS_BASE_ADDR diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index c66cf721870c..47b76c9371e8 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -132,7 +132,7 @@ /* APBH DMA is required for NAND support */ /* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 /* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 0df61916b7d2..121b34ae96db 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -19,7 +19,7 @@ /* Ethernet Configs */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index b6006c021d5c..162b0b8a69bb 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -40,7 +40,7 @@ /* MMC */ /* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 /* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 00ce7fb62a93..7785bdc7cbe6 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -136,7 +136,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index d28f3f1972b9..c364e06dc450 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -61,6 +61,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #endif diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 63ea25d9788b..cba59dbfd938 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -21,7 +21,7 @@ #endif #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #define PHY_ANEG_TIMEOUT 20000 diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h index 8fac898403f1..03dbeefb7a86 100644 --- a/include/configs/imx8mp_icore_mx8mp.h +++ b/include/configs/imx8mp_icore_mx8mp.h @@ -21,7 +21,7 @@ #endif #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #define DWC_NET_PHYADDR 1 diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index ed4da0e69b5b..38ae5f137022 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -39,7 +39,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 4 +#define CFG_FEC_MXC_PHYADDR 4 #define PHY_ANEG_TIMEOUT 20000 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index c40448715f8a..d9ce5d5d0f1a 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -24,7 +24,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #endif #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 8fed3e31964c..eb7059f0648c 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -21,7 +21,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #endif #define CONFIG_MFG_ENV_SETTINGS \ diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 30dd5af03b00..b7397f6038fd 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -21,7 +21,7 @@ #if defined(CONFIG_FEC_MXC) #define PHY_ANEG_TIMEOUT 20000 -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #endif #ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index d909bbbbcfda..4dd51c7f1d7f 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -25,7 +25,7 @@ /* ENET1 Config */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #define PHY_ANEG_TIMEOUT 20000 diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 7200c69bd9e6..0b8781d7bf34 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -102,7 +102,7 @@ #ifdef CONFIG_CMD_NET #define CFG_FEC_ENET_DEV 0 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #endif #endif diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 9c37212463e1..4123964256bd 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -55,7 +55,7 @@ * Ethernet on SOC (FEC) */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #endif #define CFG_SYS_RTC_BUS_NUM 1 /* I2C2 */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 7ea682049261..4be47e78d676 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -32,7 +32,7 @@ #define CFG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) } /* Ethernet Configuration */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \ diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index ef2111cd20ab..1cd0b3cf7374 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -17,7 +17,7 @@ #define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #define PHY_ANEG_TIMEOUT 20000 #endif diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 9d8737c19425..3399cdd16fa8 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -93,7 +93,7 @@ /* Network */ #define IMX_FEC_BASE ENET2_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8372f979dc86..c99d99abc179 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -115,7 +115,7 @@ /* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index efc599f37a6d..5e3695ecc971 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -124,9 +124,9 @@ #define CFG_FEC_ENET_DEV 1 #if (CFG_FEC_ENET_DEV == 0) -#define CONFIG_FEC_MXC_PHYADDR 0x2 +#define CFG_FEC_MXC_PHYADDR 0x2 #elif (CFG_FEC_ENET_DEV == 1) -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #endif #endif diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index e1689679e5f6..811688ae82af 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 6 +#define CFG_FEC_MXC_PHYADDR 6 /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 8f052c5ae38f..664d4f11c867 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -35,7 +35,7 @@ #define CONFIG_MXC_USB_FLAGS 0 #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #endif #define CFG_FEC_ENET_DEV 1 diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 66258a3ab73b..e1f7b7003194 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -98,6 +98,6 @@ /* Environment organization */ /* Ethernet Configuration */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #endif /* __CONFIG_H * */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index a4b97451cfdc..6148a343117d 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -15,7 +15,7 @@ /* Network support */ -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #define CONFIG_MXC_UART_BASE UART6_BASE_ADDR diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index ac25991703f2..1d8709180c83 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -21,7 +21,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #endif /* Initial environment variables */ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index e13280563513..3418d4e2b559 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -66,7 +66,7 @@ #endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #endif #endif diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 899c218727f3..a5f14dc42679 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -9,7 +9,7 @@ #ifndef __CONFIG_TQMA6_MBA6_H #define __CONFIG_TQMA6_MBA6_H -#define CONFIG_FEC_MXC_PHYADDR 0x03 +#define CFG_FEC_MXC_PHYADDR 0x03 #define CONFIG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 4d8839b6e60d..34c9b6a2f97c 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -7,7 +7,7 @@ #define __CONFIG_TQMA6_WRU4_H /* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0x01 +#define CFG_FEC_MXC_PHYADDR 0x01 /* UART */ #define CONFIG_MXC_UART_BASE UART4_BASE diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 0e0b3a7b594d..d10b88f15754 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -21,7 +21,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 /* I2C Configs */ diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 1a71b300fc55..c84353ebea66 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -34,7 +34,7 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 /* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index d095e63182ee..ce6ca175363b 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -32,7 +32,7 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CFG_FEC_ENET_DEV 0 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #define CONFIG_UBOOT_SECTOR_START 0x2 #define CONFIG_UBOOT_SECTOR_COUNT 0x3fe diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1917a8d090b2..901914ac043c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -27,7 +27,7 @@ CFG_FDTADDR CFG_FDTFILE CFG_FEC_ENET_DEV CFG_FEC_FIXED_SPEED -CONFIG_FEC_MXC_PHYADDR +CFG_FEC_MXC_PHYADDR CONFIG_FLASH_BR_PRELIM CONFIG_FLASH_OR_PRELIM CONFIG_FLASH_SECTOR_SIZE From patchwork Sun Nov 20 13:30: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: 1706734 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=SfrISpi0; 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 4NFWpJ0SQzz23lt for ; Mon, 21 Nov 2022 00:39:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C163F852D6; Sun, 20 Nov 2022 14:34: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="SfrISpi0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D476585275; Sun, 20 Nov 2022 14:34:19 +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 5B6F685262 for ; Sun, 20 Nov 2022 14:34: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 h21so5912541qtu.2 for ; Sun, 20 Nov 2022 05:34: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=lSqqxHN4Wm5yOs77x73/OxWpcdqGSqQ3mP/ESZBPiuk=; b=SfrISpi0sxwlUw/0uleZvybi+7BdPXYVHEW5EII8XR2WrXPL7S76ruuKCtNiMPUxyH gtirMq1gTPQhl04ck2qyxw3uJuE3VSdDekkC/XRKmVarV7LBf/8im05Ioluh+48mNNrd mT8Nb2Lb/T1qQGY3snrsqv/MSPvcPOakhifJU= 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=lSqqxHN4Wm5yOs77x73/OxWpcdqGSqQ3mP/ESZBPiuk=; b=HNqzydPqflvGOJ2YN0u4bu/gpvDVF+rEqOBMWaQ5rPehlG/8RrODy2fpFhOXZFP/OU izmqfIa+IuKSTxLaziYSS7cYKJ/qOHg3eDcv5XoYsDrb0fevXP0DSuBCzsHdBnZhh8mQ oU+o9UqAfqegGoudx5S+rN4YYuJZrz7B1VnPTKpofPMsJrxQsZjbRgMx7PJ1YZj3pPOI aIRBR5SvDzrfOq9h46aouxvNBKh6gwk9klORG4MZiVWGlfJZOc9ySvecMvq60zs/GNQg WNfglMhSSp3Qro+TRCToW7C8Djah4Jj/VHIE7UTlUgKBZV0g9eoXKXjz7+oNq3v7jYH0 jHYA== X-Gm-Message-State: ANoB5pkRs7/IEtSwa3vMUn6YY4Nu88/yQbRfBgIbk8INrxQZJo1BIces 8ux8qGBOFkD79R8bngtVRn8oTXR66rWb7g== X-Google-Smtp-Source: AA0mqf5FRJFRl/UbEfWIO2GKb+mcPgsPtWrlksVCaeCnmq7jek55Aj/GDY7FuhHQQw88qzzaCQcSMQ== X-Received: by 2002:a05:622a:491:b0:3a5:214f:68c3 with SMTP id p17-20020a05622a049100b003a5214f68c3mr13667622qtx.367.1668951255938; Sun, 20 Nov 2022 05:34:15 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:15 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 028/241] global: Migrate CONFIG_FLASH_BR_PRELIM to CFG Date: Sun, 20 Nov 2022 08:30:19 -0500 Message-Id: <20221120133352.3055600-29-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- 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 88182fde972b..54687d3ada4e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -193,7 +193,7 @@ #define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE #endif -#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ +#define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ | BR_PS_16 | BR_V) #define CONFIG_FLASH_OR_PRELIM 0xfc000ff7 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 901914ac043c..0767c66a79ff 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -28,7 +28,7 @@ CFG_FDTFILE CFG_FEC_ENET_DEV CFG_FEC_FIXED_SPEED CFG_FEC_MXC_PHYADDR -CONFIG_FLASH_BR_PRELIM +CFG_FLASH_BR_PRELIM CONFIG_FLASH_OR_PRELIM CONFIG_FLASH_SECTOR_SIZE CONFIG_FLASH_SHOW_PROGRESS From patchwork Sun Nov 20 13:30: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: 1706735 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=qp8Wukv/; 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 4NFWpT222Dz23lt for ; Mon, 21 Nov 2022 00:39:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F25DB85298; Sun, 20 Nov 2022 14:34: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="qp8Wukv/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3689C85262; Sun, 20 Nov 2022 14:34: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-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 D274A85261 for ; Sun, 20 Nov 2022 14:34: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-x832.google.com with SMTP id cg5so5884009qtb.12 for ; Sun, 20 Nov 2022 05:34: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=BVwK1S5HSDx8lFKiKUKE3Xrf+3HLp4W4xYrQHzmU4UM=; b=qp8Wukv/zqX51gHvYrN1rqkSvVc+qddNsCEUQJAIVzMaprZAjwLyFBdaEC74kBp3L0 3Z6vhNOjJhMu/WenDBYl4+Ykh34jkWlRKjLQS9xcuSCSqpohG0+v94GSwIWuqLV3ijfl 8OE2X7WW9kXA515oJqTp/Dr/geQIH9gyamKfk= 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=BVwK1S5HSDx8lFKiKUKE3Xrf+3HLp4W4xYrQHzmU4UM=; b=RFSxIuS5U3O8HquoSG9bVLJHymlD4LVy6a/lfdJadJbsapZCXesHcw0yPe9txA2QkA KfUfb11wqVDlUTHdx7dpa88DqmW/ihsgLqKnNcTave6aEAlBUh7ZtFsx+7rVR6hkRrWH QHdbhFI0gMxDYZeKS2DUQF4HwpevowM3ZWdBFjScFHyswBYo8z9ljdy/BtLS1H1Mhh7R aIIS6qv9zUziPd1Vppo6My3Rxj3yfpHfF0VWTsk7fQU4bNTQBAks3/IZjwQDGKenlCyS yhtJoxgCoIyGBXTWZXdf505QZ2tB68taXu82u9OvUu9VG4P+FbSfBZ3BVW5phCJ8hGpL n+yw== X-Gm-Message-State: ANoB5pmPojkxS8PhkAxNdbfbe5Tu/j7oQAtAHp+rt9F9Y9QMzUenstLQ KgzzyQJyVmOYlOpTK/Cq4q1CF9gS0ZroIA== X-Google-Smtp-Source: AA0mqf7co2hGMYW7QKkSJoC9Dn0/2e727HV7utLeflYCSK2wqFZs0aFsVNndAOMNNTaCN+zvzYf9Ng== X-Received: by 2002:ac8:5bd1:0:b0:3a5:7994:3943 with SMTP id b17-20020ac85bd1000000b003a579943943mr4102745qtb.204.1668951256550; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:16 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 029/241] global: Migrate CONFIG_FLASH_OR_PRELIM to CFG Date: Sun, 20 Nov 2022 08:30:20 -0500 Message-Id: <20221120133352.3055600-30-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- 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 54687d3ada4e..de7c0d61c05f 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -196,7 +196,7 @@ #define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ | BR_PS_16 | BR_V) -#define CONFIG_FLASH_OR_PRELIM 0xfc000ff7 +#define CFG_FLASH_OR_PRELIM 0xfc000ff7 #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0767c66a79ff..ae4cb04023ad 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -29,7 +29,7 @@ CFG_FEC_ENET_DEV CFG_FEC_FIXED_SPEED CFG_FEC_MXC_PHYADDR CFG_FLASH_BR_PRELIM -CONFIG_FLASH_OR_PRELIM +CFG_FLASH_OR_PRELIM CONFIG_FLASH_SECTOR_SIZE CONFIG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N From patchwork Sun Nov 20 13:30: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: 1706737 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=ZvleXVX5; 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 4NFWpt2kTBz23lt for ; Mon, 21 Nov 2022 00:39:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 495C4852E4; Sun, 20 Nov 2022 14:34: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="ZvleXVX5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D9148851EF; Sun, 20 Nov 2022 14:34: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-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 6562485263 for ; Sun, 20 Nov 2022 14:34: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-x82a.google.com with SMTP id c15so5898286qtw.8 for ; Sun, 20 Nov 2022 05:34: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=xJFgzolKJfArTxphLe/EpNvvBUPtFCQ2LeEYQNkuaXc=; b=ZvleXVX5O3KRRZfOn1diQ0yblQ5NHIQknZNrIaHGqHaieNUdZNWDA0s/BaR88rF7t3 8Tx4zTQZd4kVSIGloG3ZN3xfJL769pcBicLZuXh7GD/ncuZiRJj8JTr4bXSjCY/Q1tti BvigQ8w0oktUBRjn9YnKfHkiSi4iNLRQ7vTws= 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=xJFgzolKJfArTxphLe/EpNvvBUPtFCQ2LeEYQNkuaXc=; b=k+7MkaS+m6xx/uR8C5a6g/LX1KvY1x+m0aiOK5t17hxefYUVeOTerP8ZumFSdHbK4/ bkPS1LwSLOXMqCqfjyua5o1p1Fe3VeK/gkx9rsxaweaxAwO0EverSzpk0sdHBY1zoYv2 BdOH5E8SJL6KL8cmd2lubjJ+r7WqBIC0Mq0xiAIChaxNcFxV9ANDXhIPfTxYRFW8tCQ9 m6/LDMJmyD6Q/BfKCHbXJU9LnI1bZDzXSBoPWVGRup7wSvA7UZ9dgd+Et7VObkP5eysi F/slq6qm7SJJaQ5LpAT4Arp1DeaWnIJfFigMAelUN6YrC8D6Xm9fchNzXwuoTXvP7UXa ZTng== X-Gm-Message-State: ANoB5pmquw7a1wRa8uNzWf4CbXt0Uk6GWXJ409lAgC/qdc7oHGT7hF4S ZgeLNx9DxRix6qt+XAdPK+beP6ScSWkzQw== X-Google-Smtp-Source: AA0mqf5Er/S7biS+LpTushn/r8uzSAaDmd4EriS8rvCuP8cAEQUNwE1XYu39GUObNxIZ9IDqt5LcFg== X-Received: by 2002:a05:622a:1a2a:b0:3a5:5e38:c294 with SMTP id f42-20020a05622a1a2a00b003a55e38c294mr13641860qtb.122.1668951257082; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:16 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 030/241] global: Migrate CONFIG_FLASH_SECTOR_SIZE to CFG Date: Sun, 20 Nov 2022 08:30:21 -0500 Message-Id: <20221120133352.3055600-31-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/ax25-ae350.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index b743066ea7c3..6661f2d173ce 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -50,7 +50,7 @@ #define CFG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ -#define CONFIG_FLASH_SECTOR_SIZE (0x10000*2) +#define CFG_FLASH_SECTOR_SIZE (0x10000*2) /* environments */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ae4cb04023ad..89f47538d4c7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -30,7 +30,7 @@ CFG_FEC_FIXED_SPEED CFG_FEC_MXC_PHYADDR CFG_FLASH_BR_PRELIM CFG_FLASH_OR_PRELIM -CONFIG_FLASH_SECTOR_SIZE +CFG_FLASH_SECTOR_SIZE CONFIG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY From patchwork Sun Nov 20 13:30: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: 1706739 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=qYGEUUC2; 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 4NFWqG5Ml9z23n6 for ; Mon, 21 Nov 2022 00:40:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 13245852ED; Sun, 20 Nov 2022 14:34: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="qYGEUUC2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A95985258; Sun, 20 Nov 2022 14:34: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 3C4AA8526B for ; Sun, 20 Nov 2022 14:34:19 +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 l15so5912253qtv.4 for ; Sun, 20 Nov 2022 05:34:19 -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=vY9Ktf3h2tlLpcXhjaYW9RYoUnK/svMa+owSLiWPWw8=; b=qYGEUUC2XwAWh2AK7OWLVhOIFaoKcSwf9ickkQoXY225rc0J/XSnc9HIz2tv6XP+nM jNTQyig1jSp1eWFHbQc0XtwmlSe5EsGswjifcLCzJMHLhvFhutntfrzSr4aaACcFP6rm WSU2F0hH7w29o0Zgtqqeq5DNxCIUL++eINaNM= 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=vY9Ktf3h2tlLpcXhjaYW9RYoUnK/svMa+owSLiWPWw8=; b=iIRpB5Oq8cFam174S22ud3apjDSDi3ypSWAGbjiYaMqVn1YcghRo5gjhq3ki/hJXZl axJPfDEdXC4YBdGQtnzBR5U0i1HR/7l5tTD3+iUHsw828eQGTAdgkRYyPwU5GeXCfQn3 sdSpFbH3mTVgESnnyas4DMBgrYdCyNVAEdibCI1Zmkg9dbn9owIpxZCi3FO8zAdjYCU1 Ws9edhbLlC93F8ECTPtlSp7zQgOgegjt4V/pyiRTTxZt/fIOHRuSE+Hdh2/rPDrz++85 qujaCvpgV3fZe+X7mACX/8WOaDfXCuQipr3COQZf3othgWjP5mFDRCXEn4VAYAlqqw6d JraA== X-Gm-Message-State: ANoB5pkFLbg27aTaDS4CjA1QWxFGgAsL8i6+gYIkNpeRzE0VT7a6oBuW Y43EHRFt/SB9epFeaf/ewMi0oryOlPbFsQ== X-Google-Smtp-Source: AA0mqf6YspiyjNdsgE8uZivf3ADVYqvOz9y+QCrxxSvfuQS8X17JcZXYoFx41u33zasj61f6iJcjWw== X-Received: by 2002:a05:622a:50a7:b0:39c:eb15:b6df with SMTP id fp39-20020a05622a50a700b0039ceb15b6dfmr13710890qtb.518.1668951257697; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:17 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 031/241] global: Migrate CONFIG_FLASH_SHOW_PROGRESS to CFG Date: Sun, 20 Nov 2022 08:30:22 -0500 Message-Id: <20221120133352.3055600-32-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- README | 2 +- drivers/mtd/cfi_flash.c | 14 +++++++------- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.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/blanche.h | 2 +- include/configs/draak.h | 2 +- include/configs/eb_cpu5282.h | 2 +- include/configs/ebisu.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046aqds.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080aqds.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/salvator-x.h | 2 +- include/configs/ulcb.h | 2 +- include/configs/zynq-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README b/README index 52545b78a19b..ea5f4cc10659 100644 --- a/README +++ b/README @@ -1481,7 +1481,7 @@ Configuration Settings: s29ws-n MirrorBit flash has non-standard addresses for buffered write commands. -- CONFIG_FLASH_SHOW_PROGRESS +- CFG_FLASH_SHOW_PROGRESS If defined (must be an integer), print out countdown digits and dots. Recommended value: 45 (9..1) for 80 column displays, 15 (3..1) for 40 column displays. diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c1cdd2cbc3e2..75765d76ea29 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1292,7 +1292,7 @@ void flash_print_info(flash_info_t *info) * effect updates to digit and dots. Repeated code is nasty too, so * we define it once here. */ -#ifdef CONFIG_FLASH_SHOW_PROGRESS +#ifdef CFG_FLASH_SHOW_PROGRESS #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \ if (flash_verbose) { \ dots -= dots_sub; \ @@ -1325,17 +1325,17 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE int buffered_size; #endif -#ifdef CONFIG_FLASH_SHOW_PROGRESS - int digit = CONFIG_FLASH_SHOW_PROGRESS; +#ifdef CFG_FLASH_SHOW_PROGRESS + int digit = CFG_FLASH_SHOW_PROGRESS; int scale = 0; int dots = 0; /* - * Suppress if there are fewer than CONFIG_FLASH_SHOW_PROGRESS writes. + * Suppress if there are fewer than CFG_FLASH_SHOW_PROGRESS writes. */ - if (cnt >= CONFIG_FLASH_SHOW_PROGRESS) { - scale = (int)((cnt + CONFIG_FLASH_SHOW_PROGRESS - 1) / - CONFIG_FLASH_SHOW_PROGRESS); + if (cnt >= CFG_FLASH_SHOW_PROGRESS) { + scale = (int)((cnt + CFG_FLASH_SHOW_PROGRESS - 1) / + CFG_FLASH_SHOW_PROGRESS); } #endif diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index bc24be79366c..67ee74ba6232 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -161,7 +161,7 @@ extern unsigned long get_sdram_size(void); #define CFG_SYS_NOR_FTIM3 0x0 #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ /* CFI for NOR Flash */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 834400f1d601..b05601489d85 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -101,7 +101,7 @@ #define PIXIS_LBMAP_SHIFT 4 #define PIXIS_LBMAP_ALTBANK 0x40 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ /* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index f666683bcc4b..09087a70895d 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -158,7 +158,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 53bd8e85a627..e6a9dccd752b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -126,7 +126,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 5244c9d076f0..0d245940dc0e 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -119,7 +119,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CFG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 022d483da763..28c59b4e66f8 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -114,7 +114,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS } diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6cf8b75c86c2..640c12d91ab5 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -184,7 +184,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CFG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/blanche.h b/include/configs/blanche.h index cb28ae28dd3e..dc74ed3e79d6 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -25,7 +25,7 @@ #if !defined(CONFIG_MTD_NOR_FLASH) #define CONFIG_SH_QSPI_BASE 0xE6B10000 #else -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BASE 0x00000000 #define CFG_SYS_FLASH_SIZE 0x04000000 /* 64 MB */ #define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) } diff --git a/include/configs/draak.h b/include/configs/draak.h index 8140bc469c52..03972d44789b 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -13,7 +13,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 21eab9b3a479..5ef51c94dab8 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -84,7 +84,7 @@ /*----------------------------------------------------------------------- * FLASH organization */ -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BASE CFG_SYS_CS0_BASE #define CFG_SYS_INT_FLASH_BASE 0xF0000000 diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index d1882a9646be..ced71856b434 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -15,7 +15,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index a67301b9ecd6..64fb706a1ce6 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -61,7 +61,7 @@ FTIM2_NOR_TWP(0xb)) #define CFG_SYS_NOR_FTIM3 0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE_PHYS } diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 3bfb014adf11..69f9bacad97c 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -60,7 +60,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_WRITE_SWAPPED_DATA #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS, \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8a36620bf3ab..da1e409e5c77 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -92,7 +92,7 @@ FTIM2_NOR_TWPH(0x0e)) #define CFG_SYS_NOR_FTIM3 0 -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE_PHYS } diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e259cf810c0a..c79e113db4e4 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -92,7 +92,7 @@ #define CFG_SYS_FLASH_BASE_PHYS_EARLY 0x00000000 #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #endif #endif #endif diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 553ae841caba..e67ded55da6b 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -43,7 +43,7 @@ #define CFG_SYS_FLASH_BASE_PHYS_EARLY 0x00000000 #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #endif #endif diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index a34a71f649f6..0582a4568dc7 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -62,7 +62,7 @@ #define CFG_SYS_IFC_CCR 0x01000000 #ifndef SYS_NO_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE,\ CFG_SYS_FLASH_BASE + 0x40000000} diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index bd543a37e879..ee796facc06c 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -47,7 +47,7 @@ #define CFG_SYS_IFC_CCR 0x01000000 #ifndef SYS_NO_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE } #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 12b5af1b4f2f..d029d841d51e 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -64,7 +64,7 @@ #define CFG_SYS_IFC_CCR 0x01000000 #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE,\ CFG_SYS_FLASH_BASE + 0x40000000} diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 1259df8f3a9a..73477978be46 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -61,7 +61,7 @@ #define CFG_SYS_IFC_CCR 0x01000000 #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE,\ CFG_SYS_FLASH_BASE + 0x40000000} diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index de7c0d61c05f..93909eda55dd 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -199,7 +199,7 @@ #define CFG_FLASH_OR_PRELIM 0xfc000ff7 #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ /* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 2e422cd241e9..cb48538e62b4 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -13,7 +13,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index ab199bc726a6..aadcb30d0432 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -13,7 +13,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 7f739d9ada0e..1edd49a784d4 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -36,7 +36,7 @@ /* NOR */ #ifdef CONFIG_MTD_NOR_FLASH -# define CONFIG_FLASH_SHOW_PROGRESS 10 +# define CFG_FLASH_SHOW_PROGRESS 10 #endif #ifdef CONFIG_USB_EHCI_ZYNQ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 89f47538d4c7..c510c45d8795 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -31,7 +31,7 @@ CFG_FEC_MXC_PHYADDR CFG_FLASH_BR_PRELIM CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE -CONFIG_FLASH_SHOW_PROGRESS +CFG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV From patchwork Sun Nov 20 13:30: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: 1706740 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=HZ42B5B4; 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 4NFWqV2vQyz23n6 for ; Mon, 21 Nov 2022 00:40:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E4F40852F3; Sun, 20 Nov 2022 14:34: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="HZ42B5B4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48FC88527F; Sun, 20 Nov 2022 14:34: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-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 A3D268526F for ; Sun, 20 Nov 2022 14:34:19 +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 d18so2948225qvs.6 for ; Sun, 20 Nov 2022 05:34:19 -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=4R3l6TKM6dIUbOsszhe+/qstLiqMDPgJjOuJCEOheOA=; b=HZ42B5B4Q1pKWVmtLok/kXJEWGgD6KBHiXqDvEc5Rf0aeuMG2jtpoH8uZMhY9Pilu1 zuDa8Qy9ncMmM3Z+BMdL4UGrigurg/SMXpYwvZbOyzkcPgXopCQeLn6+XZEiyJguZl4t 0kK/WicfuVzo2jan/6Eau9sIiaRmInuNSiMYg= 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=4R3l6TKM6dIUbOsszhe+/qstLiqMDPgJjOuJCEOheOA=; b=bDvlxThkaCR46JDInq9T1E8O2iwqfmzrl19RUJQBwUd1PiQ4prh1sr7rNDvAqAFUW/ KVt55QVAK3YQLo+sTQlOgEkF3ZHhSoPDwtx64lIxiTaujj4xJUeTmwFmRHNP0GdTX4v4 VqQLrERU9W7NQDaByeqnTGCg8VtffAjRT3KHgcoPBxc1lP2Aw3avw+MKHwsWDWl+ObJY IVuL5kppzsoFaXEJxWhCCHj7ImQHkeHvgx6vi57/XblNapqba/nwS9LOWq+At+fXp91g eWVmH5mfXzcR7vEV1G27hS2zyHZ2D1ooSIjCKPJ0fmiOeIpmzsZZXC/sGvOVHMjH8mmM PjdA== X-Gm-Message-State: ANoB5pldojyi4VAumBzlpCozEhCU2s06pPC9QApA6c4mx0jaD0IxA3Oz VJqcdzQxzcF216ukQKu3burIu0g/7t8Q4Q== X-Google-Smtp-Source: AA0mqf7o0iy/4AfEQwCQDJdv4hAJnZ2F6KzNGmnlEgDl5Txv+a0G97nuOKqh1tLTWNYvNr5wPCrqtA== X-Received: by 2002:a05:6214:5157:b0:4c6:942b:3a5c with SMTP id kh23-20020a056214515700b004c6942b3a5cmr513248qvb.1.1668951258186; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:17 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 032/241] global: Migrate CONFIG_FLASH_SPANSION_S29WS_N to CFG Date: Sun, 20 Nov 2022 08:30:23 -0500 Message-Id: <20221120133352.3055600-33-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- README | 2 +- drivers/mtd/cfi_flash.c | 2 +- include/configs/M53017EVB.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index ea5f4cc10659..0c8932425cad 100644 --- a/README +++ b/README @@ -1477,7 +1477,7 @@ Configuration Settings: - CONFIG_SYS_FLASH_USE_BUFFER_WRITE Use buffered writes to flash. -- CONFIG_FLASH_SPANSION_S29WS_N +- CFG_FLASH_SPANSION_S29WS_N s29ws-n MirrorBit flash has non-standard addresses for buffered write commands. diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 75765d76ea29..f3abe7842b69 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -991,7 +991,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, case CFI_CMDSET_AMD_EXTENDED: flash_unlock_seq(info, sector); -#ifdef CONFIG_FLASH_SPANSION_S29WS_N +#ifdef CFG_FLASH_SPANSION_S29WS_N offset = ((unsigned long)dst - info->start[sector]) >> shift; #endif flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER); diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index ad27766cf0f4..6d97e6ca84ab 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -93,7 +93,7 @@ * FLASH organization */ #ifdef CONFIG_SYS_FLASH_CFI -# define CONFIG_FLASH_SPANSION_S29WS_N 1 +# define CFG_FLASH_SPANSION_S29WS_N 1 # define CFG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */ #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c510c45d8795..16467a0bb8c9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -32,7 +32,7 @@ CFG_FLASH_BR_PRELIM CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE CFG_FLASH_SHOW_PROGRESS -CONFIG_FLASH_SPANSION_S29WS_N +CFG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV CONFIG_FSL_CPLD From patchwork Sun Nov 20 13:30: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: 1706738 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=Bzypr0T3; 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 4NFWq410sTz23lt for ; Mon, 21 Nov 2022 00:40:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3552D852E8; Sun, 20 Nov 2022 14:34: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="Bzypr0T3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7ED3A8527F; Sun, 20 Nov 2022 14:34: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-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 738E485213 for ; Sun, 20 Nov 2022 14:34:19 +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 p18so6507007qkg.2 for ; Sun, 20 Nov 2022 05:34:19 -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=mW+o544acvPuq7g4U2d6niP58Gvuolyopdw84xAJMm8=; b=Bzypr0T3WrpjXAXpK3tO/BOaMuYVhEvNwrJ8PthwmhKjy3+pdKruHgOrAPcgAkF8E7 MWxz//0pGy/uo3bwWTuvtbXDEz2DS7TJxzBFD57XSe4TaNFznm2aSgMg/WSygEWylq22 YkYEp3JR2Lkhn/RalBYLhmT4l70MJXDXK05cA= 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=mW+o544acvPuq7g4U2d6niP58Gvuolyopdw84xAJMm8=; b=lw8jSCpa0N3iMUWOlLOQ6LYVUaQck122smAe9ZwozDwlnHs4ssAhyOOaMFEZ5A5Xpo PQGFaiyvavgGkM8Z0g+eoLzGVO1H7g9lGZGFlnyssEApQTTN85/ynTi+p6qoTS4uDtzR lIkf3lRW4vJhZtbeolbK76WqVuRTJ9GIuO81uSATe3JJaFR5hTfU0sVhsUQdJDmE4QsI nTcWXxoSc/Qf42uCnjVXfpAUbzyaI3bKd117wilgjSDTVUa34jxPC64//P1kNhsqq4vR qyA66y5KPbuesFOJz1uQguboGtsotS3gSZoom61wjzrlBfMEHe0SLAw5StgZNfINL/d8 sBLg== X-Gm-Message-State: ANoB5pk7fBtMfLZPeywBy4DovC59EWIOBHwEpMno8kyG/BXeqDiNBejn jMYcbdCIwFVA1ZJFEG63QVM/lYrR9Nnkqw== X-Google-Smtp-Source: AA0mqf5/s0Cz5FhsTTpj+5TlEYooORhOy9WMKy9MHdkGA64gEd4x/K2/t7n6sRWbN4oith0cf87lnw== X-Received: by 2002:a05:620a:2694:b0:6f6:b34a:5333 with SMTP id c20-20020a05620a269400b006f6b34a5333mr12924958qkp.1.1668951258907; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:18 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 033/241] global: Migrate CONFIG_FLASH_VERIFY to CFG Date: Sun, 20 Nov 2022 08:30:24 -0500 Message-Id: <20221120133352.3055600-34-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- README | 2 +- common/flash.c | 2 +- include/configs/mccmon6.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 0c8932425cad..02ae72e009ef 100644 --- a/README +++ b/README @@ -1486,7 +1486,7 @@ Configuration Settings: digits and dots. Recommended value: 45 (9..1) for 80 column displays, 15 (3..1) for 40 column displays. -- CONFIG_FLASH_VERIFY +- CFG_FLASH_VERIFY If defined, the content of the flash (destination) is compared against the source after the write operation. An error message will be printed when the contents are not identical. diff --git a/common/flash.c b/common/flash.c index 848f44e59dfd..5ca715efad2b 100644 --- a/common/flash.c +++ b/common/flash.c @@ -166,7 +166,7 @@ flash_write(char *src, ulong addr, ulong cnt) src += len; } -#if defined(CONFIG_FLASH_VERIFY) +#if defined(CFG_FLASH_VERIFY) if (memcmp(src_orig, addr_orig, cnt_orig)) { printf("\nVerify failed!\n"); return ERR_PROG_ERROR; diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 4be47e78d676..9b2777339a10 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -25,7 +25,7 @@ /* NOR 16-bit mode */ #define CFG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR -#define CONFIG_FLASH_VERIFY +#define CFG_FLASH_VERIFY /* NOR Flash MTD */ #define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 16467a0bb8c9..8f68c6e736f6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -33,7 +33,7 @@ CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE CFG_FLASH_SHOW_PROGRESS CFG_FLASH_SPANSION_S29WS_N -CONFIG_FLASH_VERIFY +CFG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV CONFIG_FSL_CPLD CONFIG_FSL_ESDHC_PIN_MUX From patchwork Sun Nov 20 13:30: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: 1706742 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=mfZC4ybQ; 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 4NFWqw6Nhkz23n6 for ; Mon, 21 Nov 2022 00:40:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A399852EC; Sun, 20 Nov 2022 14:35: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="mfZC4ybQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C38EB8527A; Sun, 20 Nov 2022 14:34: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-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (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 180558527A for ; Sun, 20 Nov 2022 14:34:21 +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-xf2b.google.com with SMTP id k2so5286195qvo.1 for ; Sun, 20 Nov 2022 05:34:21 -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=m2E/QCn7wEL1bRBMpZG/YSDNPi1Rd/eaq5ZYtweHQyo=; b=mfZC4ybQGTFf9PXKVBAv6MB/Q6poHPPUgsDLc8MN2/rNhbYvxXDqIa/TcSi4Q2AG9x fN+n4lA6TyrBv2D/Z5x9furWyNHenKEUUTho/y2MCU+DFVlYzrO0UEvwlkZWPMkj+0rw NxObJnlO9mTCMF4qxxXTOS4ofUeLNHC/PyBgI= 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=m2E/QCn7wEL1bRBMpZG/YSDNPi1Rd/eaq5ZYtweHQyo=; b=YUhP6JxLLGzj20PsB4EfMrM3g5EFhjHW1ZdH1yRYg98s9StewsedEecei6LS6w1TZt fVTcQyCIe7iGb/o6XPklIXhHJOFtJKbm7dDJnZ0ctVLr1BP9zn/PV01ewfVjepKV1feQ QmDv5MTpYKwbnOAcSCm0BsBHniYNOPjdAKJdKQt7ckoq5io0bjhSPI9rTxOYo//qvypf ES47FW+hY75c8T1jtXz+T9KArlk5KadQQngr6OWPRaCXUWyCU/y5X5qMbcnkAYr76LtM svGvyPAKKZo5pD7MK1R9oV0TZRtl8tlIIbQ7GiJWzsQ6ebDsnqhWH85ruA89rxzHJbat 1dZA== X-Gm-Message-State: ANoB5pn1E3lahb6crA5rywWY5S6JhKnWrEy54e6UAbQj7+GnVLVTK9nI fyxIK0CuyjRhE8G5EhoLbOKWK0HagekBrA== X-Google-Smtp-Source: AA0mqf4q3nXsJWU2z/BXxinoigY2FSe3ln5h8rUY096xlTjRunw7au+QwjSuqksnLSE6qagyrkQwIw== X-Received: by 2002:a05:6214:514a:b0:4bb:9279:57cb with SMTP id kh10-20020a056214514a00b004bb927957cbmr2571747qvb.35.1668951259587; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:19 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 034/241] global: Migrate CONFIG_FM_PLAT_CLK_DIV to CFG Date: Sun, 20 Nov 2022 08:30:25 -0500 Message-Id: <20221120133352.3055600-35-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/powerpc/cpu/mpc85xx/speed.c | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index a6e352ceabb1..eec071022e59 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info) [14] = 4, /* CC4 PPL / 4 */ }; uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS]; -#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) +#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) uint rcw_tmp; #endif uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS]; @@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info) #define FM1_CLK_SEL 0x1c000000 #define FM1_CLK_SHIFT 26 #endif -#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) +#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) #if defined(CONFIG_ARCH_T1024) rcw_tmp = in_be32(&gur->rcwsr[15]) - 4; #else @@ -377,7 +377,7 @@ void get_sys_info(sys_info_t *sys_info) #endif #ifdef CONFIG_SYS_DPAA_FMAN -#ifndef CONFIG_FM_PLAT_CLK_DIV +#ifndef CFG_FM_PLAT_CLK_DIV switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) { case 1: sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK]; diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index d9e5a7d62170..29b08d56ee52 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -175,8 +175,8 @@ #define CONFIG_PME_PLAT_CLK_DIV 2 #define CFG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 -#define CONFIG_FM_PLAT_CLK_DIV 1 -#define CFG_SYS_FM1_CLK CONFIG_FM_PLAT_CLK_DIV +#define CFG_FM_PLAT_CLK_DIV 1 +#define CFG_SYS_FM1_CLK CFG_FM_PLAT_CLK_DIV #define CFG_SYS_FM_MURAM_SIZE 0x30000 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #define QE_MURAM_SIZE 0x6000UL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8f68c6e736f6..09e520c3f9d8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -34,7 +34,7 @@ CFG_FLASH_SECTOR_SIZE CFG_FLASH_SHOW_PROGRESS CFG_FLASH_SPANSION_S29WS_N CFG_FLASH_VERIFY -CONFIG_FM_PLAT_CLK_DIV +CFG_FM_PLAT_CLK_DIV CONFIG_FSL_CPLD CONFIG_FSL_ESDHC_PIN_MUX CONFIG_FSL_FM_10GEC_REGULAR_NOTATION From patchwork Sun Nov 20 13:30: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: 1706741 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=hCSK6l/r; 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 4NFWqj4tvwz23n6 for ; Mon, 21 Nov 2022 00:40:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 205D0852F7; Sun, 20 Nov 2022 14:35: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="hCSK6l/r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7F9D85262; Sun, 20 Nov 2022 14:34: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-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 B8DCB851DB for ; Sun, 20 Nov 2022 14:34: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-qk1-x72e.google.com with SMTP id x18so6505094qki.4 for ; Sun, 20 Nov 2022 05:34: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=T7l+heuzTZwf/sQeV0+XkSbnCClhtuNJzUJSeXgkR5M=; b=hCSK6l/ra9bwvHxOeGaG3WiMTZ1TSiUcDCajn807jNvEF/tYrpOYc7FNYgFb9FiOYS o8Nsus110xMZzE9rhB4Yb47sidlbl6zeS1uI/lg0BCj2OwM19UownYIRk0azYt6iWECR zsThuahAQ7KSWWgvJ/FCj7QY1SIi/y+PeVF3Y= 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=T7l+heuzTZwf/sQeV0+XkSbnCClhtuNJzUJSeXgkR5M=; b=PSuYRrLXG73D306cklDGY9B/HQiOY35becXMV6Ye+Oumfsa3B3JeJ4PLmS0aC/86QA nRIdBUoNND/dg12umuK1hPs1wzM2xRu9I6FEKE0rB+kqMhU0cW8msCLd13QMloVefG6W uETjI6OZ8f7afEZgKbdlhu+DqLav1GmnbGUR50fBhW4zcfHQ/Pyr54YpQONrS8qmjqHv 3EfVkXaaCa7Nog/lxjxVfMVsS54NE6Jbpq1bgrlkGpYUEtq1eVM02jkwbzb7SkRdTswl 42/sPBJBfJ5Vf3tBUORJHF8g7toNrbJ0Iiqwf+5KEmVTIgUhiTNLQGiVNvt1JnK2tk0G F4vQ== X-Gm-Message-State: ANoB5pmG1FHogmw0zR89XPRrira6gNdGxouZ3vLubwVeuKRoiDybIU4v 2ec61adUG2Q28jy4VjMZH2XVOiWDemw9Jg== X-Google-Smtp-Source: AA0mqf5DSsbOzlnVayvTSf8Slr43zxpl10HZ9cn/WAtQQswMag/jQBtHBYaqpjFqfaaj4dk/xOHX/Q== X-Received: by 2002:a37:ad0c:0:b0:6ee:91b3:2484 with SMTP id f12-20020a37ad0c000000b006ee91b32484mr12592417qkm.648.1668951260246; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:19 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 035/241] global: Migrate CONFIG_FSL_CPLD to CFG Date: Sun, 20 Nov 2022 08:30:26 -0500 Message-Id: <20221120133352.3055600-36-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/P2041RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index b05601489d85..f2179db6b9b4 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -88,7 +88,7 @@ #define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE #endif -#define CONFIG_FSL_CPLD +#define CFG_FSL_CPLD #define CPLD_BASE 0xffdf0000 /* CPLD registers */ #ifdef CONFIG_PHYS_64BIT #define CPLD_BASE_PHYS 0xfffdf0000ull diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 09e520c3f9d8..43d331938d51 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -35,7 +35,7 @@ CFG_FLASH_SHOW_PROGRESS CFG_FLASH_SPANSION_S29WS_N CFG_FLASH_VERIFY CFG_FM_PLAT_CLK_DIV -CONFIG_FSL_CPLD +CFG_FSL_CPLD CONFIG_FSL_ESDHC_PIN_MUX CONFIG_FSL_FM_10GEC_REGULAR_NOTATION CONFIG_FSL_ISBC_KEY_EXT From patchwork Sun Nov 20 13:30: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: 1706743 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=bQg4hNcu; 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 4NFWr74v1qz23n6 for ; Mon, 21 Nov 2022 00:40:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C57CB85305; Sun, 20 Nov 2022 14:35: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="bQg4hNcu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4CBBB8527A; Sun, 20 Nov 2022 14:34: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-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 583E58527D for ; Sun, 20 Nov 2022 14:34: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-x82e.google.com with SMTP id a27so5885189qtw.10 for ; Sun, 20 Nov 2022 05:34: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=pRQpxWl3ED5ZTtudg1c2L+FkgMJwAu08fAp8xcXFO+g=; b=bQg4hNcuyzx85ZQIltpdFzxldMCyMtWpcBUG5ByZoi7RYwtgNSEouyDyf6Z4kcGSZZ PEwQZMYYDy4L8CEXoifvZCcuprPaavp3qV3rbQFcsZBizjgo3LaHRV8eicR07n0Y5F1r e+Z7GNA0bLPjgckOEYZalv5LNqpfMiCS9bFAc= 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=pRQpxWl3ED5ZTtudg1c2L+FkgMJwAu08fAp8xcXFO+g=; b=ay1Sc6lTt0df3o+hddzNbZMBuJjT7tiW8w5gHx2yc5DaJt2GiFMOmV9wglCS2gpycq +x0ZLdAKNZvNx67s7IUgKMOiFc2QyBVogHVCQJjkSS6Mod+vuV1NXW+q7YPKvaGcd16H SGA3cxgKX76pLqwIiCLo/4NxisgjVzZHqvw+tL4Nd2zBcLjsezv8OqXuoXFPOfrh6jmp 8qDipN3l4G2OtYt+Ae4cM7dU5j/zfzzHpT3FGlzx9rqB9prsIMuCUqhko7Q7L0VS3ktU 4oIf5JLepn5J8ip7K5HW3kTFB9kL7utMWcHRqYbT9ZYrdbVcMxOIFwnZiEvxYs88q0Eu aonA== X-Gm-Message-State: ANoB5pkD4yRg+KB5m2G4itQE0LJ7em5QfFfQdH259lob4/hAnLbj5ris oj6SGvjXwFdUKkMIX/K0/BU9gSJXRlYF1g== X-Google-Smtp-Source: AA0mqf6djbVsIbwRblUiOwYhxaPPKAF7xFABDMIU9HXogbmvKV5l4KDflXv6uEfEGsFuef8WNOcdcw== X-Received: by 2002:ac8:74c1:0:b0:3a5:5a43:b2da with SMTP id j1-20020ac874c1000000b003a55a43b2damr13824087qtr.592.1668951260924; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:20 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 036/241] global: Migrate CONFIG_FSL_ESDHC_PIN_MUX to CFG Date: Sun, 20 Nov 2022 08:30:27 -0500 Message-Id: <20221120133352.3055600-37-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/mmc/fsl_esdhc.c | 2 +- include/configs/MPC837XERDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index d5066666698c..46f0a8b813e9 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -842,7 +842,7 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv, #ifdef CONFIG_OF_LIBFDT __weak int esdhc_status_fixup(void *blob, const char *compat) { - if (IS_ENABLED(CONFIG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) { + if (IS_ENABLED(CFG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) { do_fixup_by_compat(blob, compat, "status", "disabled", sizeof("disabled"), 1); return 1; diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2eea26d7bee7..9af76e830dc0 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -204,7 +204,7 @@ #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC_PIN_MUX +#define CFG_FSL_ESDHC_PIN_MUX #define CFG_SYS_FSL_ESDHC_ADDR CFG_SYS_MPC83xx_ESDHC_ADDR #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43d331938d51..278fc032799a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -36,7 +36,7 @@ CFG_FLASH_SPANSION_S29WS_N CFG_FLASH_VERIFY CFG_FM_PLAT_CLK_DIV CFG_FSL_CPLD -CONFIG_FSL_ESDHC_PIN_MUX +CFG_FSL_ESDHC_PIN_MUX CONFIG_FSL_FM_10GEC_REGULAR_NOTATION CONFIG_FSL_ISBC_KEY_EXT CONFIG_FSL_PMIC_BITLEN From patchwork Sun Nov 20 13:30: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: 1706770 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=F8MnJLlX; 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 4NFWxY42PYz23mR for ; Mon, 21 Nov 2022 00:45:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CAE0F85357; Sun, 20 Nov 2022 14:35: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="F8MnJLlX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77A1B85286; Sun, 20 Nov 2022 14:34: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-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 2074A85284 for ; Sun, 20 Nov 2022 14:34: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-xf2a.google.com with SMTP id c8so6451320qvn.10 for ; Sun, 20 Nov 2022 05:34: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=o+Zah7YAuVGgyuC1NJaywKchE6fnjRVP4xwDzLSjtOE=; b=F8MnJLlX7GiCRvjescZJDAMVjH/7445HDRtj4uh+A/j8OQzXvylmXmYvNMtaMVzTUE hqXvYNlyi+ZWpxAMxar7hR8QY9Khf+ljBmKtENzNxesyJVgo/pTls23j5t1+lEbXrsRY rUCpBJ38V/zTc2miJmRb4IozBadvU6dWeCD+Q= 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=o+Zah7YAuVGgyuC1NJaywKchE6fnjRVP4xwDzLSjtOE=; b=BO166KMaeGoYMEHro+/Y0WBpBdGDUvXLOXthozsDhcldm7KBueZtV/uqlXaAXSdgnp 0C6uTXtSIHHJvz5tPNQoxahXXhHfIiIlEyxv+bRA+2oyNSDMPvQs/kXPF6MYDixfpo3M 1R8+k1sG/pAWDSJpU96tcewKQUxvfNPdQoJNUHJTGLNFaX+Q8NPc9q6kOJBXvTdKP8ei CcnIkBhkXt/I6+fLe4UQK668LkKW7IwXedhiKb+VdRZZ8nD2iUMIKVe7KbEJXZl27HUh hwTWt0b0DLE2xTxd7jb0VMRrhXJYuOwsOxHPmizXA4KpU8Cc/dIWrOuczmP8zD9FcS6i bSmg== X-Gm-Message-State: ANoB5pkSEzYF/fj4HThBMCnXoYTWBYqUtr/bbo3tglEDq/9yFq4V+YxM 0312peGekR77iwHQI058builBIP4fquyDQ== X-Google-Smtp-Source: AA0mqf5+FZJDd+A7PgcREH2oSVuSXK5KTDBrq71D5TWi5ADtGlpav+15zvCr9sOF0Jc6HZ8elbYUkA== X-Received: by 2002:a05:6214:108a:b0:4bc:22ff:39ce with SMTP id o10-20020a056214108a00b004bc22ff39cemr13783730qvr.91.1668951261699; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 037/241] global: Migrate CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to CFG Date: Sun, 20 Nov 2022 08:30:28 -0500 Message-Id: <20221120133352.3055600-38-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- doc/README.fsl-dpaa | 4 ++-- drivers/net/fm/eth.c | 2 +- drivers/net/fm/init.c | 2 +- include/fm_eth.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 29b08d56ee52..410ae34e9504 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -189,7 +189,7 @@ #define CFG_SYS_NUM_FMAN 1 #define CFG_SYS_NUM_FM1_DTSEC 4 #define CFG_SYS_NUM_FM1_10GEC 1 -#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#define CFG_FSL_FM_10GEC_REGULAR_NOTATION #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FM1_CLK 0 #define CONFIG_QBMAN_CLK_DIV 1 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 283fdf3b458a..05b83952f231 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1303,7 +1303,7 @@ typedef struct ccsr_gur { #define FSL_CORENET_DEVDISR2_DTSEC1_6 0x04000000 #define FSL_CORENET_DEVDISR2_DTSEC1_9 0x00800000 #define FSL_CORENET_DEVDISR2_DTSEC1_10 0x00400000 -#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION #define FSL_CORENET_DEVDISR2_10GEC1_1 0x80000000 #define FSL_CORENET_DEVDISR2_10GEC1_2 0x40000000 #else diff --git a/doc/README.fsl-dpaa b/doc/README.fsl-dpaa index 3ef5eeb32e11..91c14ad12227 100644 --- a/doc/README.fsl-dpaa +++ b/doc/README.fsl-dpaa @@ -1,10 +1,10 @@ This file documents Freescale DPAA-specific options. FMan (Frame Manager) - - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION + - CFG_FSL_FM_10GEC_REGULAR_NOTATION on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below: 10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2 on SoCs T1024, etc, the notation between 10GEC and MAC as below: 10GEC1->MAC1, 10GEC2->MAC2 - so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on + so we introduce CFG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on which 10GEC enumeration is consistent with MAC enumeration. diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index c8381cc7133c..c84d1c0a713e 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -738,7 +738,7 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg) num = fm_eth->num; #ifdef CONFIG_SYS_FMAN_V3 -#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION if (fm_eth->type == FM_ETH_10G_E) { /* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240. * 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080. diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 618c1bccbe3f..23a25056f822 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -261,7 +261,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) } #ifdef CONFIG_SYS_FMAN_V3 -#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION /* * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same * dual-role MAC, when FM1_10GEC1 is enabled and FM1_DTSEC9 diff --git a/include/fm_eth.h b/include/fm_eth.h index aeb640925ee2..4f130a8d04a5 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -88,7 +88,7 @@ enum fm_eth_type { offsetof(struct ccsr_fman, memac[n-1]),\ } -#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION #define FM_TGEC_INFO_INITIALIZER(idx, n) \ { \ FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 278fc032799a..14823f42e61e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -37,7 +37,7 @@ CFG_FLASH_VERIFY CFG_FM_PLAT_CLK_DIV CFG_FSL_CPLD CFG_FSL_ESDHC_PIN_MUX -CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +CFG_FSL_FM_10GEC_REGULAR_NOTATION CONFIG_FSL_ISBC_KEY_EXT CONFIG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS From patchwork Sun Nov 20 13:30: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: 1706744 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=e+YTq4no; 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 4NFWrM0K7yz23n6 for ; Mon, 21 Nov 2022 00:41:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E94128530A; Sun, 20 Nov 2022 14:35: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="e+YTq4no"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80C9185289; Sun, 20 Nov 2022 14:34: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-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 E181785283 for ; Sun, 20 Nov 2022 14:34: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-x833.google.com with SMTP id e15so5910958qts.1 for ; Sun, 20 Nov 2022 05:34: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=8wR34Y9IFqIpAQflEaqM0+ZCo9uG2wFCC+YHNs6FC9M=; b=e+YTq4noKrQcQwbh5nwyHAoBxx3fNXqfA8qE1T/mUVaMVtsH+eyZw2D6M8wtoGgMMT +ps6WUb/EsX9pf8ZSfR69ABPr4oIyxZMYwEnFzFsrSQNmlwqclVPAdcL0d+JpdH1TQiL A7Q5CATZYWty7CCc0+cEiFX0KNSkaPYAEyZg4= 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=8wR34Y9IFqIpAQflEaqM0+ZCo9uG2wFCC+YHNs6FC9M=; b=lFBzxvj4k0EYN/WjTwvDvnjEhfn0+GRtUhl9mEQw6rXcGNgKpjFabAs21KUi9CNM7i zqgpdp0EM1WVEf6Qy+eBp/+JbbuOTwob0BpHFUaPPcS8qaLB2TIocTsCvb+yIyWJi8mk 3y20w7AhKdoMNMGFtNuH2IakLZN08widr5CIeuJSeSD5hyd10L6Eig4naV4jIDOs7rG5 jT9UuTkmhu8vNMKvL2aJIVfPUE6EVuza5SSNgn2ETVD15rku2e8X9jFrrt3A1ae6zCW5 uUkQuvuQ4U05hnDdosh4yCWAya2oYktn2APuzSV5bEXFo6uYOBML0Lmy/EBFktJkr3g8 aPFw== X-Gm-Message-State: ANoB5plBWKnAPwBWunekOA9EjltycPIGJnbgyELIFLTAp2+4m2skouJV pJJqE9/2lEZpkmBX0l2n7ZNHkfc40E8Yuw== X-Google-Smtp-Source: AA0mqf5ef+N8OJOlL29UP/DBOCXcWyluRN4VbzrgbBU8PGwhnMpgJkUrwSblUV03NlUup1+kD3tnQA== X-Received: by 2002:a05:622a:989:b0:3a5:270c:fbee with SMTP id bw9-20020a05622a098900b003a5270cfbeemr14317785qtb.74.1668951262317; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 038/241] global: Migrate CONFIG_FSL_ISBC_KEY_EXT to CFG Date: Sun, 20 Nov 2022 08:30:29 -0500 Message-Id: <20221120133352.3055600-39-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/fsl_secure_boot.h | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 2 +- board/freescale/common/fsl_validate.c | 18 +++++++++--------- include/fsl_validate.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index a4f4961fc877..39265f3e7be4 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -20,7 +20,7 @@ * is copied to XIP memory * Also, for LS, ISBC doesn't verify this table. */ -#define CONFIG_FSL_ISBC_KEY_EXT +#define CFG_FSL_ISBC_KEY_EXT #endif diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index e8b26802062b..033308a4ab39 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -51,7 +51,7 @@ * The feature is only applicable in case of NOR boot and is * not applicable in case of RAMBOOT (NAND, SD, SPI). */ -#define CONFIG_FSL_ISBC_KEY_EXT +#define CFG_FSL_ISBC_KEY_EXT #endif #endif /* #ifdef CONFIG_NXP_ESBC */ diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 285ed9afcc9a..947c8b74c02b 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -29,7 +29,7 @@ #define CHECK_KEY_LEN(key_len) (((key_len) == 2 * KEY_SIZE_BYTES / 4) || \ ((key_len) == 2 * KEY_SIZE_BYTES / 2) || \ ((key_len) == 2 * KEY_SIZE_BYTES)) -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) /* Global data structure */ static struct fsl_secboot_glb glb; #endif @@ -63,7 +63,7 @@ self: goto self; } -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) static u32 check_ie(struct fsl_secboot_img_priv *img) { if (img->hdr.ie_flag & IE_FLAG_MASK) @@ -188,7 +188,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img) { #ifdef CONFIG_ESBC_HDR_LS /* In LS, No SRK Flag as SRK is always present if IE not present*/ -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) return !check_ie(img); #endif return 1; @@ -278,7 +278,7 @@ static u32 read_validate_single_key(struct fsl_secboot_img_priv *img) } #endif /* CONFIG_ESBC_HDR_LS */ -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) static void install_ie_tbl(uintptr_t ie_tbl_addr, struct fsl_secboot_img_priv *img) @@ -434,7 +434,7 @@ void fsl_secboot_handle_error(int error) case ERROR_ESBC_CLIENT_HEADER_INVALID_KEY_NUM: case ERROR_ESBC_CLIENT_HEADER_INV_SRK_ENTRY_KEYLEN: #endif -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) /*@fallthrough@*/ case ERROR_ESBC_CLIENT_HEADER_IE_KEY_REVOKED: case ERROR_ESBC_CLIENT_HEADER_INVALID_IE_NUM_ENTRY: @@ -571,7 +571,7 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img) key_hash = 1; } #endif -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) if (!key_hash && check_ie(img)) key_hash = 1; #endif @@ -705,7 +705,7 @@ static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img) } #endif -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) if (!key_found && check_ie(img)) { ret = read_validate_ie_tbl(img); if (ret != 0) @@ -851,7 +851,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr) return -ENOMEM; memset(img, 0, sizeof(struct fsl_secboot_img_priv)); -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) if (glb.ie_addr) img->ie_addr = glb.ie_addr; #endif @@ -952,7 +952,7 @@ int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str, else ret = memcmp(srk_hash, img->img_key_hash, SHA256_BYTES); -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) if (!hash_cmd && check_ie(img)) ret = 0; #endif diff --git a/include/fsl_validate.h b/include/fsl_validate.h index 252d499e7b1a..7798a6e657bc 100644 --- a/include/fsl_validate.h +++ b/include/fsl_validate.h @@ -69,7 +69,7 @@ struct fsl_secboot_img_hdr { #define MAX_KEY_ENTRIES 8 #endif -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) #define IE_FLAG_MASK 0x1 #define SCRATCH_IE_LOW_ADR 13 #define SCRATCH_IE_HIGH_ADR 14 @@ -155,14 +155,14 @@ struct fsl_secboot_img_hdr { #define MAX_KEY_ENTRIES 4 #endif -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) #define IE_FLAG_MASK 0xFFFFFFFF #endif #endif /* CONFIG_ESBC_HDR_LS */ -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) struct ie_key_table { u32 key_len; u8 pkey[2 * KEY_SIZE_BYTES]; @@ -217,7 +217,7 @@ struct fsl_secboot_sg_table { * IE Table */ struct fsl_secboot_glb { -#if defined(CONFIG_FSL_ISBC_KEY_EXT) +#if defined(CFG_FSL_ISBC_KEY_EXT) uintptr_t ie_addr; struct ie_key_info ie_tbl; #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 14823f42e61e..0a0be8f05f00 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -38,7 +38,7 @@ CFG_FM_PLAT_CLK_DIV CFG_FSL_CPLD CFG_FSL_ESDHC_PIN_MUX CFG_FSL_FM_10GEC_REGULAR_NOTATION -CONFIG_FSL_ISBC_KEY_EXT +CFG_FSL_ISBC_KEY_EXT CONFIG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS CONFIG_FSL_PMIC_CLK From patchwork Sun Nov 20 13:30: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: 1706745 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=WwRna8Fn; 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 4NFWrY3MfHz23n6 for ; Mon, 21 Nov 2022 00:41:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E6988530E; Sun, 20 Nov 2022 14:35: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="WwRna8Fn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 95EC98528F; Sun, 20 Nov 2022 14:34: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-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 8C0C08526B for ; Sun, 20 Nov 2022 14:34: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-xf2a.google.com with SMTP id d18so2948301qvs.6 for ; Sun, 20 Nov 2022 05:34: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=ohcDbMXYLwlJSWFIMSXzj4MrT91zuH8PopuATkEcRgs=; b=WwRna8Fnz4xGkOPy8hIGq4ypeCexdoQjny+8AFrufK0Rp/wf27Eq7aLdP0z/YPu6fB RE96fvtJQ6BT34pvQ4s+bpTaL+Ls8cWTyosnEpvfwVQEZoaiQwPjCc4k+2e7MA7fzwNd WKIOvcqKErDS6z6OO4GuB9xJlkNSiFSiKK6RA= 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=ohcDbMXYLwlJSWFIMSXzj4MrT91zuH8PopuATkEcRgs=; b=z67wX+o2/nYMUyGpzq5CZpYMlOc2HSn0wohd5J0PpA/isHfz5qcR/T02/tfqBw5Pmw VjbfwUfCDZmJabauOHj0R57yXZAJUPio2t+p1ioIGHzrgIxnkazzD9a4YCaW75hwgjPS fMhkRWs20fwgQxYH4TsBF1+s+8LpQbKjatEWCU8AZwa0xEvdm/9lkT4WUeq8IHUn2wB8 CoHJPt3WtREC9nUlHy6igmY1qyc1pfcXJkbnlb1LjxJKlbfFNEhu2hSy/NmVV0170iSA 05fhT3lLtkuU3gCXvtPbA6nb2EAvnM2/Yg6ThisTVaNuvq7VQAWjCzwCnrIlt6XGt6el PC5w== X-Gm-Message-State: ANoB5pnfJ5xAEUHvWxoDXmQ5RH3E4+teVlDRTzp0uyiwyqEjLCpnH8W0 ihz4h5MVmZPlhGM2IbdgZ37Ht9NoI5xU7g== X-Google-Smtp-Source: AA0mqf5CnJTN9uTGCd4dNUaRurJagnfMKvzJcqjwepWJKt/3dv7roql3Dechyxi8ZMHm1PDlE0Uy6g== X-Received: by 2002:a05:6214:2c20:b0:4bb:73ab:bcdb with SMTP id lc32-20020a0562142c2000b004bb73abbcdbmr13630731qvb.8.1668951263040; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:22 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 039/241] global: Migrate CONFIG_FSL_PMIC_BITLEN to CFG Date: Sun, 20 Nov 2022 08:30:30 -0500 Message-Id: <20221120133352.3055600-40-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index 9bb7e39f2cc2..eace4dd7e433 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -42,7 +42,7 @@ int pmic_init(unsigned char bus) p->hw.spi.cs = CONFIG_FSL_PMIC_CS; p->hw.spi.clk = CONFIG_FSL_PMIC_CLK; p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; - p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN; + p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; p->hw.spi.prepare_tx = pmic_spi_prepare_tx; #elif defined(CONFIG_POWER_I2C) diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 8ab1ee79a79c..d4cca8d516a6 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -25,7 +25,7 @@ #define CONFIG_FSL_PMIC_CS 0 #define CONFIG_FSL_PMIC_CLK 2500000 #define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) -#define CONFIG_FSL_PMIC_BITLEN 32 +#define CFG_FSL_PMIC_BITLEN 32 /* * MMC Configs diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0a0be8f05f00..b5f3eb1236a1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -39,7 +39,7 @@ CFG_FSL_CPLD CFG_FSL_ESDHC_PIN_MUX CFG_FSL_FM_10GEC_REGULAR_NOTATION CFG_FSL_ISBC_KEY_EXT -CONFIG_FSL_PMIC_BITLEN +CFG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS CONFIG_FSL_PMIC_CLK CONFIG_FSL_PMIC_CS From patchwork Sun Nov 20 13:30: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: 1706746 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=DE/ZLiVs; 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 4NFWrl5Schz23n6 for ; Mon, 21 Nov 2022 00:41:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE681852C5; Sun, 20 Nov 2022 14:35: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="DE/ZLiVs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 199E98528F; Sun, 20 Nov 2022 14:34: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-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 171CF85266 for ; Sun, 20 Nov 2022 14:34: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-x729.google.com with SMTP id d7so6499045qkk.3 for ; Sun, 20 Nov 2022 05:34: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=e47AbIU43V/KZBAgg0lDTnQGtRFO6/iB98QwYcOlZlo=; b=DE/ZLiVsT0xMLx/7KjHYXvFtXGPTWziqjzS4F5SC9Mm4Q8lefFI+vsxZK0yLQ0bSF/ 64M/gOHVroLJ/xvFFqrASeSbEgIek7ScjVs87BJl94XxwF2SwJb2cQmOpgdyVU9Bd8dd bqyYkGpNt7LuFYvcT3Sdyi2EI920YZvJt2t94= 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=e47AbIU43V/KZBAgg0lDTnQGtRFO6/iB98QwYcOlZlo=; b=eaEkMdyAmSnFaH3zwutSoYPjd5MR0mYUv0NF0885t0aPZzPv2bj1PoMic4eiNtvhCX rWU39sq2hOY0QZDRfbTI/0d63LDd1XMwoEaeQsCbedacRylgLhCnCTfu8y8wbyzc0r/Z sLcwfrGfNCWMPJdiJvOJEXN2sNxAyQ4u8jcr8bXqLTfSsxaU/OJ69Zzx9QFoTLQk3BB6 qOKtIr34tRcdLmtlHTnvCUuArL0hd1FG8IDb//FnOSI69KZB60CDAh+zun2VILRpjlZs matO/+GcXFJmI+bBqDLWc0soE+9Ddt5jLSkquZlREnQabkuh8ZT+kAL17EkBBvdjwY5K 5DLg== X-Gm-Message-State: ANoB5pl/gAQBbgeImsTpgo44rEIE6d1IOK2zF6KxH2C9AL5KU7Ou8gwe gkIUVw+rykUrF1Y67/yjoMuDD+3xeomIGg== X-Google-Smtp-Source: AA0mqf4V0r9JWxdxrEd/iA0uiyJvgUlz1neWL4ElYHEhKIGPWqMxu9Jnf99jl83IpE0oeIhqx4NOZA== X-Received: by 2002:a37:4141:0:b0:6fa:1032:10a1 with SMTP id o62-20020a374141000000b006fa103210a1mr12774895qka.167.1668951263609; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:23 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 040/241] global: Migrate CONFIG_FSL_PMIC_BUS to CFG Date: Sun, 20 Nov 2022 08:30:31 -0500 Message-Id: <20221120133352.3055600-41-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/freescale/mx51evk/mx51evk.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 86364acf8ca0..95edb3599443 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -86,7 +86,7 @@ static void power_init(void) struct pmic *p; int ret; - ret = pmic_init(CONFIG_FSL_PMIC_BUS); + ret = pmic_init(CFG_FSL_PMIC_BUS); if (ret) return; diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index d4cca8d516a6..1aaa76240deb 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -21,7 +21,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* PMIC Controller */ -#define CONFIG_FSL_PMIC_BUS 0 +#define CFG_FSL_PMIC_BUS 0 #define CONFIG_FSL_PMIC_CS 0 #define CONFIG_FSL_PMIC_CLK 2500000 #define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b5f3eb1236a1..3b9ec9d59f61 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -40,7 +40,7 @@ CFG_FSL_ESDHC_PIN_MUX CFG_FSL_FM_10GEC_REGULAR_NOTATION CFG_FSL_ISBC_KEY_EXT CFG_FSL_PMIC_BITLEN -CONFIG_FSL_PMIC_BUS +CFG_FSL_PMIC_BUS CONFIG_FSL_PMIC_CLK CONFIG_FSL_PMIC_CS CONFIG_FSL_PMIC_MODE From patchwork Sun Nov 20 13:30: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: 1706808 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=BlEhyroE; 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 4NFX5c0v6sz23lt for ; Mon, 21 Nov 2022 00:52:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 31549851DB; Sun, 20 Nov 2022 14:38:19 +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="BlEhyroE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 135A28529F; Sun, 20 Nov 2022 14:38:14 +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 B1D648528A for ; Sun, 20 Nov 2022 14:34: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-x829.google.com with SMTP id h24so5890379qta.9 for ; Sun, 20 Nov 2022 05:34: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=Sc0n3xTzAs1VzxFQKG4Kqz1yIEvgatL7YJUCxMHT2Vc=; b=BlEhyroEE93ZT1vRSOaCf9aV3GIu+2GDPEi2Kuj+P+t6lPtPV2wn/ZWzGlrhml/AYA d9CmllXiE7xnUnLQWwlrB/Dm6+1KNcSpwvsDUJ2oJbNYzIRSxUa4hDA832bfGx7GuLeG cTsbrt0W0F7PrSKjO66Eymz0W4c6cxUCSP51M= 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=Sc0n3xTzAs1VzxFQKG4Kqz1yIEvgatL7YJUCxMHT2Vc=; b=Ugi+N164/SIjWD2b2F8e+9JCB0yaW5p8gkueZ7CteB8ZBbgQezGxyiS+pJWiruE7/i daatDHyOVyqdWIeXyjckBrXAlvKi3XQd5j3xsLW6EbS8wWPPJTUjyZQlhLiQ7IfCpDb6 7XRWN3alGW4f34nuXOtH9NmWeswwGseCDCA7rQ8atbocr9bivg3DndF09TtEJ4+fwi7a aao3UnZfEKPI1LOBO0PwgSa0SVrDDtD9iZjP6tKQoOXjO5DkO7XIDa/8EK68T/qHwEXG obPDAmZohsheCw9MI+e7zd4x696veDByRZlxv2/tHAims57whmTpXKmQWiChzrts0sAe vNTw== X-Gm-Message-State: ANoB5pkUNEOc/XzEIr93OK78zBBJQD6ZBNiSOm7tkS6TyE7yANwz85xq a7dRd9WEMT/zu3H3OS0JmTNqr3mpgqy73A== X-Google-Smtp-Source: AA0mqf57LWG9/gVNHTUQPtRHKZ0xKIf8BzA/hyRef+ADiCzlS0plG6s5r5BAXT4rDPdAm6hm/dDllQ== X-Received: by 2002:ac8:74d2:0:b0:3a5:26e0:ffc3 with SMTP id j18-20020ac874d2000000b003a526e0ffc3mr14087899qtr.391.1668951264230; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:23 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 041/241] global: Migrate CONFIG_FSL_PMIC_CLK to CFG Date: Sun, 20 Nov 2022 08:30:32 -0500 Message-Id: <20221120133352.3055600-42-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index eace4dd7e433..a576d1570b11 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -40,7 +40,7 @@ int pmic_init(unsigned char bus) #if defined(CONFIG_POWER_SPI) p->interface = PMIC_SPI; p->hw.spi.cs = CONFIG_FSL_PMIC_CS; - p->hw.spi.clk = CONFIG_FSL_PMIC_CLK; + p->hw.spi.clk = CFG_FSL_PMIC_CLK; p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 1aaa76240deb..ee0782ebfebf 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -23,7 +23,7 @@ /* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0 #define CONFIG_FSL_PMIC_CS 0 -#define CONFIG_FSL_PMIC_CLK 2500000 +#define CFG_FSL_PMIC_CLK 2500000 #define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) #define CFG_FSL_PMIC_BITLEN 32 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3b9ec9d59f61..d006554e3d2b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -41,7 +41,7 @@ CFG_FSL_FM_10GEC_REGULAR_NOTATION CFG_FSL_ISBC_KEY_EXT CFG_FSL_PMIC_BITLEN CFG_FSL_PMIC_BUS -CONFIG_FSL_PMIC_CLK +CFG_FSL_PMIC_CLK CONFIG_FSL_PMIC_CS CONFIG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3 From patchwork Sun Nov 20 13:30: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: 1706747 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=BSXqV10X; 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 4NFWrz2WJfz23nH for ; Mon, 21 Nov 2022 00:41:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8A0C85314; Sun, 20 Nov 2022 14:35:13 +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="BSXqV10X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B349585266; Sun, 20 Nov 2022 14:34: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-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 7CB4585262 for ; Sun, 20 Nov 2022 14:34: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-qv1-xf2a.google.com with SMTP id c8so6451365qvn.10 for ; Sun, 20 Nov 2022 05:34: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=1dgGONvjk/t442DoCWE4Ov7ExvBRnCYSTCM6m1oh/CU=; b=BSXqV10XB4C6Bi5Q3U6gp4oT/r2asHHNW2anG9E7vK/LebdsIFus/OTgNTXcwF26w5 FUV27463s1cZhvx/Zun1jjBj3eOoRZXH3qytQ5shgIrwgRdmDG3y8aPkdNyyiLiXmPd5 1fFlIHOzXX5XlNqAYQmr94hUQsw2c6YxUU5d0= 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=1dgGONvjk/t442DoCWE4Ov7ExvBRnCYSTCM6m1oh/CU=; b=Yq1DCnwItJgsqCSMqrqXi8i6k+citQHIB6gRTvt4shyawEo3PeQkfO+oIxLHvHdpeP nw7jj3NLR917LSL54vT2jT0rJzhS7q/rMOBbkHaaCo3JFJb04asOPqlmvpMoeDqYcyr0 2OY1E63ENkFxZa9SX0A/dsdZa2SuUaUn+/LGpFbxf/ql5qzOSqeomlfSvWYWtjhrBrnd 7WWUyaL61YNh2hBDsTUBKUeHwuLGyIWZdbfwJHMX1cvES5fmxgDGk0hs3/WJam9R75L2 jRNuFQG2XoFEvtGS9z+pp9diVkdQfwwmu54pjrfdDI/Izth265j6BYB10w3jZlu/TVk3 2mXA== X-Gm-Message-State: ANoB5pledSKexyU3xTbTd4vCG8PpgAAzjshXOkg20yH3iNBQIaYgYM9K 4yppX72TBLhClxUcy8l8EX6WHoStz5gLaA== X-Google-Smtp-Source: AA0mqf6R8VUe5LhPHIAJt5sxXyo5knc6ncLy/bPVUE8QDF8mvflPTW5XOalBnPG9B+fexqIaU+VI4g== X-Received: by 2002:a0c:ea87:0:b0:4b1:95bf:57f2 with SMTP id d7-20020a0cea87000000b004b195bf57f2mr13759431qvp.113.1668951264885; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:24 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 042/241] global: Migrate CONFIG_FSL_PMIC_CS to CFG Date: Sun, 20 Nov 2022 08:30:33 -0500 Message-Id: <20221120133352.3055600-43-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index a576d1570b11..9ead212f380e 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -39,7 +39,7 @@ int pmic_init(unsigned char bus) #if defined(CONFIG_POWER_SPI) p->interface = PMIC_SPI; - p->hw.spi.cs = CONFIG_FSL_PMIC_CS; + p->hw.spi.cs = CFG_FSL_PMIC_CS; p->hw.spi.clk = CFG_FSL_PMIC_CLK; p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index ee0782ebfebf..15bc4c706fdd 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -22,7 +22,7 @@ /* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0 -#define CONFIG_FSL_PMIC_CS 0 +#define CFG_FSL_PMIC_CS 0 #define CFG_FSL_PMIC_CLK 2500000 #define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) #define CFG_FSL_PMIC_BITLEN 32 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d006554e3d2b..a6598b01bb61 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -42,7 +42,7 @@ CFG_FSL_ISBC_KEY_EXT CFG_FSL_PMIC_BITLEN CFG_FSL_PMIC_BUS CFG_FSL_PMIC_CLK -CONFIG_FSL_PMIC_CS +CFG_FSL_PMIC_CS CONFIG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 From patchwork Sun Nov 20 13:30: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: 1706750 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=TBxUDW1e; 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 4NFWsB3XZlz23n6 for ; Mon, 21 Nov 2022 00:41:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDDE785318; Sun, 20 Nov 2022 14:35: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="TBxUDW1e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47F7185280; Sun, 20 Nov 2022 14:34: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-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 2315E85288 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x82e.google.com with SMTP id a27so5885256qtw.10 for ; Sun, 20 Nov 2022 05:34:26 -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=b+H3HJkJlsKE1QdW/WW8V8QePApE1SkioZcSeag3X9A=; b=TBxUDW1e7LfTEQ/xFlR5FizzMNnsWnQ15//oIS6SrxMy9PsTf5WwMqgfDDn0K8j/FH gdY++IBl3kVRRg/XBuCnRZRfKvwepuyEwQVRG5vejbiRTZIsAlagCtt6snDqPNcHoW2I KslsRh0MPCtb9sIAx6b6hmYdc9s/Tuwxcdiy4= 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=b+H3HJkJlsKE1QdW/WW8V8QePApE1SkioZcSeag3X9A=; b=Z/G72Jfg76Aa+jfTyEZV8FEF1/xvwUANThGIUqeUAfdjD8eYR9Ai5hmvUMbmnPn2K1 4jnOKUViLB7Au5H2tEu7HhQWuJXJGj3tp0YZ/BcB11J2wRLtJ1YW04KimurhCUjIeQgQ dSwlVNbFV029L9or/EwyKrE5IoATQuZdj3G3fJZak6Elk0zsOrB9WdCi/SL+O9CvXFLV yk3AXpdq9KX30CPqKfaHKjqp3k18lMVK8SxTLF9VABH6NDxqDC+Ys/Zy8dCm0y4PNc0D chz3hAnpiZYL+RNoCIAfMXLfn36FwFVkm1q6f2EeacP4hguDWIW+AdPE1hY0F3ivtqTc x7cA== X-Gm-Message-State: ANoB5plFsApdZtXvkXG5yWdJGLYgzO4noBZzWPPlPWNGcnFgeE7TZKz5 iqiu3NjpNrojMXILhxo1oEnKU5V49DZf1Q== X-Google-Smtp-Source: AA0mqf5BlQ/xNOrQjH5Z7URytSM4HRXlFuIzamLXpqTDFVxFw8PEQMH1kwnALyZkNrSEBoIxeUbIpQ== X-Received: by 2002:ac8:66d6:0:b0:3a5:f871:572c with SMTP id m22-20020ac866d6000000b003a5f871572cmr14161442qtp.230.1668951265636; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:25 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 043/241] global: Migrate CONFIG_FSL_PMIC_MODE to CFG Date: Sun, 20 Nov 2022 08:30:34 -0500 Message-Id: <20221120133352.3055600-44-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index 9ead212f380e..9dc930fb305a 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -41,7 +41,7 @@ int pmic_init(unsigned char bus) p->interface = PMIC_SPI; p->hw.spi.cs = CFG_FSL_PMIC_CS; p->hw.spi.clk = CFG_FSL_PMIC_CLK; - p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; + p->hw.spi.mode = CFG_FSL_PMIC_MODE; p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; p->hw.spi.prepare_tx = pmic_spi_prepare_tx; diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 15bc4c706fdd..740e357e00e9 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -24,7 +24,7 @@ #define CFG_FSL_PMIC_BUS 0 #define CFG_FSL_PMIC_CS 0 #define CFG_FSL_PMIC_CLK 2500000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) +#define CFG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) #define CFG_FSL_PMIC_BITLEN 32 /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a6598b01bb61..8ba453991703 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -43,7 +43,7 @@ CFG_FSL_PMIC_BITLEN CFG_FSL_PMIC_BUS CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS -CONFIG_FSL_PMIC_MODE +CFG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2 From patchwork Sun Nov 20 13:30: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: 1706752 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=Oum4LPa8; 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 4NFWsd11Vlz23n6 for ; Mon, 21 Nov 2022 00:42:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C94528531E; Sun, 20 Nov 2022 14:35: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="Oum4LPa8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C40A85294; Sun, 20 Nov 2022 14:34: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-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 C26558528E for ; Sun, 20 Nov 2022 14:34: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-qv1-xf2d.google.com with SMTP id s18so4872764qvo.9 for ; Sun, 20 Nov 2022 05:34: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=i4ctJm5ERmFlupSY6LJf6dxxAq3nBdHP8LhIXzTJiqk=; b=Oum4LPa8ZXryQQ5LYIipGEtsw6Nid06tIO6piwZW3OhTzZ4+8/RuQVvqWeF+UOEig8 lhLveAUHWnVoXBcx+fERUU4q5wmak91iryBEuMCQkdUqSliZ5YZiCotL/mYUcaYjTHP3 2FAB8rbxvh7AywYc3aRiynmIDmzmlc4UpaV4A= 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=i4ctJm5ERmFlupSY6LJf6dxxAq3nBdHP8LhIXzTJiqk=; b=qH/cOOe481zQJHBbGYjbhcX7Qo3OO7QahOAugCajU9Lw/ssPTeR6BvDAPuS71Yyarw zH14HibeAVGgTuOO87L8PyEB2mY20d03ota6DrjFnGMYDE8IFTsObNmwSjHeG7RacPCJ V0jBQz9fFbdDQXa6GpoSfgjyFOrztrwP9Y+s4C6zJJ9huqB0iK6RPvkKFPhJ1wVpZmSJ /PIBCyvIDGV9vR4qT1IGpNQpe6SmYFH2zjJXkzDG6FO2hMn+AOAf4mmh84vcoLBdnUEC YwhZZf5ciQeLBDjGlaAX30ZSxVMl8fzkRndwIbdz3e2pj2XFNAHX6tcbfUp2Tiwf95WI Oo2g== X-Gm-Message-State: ANoB5pmqVMqELLhk+bq8ke7oZ2D68BEr+7H1zIhtHt8l24KF90FAGvmN zMycG+KQNNCagrh+pYJgaIlQFC72nUrJTg== X-Google-Smtp-Source: AA0mqf6as/YvMbXdr3eKt1iZGlxwA+5Cx6NDgWdlDPmDhLS9HkOQMbWgx9d3+A3CzRmTLqK9IyoOXw== X-Received: by 2002:a05:6214:458c:b0:4c6:aa7b:56d9 with SMTP id op12-20020a056214458c00b004c6aa7b56d9mr1490781qvb.44.1668951266448; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:25 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 044/241] global: Migrate CONFIG_FSL_SDHC_V2_3 to CFG Date: Sun, 20 Nov 2022 08:30:35 -0500 Message-Id: <20221120133352.3055600-45-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++---- include/fsl_esdhc.h | 2 +- include/fsl_esdhc_imx.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 410ae34e9504..d6b2b9b469a3 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -23,7 +23,7 @@ #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM 2 #elif defined(CONFIG_ARCH_P1010) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 @@ -107,12 +107,12 @@ #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #elif defined(CONFIG_ARCH_BSC9131) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3 #elif defined(CONFIG_ARCH_BSC9132) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3 @@ -220,7 +220,7 @@ #elif defined(CONFIG_ARCH_C29X) -#define CONFIG_FSL_SDHC_V2_3 +#define CFG_FSL_SDHC_V2_3 #define CONFIG_TSECV2_1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FSL_SEC_IDX_OFFSET 0x20000 diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 7ab1460abc6e..b2c238461a1b 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -140,7 +140,7 @@ #define WML 0x2e044 #define WML_WRITE 0x00010000 -#ifdef CONFIG_FSL_SDHC_V2_3 +#ifdef CFG_FSL_SDHC_V2_3 #define WML_RD_WML_MAX 0x80 #define WML_WR_WML_MAX 0x80 #define WML_RD_WML_MAX_VAL 0x0 diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index b8efd2a1664c..dc789c0ba653 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -143,7 +143,7 @@ #define WML 0x2e044 #define WML_WRITE 0x00010000 -#ifdef CONFIG_FSL_SDHC_V2_3 +#ifdef CFG_FSL_SDHC_V2_3 #define WML_RD_WML_MAX 0x80 #define WML_WR_WML_MAX 0x80 #define WML_RD_WML_MAX_VAL 0x0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8ba453991703..1093721dca5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -44,7 +44,7 @@ CFG_FSL_PMIC_BUS CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS CFG_FSL_PMIC_MODE -CONFIG_FSL_SDHC_V2_3 +CFG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2 CONFIG_GATEWAYIP From patchwork Sun Nov 20 13:30: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: 1706751 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=H/zvzfAI; 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 4NFWsP28JXz23n6 for ; Mon, 21 Nov 2022 00:42:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EEFE48531C; Sun, 20 Nov 2022 14:35: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="H/zvzfAI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 626A985293; Sun, 20 Nov 2022 14:34: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-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 867CC85261 for ; Sun, 20 Nov 2022 14:34: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-x82a.google.com with SMTP id c15so5898408qtw.8 for ; Sun, 20 Nov 2022 05:34: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=k5UydhHxmFPn7qZR1xewLyalOA7uj1+bUPpOg6mLHKY=; b=H/zvzfAIHtwKfnnOakjUXH5ybs1vUXLkoNTp4OyTcVZJkG5UCUO9IIG0vzL1VDop4r Lf6Icz9aGvhb7/TWlnqWCQCYR3kc7paAQJtIErJNIlhcoA4iK+hkrSf8zL7Cepb+u1D7 nHuAcJaUoCW2honPO6UYGOW22z+hVR95qu8wg= 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=k5UydhHxmFPn7qZR1xewLyalOA7uj1+bUPpOg6mLHKY=; b=YsTSfdlscBNkEM9VKYJXW+GaVXOxVnPxsLVEny47X2nZxEwMBfyQvJiV+zLnfD1rhr NlwQMbQjyKXb6s/4xZPA9djOenb03JBmQe3mrqDtPzSUTCRILMWbmNlo4DXh6suYq6Yl qLb+F5soP87oHtv16ACjG0Qt6sp+1W0sT7py7f9OrYPOlFC4vHSvAYqcCQ7RGtMTQ2WS T7t2sMl9+/t8U/mYkBRLFwFcncW7bAGH+/fJejU7PhwoGKa3u1i0SU1dMS02IHizRfV+ RRdam5vQ9P5QmJVcr66QJk/du9+Hy+/VdBbxya3Eej7AoFDXfXcWu+Ec5ENNpmx8yWJR caIg== X-Gm-Message-State: ANoB5pkOF77NoKvQ2zWFN2lK2n8rmkKeGLCDM/RbnzEfynL3xYsA97VF Z/ag9vjMxnK4QQVt0LKcaiopIEwhJPDroQ== X-Google-Smtp-Source: AA0mqf6mtQsuyE87bn+jTiU4QXZZl8WXAQsW4mS5SSN89UdS+jkHIjO5o034zA6xKzPgKinjt00/ag== X-Received: by 2002:ac8:5506:0:b0:3a2:9e2f:2ead with SMTP id j6-20020ac85506000000b003a29e2f2eadmr13786873qtq.555.1668951266988; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:26 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 045/241] global: Migrate CONFIG_FSL_SERDES1 to CFG Date: Sun, 20 Nov 2022 08:30:36 -0500 Message-Id: <20221120133352.3055600-46-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/freescale/mpc837xerdb/mpc837xerdb.c | 4 ++-- include/configs/MPC837XERDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 4a1455402650..9c08a2bfef02 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -146,7 +146,7 @@ int board_early_init_f(void) /* we check only part num, and don't look for CPU revisions */ switch (PARTID_NO_E(spridr)) { case SPR_8377: - fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, + fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); @@ -156,7 +156,7 @@ int board_early_init_f(void) FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8379: - fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, + fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 9af76e830dc0..4a3db8dec0ed 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -153,7 +153,7 @@ #define CFG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) /* SERDES */ -#define CONFIG_FSL_SERDES1 0xe3000 +#define CFG_FSL_SERDES1 0xe3000 #define CONFIG_FSL_SERDES2 0xe3100 /* I2C */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1093721dca5c..29d5b933b9df 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -45,7 +45,7 @@ CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 -CONFIG_FSL_SERDES1 +CFG_FSL_SERDES1 CONFIG_FSL_SERDES2 CONFIG_GATEWAYIP CONFIG_GMII From patchwork Sun Nov 20 13:30: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: 1706810 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=doXpP54M; 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 4NFX615ck5z23lt for ; Mon, 21 Nov 2022 00:52:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78D4B8529F; Sun, 20 Nov 2022 14:38:21 +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="doXpP54M"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A0A785290; Sun, 20 Nov 2022 14:38:16 +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 4D5568528C for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x731.google.com with SMTP id p18so6507113qkg.2 for ; Sun, 20 Nov 2022 05:34:28 -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=wzz07AZOmq2QPeCI6B10r+qIJmqn6HUhBAx1eHccHrU=; b=doXpP54MqBOW1bbvoL+7T6Rb/dAnDuADA0wkTPx32de9cOEyP81BkxgnBHVpX3ga7V erfaZT6s7R2HMEodWUmsFiW5PIBvt5nuuA9vLyZFsltPYR6BNc/qRtjqTA1H9FafUTdN cTUnFsYRX4fzf6En8bnjLcQ7dZLtwHtFXGVEY= 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=wzz07AZOmq2QPeCI6B10r+qIJmqn6HUhBAx1eHccHrU=; b=sQQZB1FSxOOj8LujJ7tAAsnSjCI0AZsABpBFLZfYtzBcEjAt19/gTS328N1gMNF1HY nttmmzdBVeZMdZpbflGjVUPFQ+rOG4yc4mF9134YtfqrF4wA28Th7vLzOlrvsw/DbJEg oljQOaxFGfLq4fP/CVG0UsySU/T3ueDJKkALd3kxS/4wbjmEEJbJXQrZxAxQCxmu3opF ts+uyUeJ5/w+BmPvn4dFqCNQhl46nKdPRI8cgX8tMYNhTsOS+gFTiIgvD4WD8zcTj2gt 568beqsAuQDOiZAA8eXaE5BhTD1pfFKUVjfsfku0fnYxOXhecMr1K9MxK+ZrFt/r3Iqa hb1A== X-Gm-Message-State: ANoB5pkdEffDo6SQhkiO5q68tGyhuEuNZXb6oKo/vgSDPVg8l+2jsr4x N4u/QQrOmKTBXQFZwRCVsX0u39tU+us+/w== X-Google-Smtp-Source: AA0mqf7S7oHdCUdh3tbb7fmVUV3VKCeQHA0nurxEcR7HVatXraGuSnlES/OJC9YfI3Ng/firk4ET2w== X-Received: by 2002:a05:620a:c95:b0:6fa:91f9:c84d with SMTP id q21-20020a05620a0c9500b006fa91f9c84dmr12648841qki.724.1668951267807; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:27 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 046/241] global: Migrate CONFIG_FSL_SERDES2 to CFG Date: Sun, 20 Nov 2022 08:30:37 -0500 Message-Id: <20221120133352.3055600-47-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++--- include/configs/MPC837XERDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 9c08a2bfef02..8b1bfe0a9f91 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -148,17 +148,17 @@ int board_early_init_f(void) case SPR_8377: fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); - fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, + fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8378: - fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, + fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8379: fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); - fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA, + fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; default: diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 4a3db8dec0ed..2e1264978908 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -154,7 +154,7 @@ /* SERDES */ #define CFG_FSL_SERDES1 0xe3000 -#define CONFIG_FSL_SERDES2 0xe3100 +#define CFG_FSL_SERDES2 0xe3100 /* I2C */ #define CFG_SYS_I2C_NOPROBES { {0, 0x51} } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 29d5b933b9df..ea7eaef5d15f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -46,7 +46,7 @@ CFG_FSL_PMIC_CS CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 -CONFIG_FSL_SERDES2 +CFG_FSL_SERDES2 CONFIG_GATEWAYIP CONFIG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM From patchwork Sun Nov 20 13:30: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: 1706753 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=sDriqVgx; 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 4NFWsv1Lp7z23n6 for ; Mon, 21 Nov 2022 00:42:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B8EF685322; Sun, 20 Nov 2022 14:35: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="sDriqVgx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C51CA85299; Sun, 20 Nov 2022 14:34: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-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 D09B185262 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72d.google.com with SMTP id z1so6497727qkl.9 for ; Sun, 20 Nov 2022 05:34:29 -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=0QzJBwCQgOl3fI6zHZe2IRvF88Ki0zhBBQt4x86LXkY=; b=sDriqVgxxSrELFuzdw2msXvBm570okMwxwGFg05OdleLQRuXQTIM7VCW4u40qHmR1x 18ECghazCZ06S8tqmdnI8S6lPn6+NPFJqFhIm8FVSssRgzbg+0bGfB6HehQt4RoX6fe7 1A5KEc4htpfqiCG7LRiLx46ds+YsXLnOjIAd0= 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=0QzJBwCQgOl3fI6zHZe2IRvF88Ki0zhBBQt4x86LXkY=; b=lBVbEr0PGXJDTo/lLR3hQUFOY57HBcRPnQI1PTXRj26wF3Hb3GZPaX/T1/S9/ZxCpC Ahs20IEqkEqo57kiPQUbt3stZVT3uZhbzHCnLCUYvVmxgfkqiVNaQlHjXsTOwa667s5e W2Gf70MfAQI9HydgbdrIrcrf8pDP1dO/+OBsqZiGdOfQPvzVmCqVdLJXqKefZPS3xeBn ZHMLNMt5ms3xjX1uGF2/67lvhG0GoaG3ZXnJO/iY4m1T0hyQkguJeSN9mgCKvZZBN2GR bm5Ij2y/+NODz6Qmrpjw5LSoPCjsQFM8PJn7h8r//RfQHtKjvAzzhp5Jzd6YzeaGJynZ jFtQ== X-Gm-Message-State: ANoB5pmuYCLm9vu2WcZPFCvN9ib8g3qYdUUqI0FVFLIF6rIiYNUgP094 hgNHmTTXBdipdbJAoATi3wonLGxx7VKu6A== X-Google-Smtp-Source: AA0mqf7Znz/p1QtwTC8Y1TkeoRxJUl3LKbiADORUxL4hwTGFscdih9qs4iew4UoPO5uI7uE4AGRdLQ== X-Received: by 2002:a05:620a:10b4:b0:6fb:f17e:c8f8 with SMTP id h20-20020a05620a10b400b006fbf17ec8f8mr3035397qkk.404.1668951268404; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 047/241] global: Migrate CONFIG_GATEWAYIP to CFG Date: Sun, 20 Nov 2022 08:30:38 -0500 Message-Id: <20221120133352.3055600-48-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- 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/MPC8548CDS.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 02ae72e009ef..d76058e1ab41 100644 --- a/README +++ b/README @@ -750,7 +750,7 @@ The following options need to be configured: (Environment variable "serverip") - Gateway IP address: - CONFIG_GATEWAYIP + CFG_GATEWAYIP Defines a default value for the IP address of the default router where packets to other networks are diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ef3837e137c7..83ffe7ce76d9 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -21,7 +21,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5208EVBe" diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index a31d44177362..fc56834bd9be 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -30,7 +30,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5235EVB" diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 501785ac82e0..78eeca342c82 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5272C3" diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 3912aae750d4..afc19de8ce73 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5282EVB" diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 6d97e6ca84ab..1fcc34184928 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -34,7 +34,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M53017" diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index f8aabe4944a4..a49cf6dacb81 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -26,7 +26,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5329EVB" diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 228fcde98dc3..53434881f4c7 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -28,7 +28,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5373EVB" diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 515e88cf8206..e93b3cb97517 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -332,7 +332,7 @@ #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ #define CONFIG_SERVERIP 192.168.1.1 -#define CONFIG_GATEWAYIP 192.168.1.1 +#define CFG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index c8c0fc671ab0..204a9b0b5458 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -18,7 +18,7 @@ #define CONFIG_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 CONFIG_GATEWAYIP 0.0.0.0 +#define CFG_GATEWAYIP 0.0.0.0 #define CONFIG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */ #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2fe056cfef4a..874f75404712 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -48,7 +48,7 @@ */ #define CONFIG_SERVERIP 192.168.11.1 #define CONFIG_IPADDR 192.168.11.10 -#define CONFIG_GATEWAYIP 192.168.11.1 +#define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0 #if defined(CONFIG_ARM64) diff --git a/include/env_default.h b/include/env_default.h index 1621815f257a..7d0af83a5913 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -68,8 +68,8 @@ const char default_environment[] = { #ifdef CONFIG_ROOTPATH "rootpath=" CONFIG_ROOTPATH "\0" #endif -#ifdef CONFIG_GATEWAYIP - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0" +#ifdef CFG_GATEWAYIP + "gatewayip=" __stringify(CFG_GATEWAYIP) "\0" #endif #ifdef CONFIG_NETMASK "netmask=" __stringify(CONFIG_NETMASK) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea7eaef5d15f..e634d868a090 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -47,7 +47,7 @@ CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 CFG_FSL_SERDES2 -CONFIG_GATEWAYIP +CFG_GATEWAYIP CONFIG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM From patchwork Sun Nov 20 13:30: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: 1706755 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=bwsUVC2Q; 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 4NFWtP6z45z23n6 for ; Mon, 21 Nov 2022 00:42:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8415085329; Sun, 20 Nov 2022 14:35:19 +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="bwsUVC2Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D74685299; Sun, 20 Nov 2022 14:34: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, UPPERCASE_50_75 autolearn=no 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 8B59C8528F for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x736.google.com with SMTP id k4so6489917qkj.8 for ; Sun, 20 Nov 2022 05:34:30 -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=MEw6pRyYnWrkeJs13Y6QB9QctUj3TltMKev7Mn4dWQE=; b=bwsUVC2Q5ZRbhdMfpsL0taBhZ/UMD+pdRJmwrohl4cST9q+PxpnL7PvZYsDOGkoDcS 169QvL0uf5xH+xGSgCPJnOsVFboAJuqaEY3hQcID8042uFj2+SO1LOIMhftsyh/iwthl irMe6BlTv1Gc0rHQwrTj0UuxYH3/8ZAzmlvdc= 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=MEw6pRyYnWrkeJs13Y6QB9QctUj3TltMKev7Mn4dWQE=; b=J23NzvmNI1+cN6opJ5sXmc/brCPgwPRo2A7UAHOi0WNOSnsNNPsFVqWPXGWPBr34oW BaLypVEnoDlNcdT4Fv8Uiztm+x98WhcQU3+nhw+krlJCza5GcT3oK5QP1zRUubCZKw+9 WKXUX5Km0x4BEz9QN9hJ0kSW4dTZaveRLaM8yLwWQmlwb+JzyHh3HMDYmSFrOtDt1U5g sGMV7m4oZ/TJg4ooP3EjvIGeKF6YyLIemygZSJ+qjr1eGirQhOX3mtz07uJ6XR7CttPe n3G2kaEzYiz/FFVPGkcMjhSU9FIhd+G/oaQjP9UCoogUtwS2RLqmn93dq+nHeoBToX7k zz5A== X-Gm-Message-State: ANoB5pkepdBzibLoOUrFpA9ZAUCNl6PzOv5biY6aS72SyE98w9ppYADw 39PqjozuE7Nml7vRwmSWDLn3JGBhUAfsfg== X-Google-Smtp-Source: AA0mqf6fIo0mBNl5eLuppn9v/iQVKWh9SJFFya+YtHWtZkStzc8VuBeBen4/gCvP3zWe9GmVgWxNdQ== X-Received: by 2002:a05:620a:13b4:b0:6fa:b1e9:6f2d with SMTP id m20-20020a05620a13b400b006fab1e96f2dmr12926170qki.560.1668951269164; Sun, 20 Nov 2022 05:34:29 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 048/241] global: Migrate CONFIG_GMII to CFG Date: Sun, 20 Nov 2022 08:30:39 -0500 Message-Id: <20221120133352.3055600-49-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/net/mvneta.c | 6 +++--- drivers/net/mvpp2.c | 12 ++++++------ include/configs/MPC837XERDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d458..7bf744b483a7 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -192,7 +192,7 @@ DECLARE_GLOBAL_DATA_PTR; #define MVNETA_GMAC_FORCE_LINK_PASS BIT(1) #define MVNETA_GMAC_IB_BYPASS_AN_EN BIT(3) #define MVNETA_GMAC_CONFIG_MII_SPEED BIT(5) -#define MVNETA_GMAC_CONFIG_GMII_SPEED BIT(6) +#define MVNETA_GMAC_CFG_GMII_SPEED BIT(6) #define MVNETA_GMAC_AN_SPEED_EN BIT(7) #define MVNETA_GMAC_SET_FC_EN BIT(8) #define MVNETA_GMAC_ADVERT_FC_EN BIT(9) @@ -1163,7 +1163,7 @@ static void mvneta_adjust_link(struct udevice *dev) val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG); val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED | - MVNETA_GMAC_CONFIG_GMII_SPEED | + MVNETA_GMAC_CFG_GMII_SPEED | MVNETA_GMAC_CONFIG_FULL_DUPLEX | MVNETA_GMAC_AN_SPEED_EN | MVNETA_GMAC_AN_DUPLEX_EN); @@ -1187,7 +1187,7 @@ static void mvneta_adjust_link(struct udevice *dev) val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX; if (phydev->speed == SPEED_1000) - val |= MVNETA_GMAC_CONFIG_GMII_SPEED; + val |= MVNETA_GMAC_CFG_GMII_SPEED; else if (pp->speed == SPEED_100) val |= MVNETA_GMAC_CONFIG_MII_SPEED; diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 8c9afdf79aba..d9bdf2adad11 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -379,7 +379,7 @@ do { \ #define MVPP2_GMAC_EN_PCS_AN BIT(2) #define MVPP2_GMAC_AN_BYPASS_EN BIT(3) #define MVPP2_GMAC_CONFIG_MII_SPEED BIT(5) -#define MVPP2_GMAC_CONFIG_GMII_SPEED BIT(6) +#define MVPP2_GMAC_CFG_GMII_SPEED BIT(6) #define MVPP2_GMAC_AN_SPEED_EN BIT(7) #define MVPP2_GMAC_FC_ADV_EN BIT(9) #define MVPP2_GMAC_EN_FC_AN BIT(11) @@ -3064,7 +3064,7 @@ static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port) val = MVPP2_GMAC_EN_PCS_AN | MVPP2_GMAC_AN_BYPASS_EN | MVPP2_GMAC_CONFIG_MII_SPEED | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_FC_ADV_EN | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; @@ -3147,7 +3147,7 @@ static void gop_gmac_2500basex_cfg(struct mvpp2_port *port) */ val = MVPP2_GMAC_AN_BYPASS_EN | MVPP2_GMAC_EN_PCS_AN | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG); @@ -3188,7 +3188,7 @@ static void gop_gmac_1000basex_cfg(struct mvpp2_port *port) */ val = MVPP2_GMAC_AN_BYPASS_EN | MVPP2_GMAC_EN_PCS_AN | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG); @@ -4441,7 +4441,7 @@ static void mvpp2_link_event(struct mvpp2_port *port) val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG); val &= ~(MVPP2_GMAC_CONFIG_MII_SPEED | - MVPP2_GMAC_CONFIG_GMII_SPEED | + MVPP2_GMAC_CFG_GMII_SPEED | MVPP2_GMAC_CONFIG_FULL_DUPLEX | MVPP2_GMAC_AN_SPEED_EN | MVPP2_GMAC_AN_DUPLEX_EN); @@ -4451,7 +4451,7 @@ static void mvpp2_link_event(struct mvpp2_port *port) if (phydev->speed == SPEED_1000 || phydev->speed == 2500) - val |= MVPP2_GMAC_CONFIG_GMII_SPEED; + val |= MVPP2_GMAC_CFG_GMII_SPEED; else if (phydev->speed == SPEED_100) val |= MVPP2_GMAC_CONFIG_MII_SPEED; diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2e1264978908..dc7fe06ceb4b 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -183,7 +183,7 @@ */ #ifdef CONFIG_TSEC_ENET -#define CONFIG_GMII /* MII PHY management */ +#define CFG_GMII /* MII PHY management */ #define CONFIG_TSEC1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e634d868a090..8203c5ccee12 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -48,7 +48,7 @@ CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 CFG_FSL_SERDES2 CFG_GATEWAYIP -CONFIG_GMII +CFG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM From patchwork Sun Nov 20 13:30: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: 1706754 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=b3PCY0P0; 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 4NFWtB07zHz23n6 for ; Mon, 21 Nov 2022 00:42:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC1F985324; Sun, 20 Nov 2022 14:35: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="b3PCY0P0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A507285299; Sun, 20 Nov 2022 14:34: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-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 5994385276 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72d.google.com with SMTP id k2so6488429qkk.7 for ; Sun, 20 Nov 2022 05:34:30 -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=imIi8cuAOiLIZXTW1K9UdGixjbPjaGVSIldt3ufPsCY=; b=b3PCY0P0i8qfUiV9eEWKN/mJ4JJsfQaePo2MJaXusCQu6rjN3nM0+FaqFRTWwWRtsK /a/PjLx00yrThEUCCBIhIficyxhl3iO5QJ/fp/krIGuEezvkc7GnQXx5HZjVCqdGCWy8 IA2X5WOdee8EoDnaxuwlhOskW8PDgfITksgKw= 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=imIi8cuAOiLIZXTW1K9UdGixjbPjaGVSIldt3ufPsCY=; b=ypiWniGnMc/gb4C3lS3OUd21gQqsgVcUxmwhJUgBzNGAxc7ilvsv0QmY2tT+7FKkWj aspMqoFk1JBGoZFxbgEEhIxFz6lX6NQKFhKpUT7Z0g1seE0TQVpU/n5KYkgtg24f7ZcZ 99bvmy9MBYKDUHQ2kEZorzKVlg4Eb8ZDy9iYHrebZWp1gp8n9LJTuQGJJKSBcQknyln6 DMYnhl5KxfnHK2TafTjrRVFvP/fxcQYh8BX0pWX0RFD2yIZyMH6NsXla00BkjkRt3B7O T/X4mWlnDZwOBQ1lPeT7xl4/gJwxAIcOHc8RNwF5I/qnKFD4xrJ+JmhXH5K4LixEJCpz LW3Q== X-Gm-Message-State: ANoB5pkpKu75n0aBybIaGqkmwmdsxcr21pGaU0dbkKesg9hxo4ArZD+B vt/zqGi/gaEHhsFBwO43JwkbLTrVcT0DOg== X-Google-Smtp-Source: AA0mqf63U7+JttXshOIc/MRkdNA8UHDUEZOSvfPVcQ1PwUf4ZwoXGFZM4aR9V4cAHXetEFgmhIVGSg== X-Received: by 2002:a05:620a:1527:b0:6ec:ff06:8307 with SMTP id n7-20020a05620a152700b006ecff068307mr12511719qkk.683.1668951269799; Sun, 20 Nov 2022 05:34:29 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:29 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 049/241] global: Migrate CONFIG_G_DNL_THOR_PRODUCT_NUM to CFG Date: Sun, 20 Nov 2022 08:30:40 -0500 Message-Id: <20221120133352.3055600-50-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/samsung/common/gadget.c | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index 6d783e61e0d3..38d8773f9083 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -11,7 +11,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { if (!strcmp(name, "usb_dnl_thor")) { put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor); - put_unaligned(CONFIG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); + put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 81f450cde6c4..b29d9b0d5bac 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -17,7 +17,7 @@ /* USB Samsung's IDs */ #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index a1542f3f8025..c6f6246d76ce 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -22,7 +22,7 @@ /* THOR */ #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D /* UMS */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index f898d2d9ee52..5567505c8182 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -27,7 +27,7 @@ /* USB Samsung's IDs */ #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8203c5ccee12..f2304c23b80f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -49,7 +49,7 @@ CFG_FSL_SERDES1 CFG_FSL_SERDES2 CFG_GATEWAYIP CFG_GMII -CONFIG_G_DNL_THOR_PRODUCT_NUM +CFG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM From patchwork Sun Nov 20 13:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706814 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=Fjzd2aQp; 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 4NFX6q1wJvz23lt for ; Mon, 21 Nov 2022 00:53:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BA83853E2; Sun, 20 Nov 2022 14:38: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="Fjzd2aQp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96C19851DB; Sun, 20 Nov 2022 14:38: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-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 1546B85297 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72d.google.com with SMTP id z1so6497756qkl.9 for ; Sun, 20 Nov 2022 05:34:31 -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=/YY+x28WnJRJlnwDGWKYV0un9eUVwllGfnpPWaRk3eY=; b=Fjzd2aQpyDDTSda6zhAZviMLWKfbY0+TsKEEpzIyUhZyv9IqDPZOVHrIjOKbjMaes8 P1NsxTbY5DDBGzQniVTM2yX3LNvby9uuJHikBRsA1CicD6cLmHYCqWKq5tVvTv91wvUr fmpJKIRlJVQBgTy/jzIz+Do1yYGV1fywzk6oQ= 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=/YY+x28WnJRJlnwDGWKYV0un9eUVwllGfnpPWaRk3eY=; b=NqbtrBIp0hcT4ruX3dVz0fLUXY/RSj05AOyAB/KQ2Pr/T4PfBLrtcY/e+8BqdhGhXZ VGgwBwY+z3deui09/ID5JqGZRdFnOlIAl6C32ANDQRGDG8jyeOxF32Dxnte6NC0lHBJm pwEfFTxsdS3Hb1b8GdOyCj85MUQogaX54Y8jNHz1SF36hkkYccpqX2SZ8JMsE0I5CFNY moEOupGV0Ek3xbX05upvhPfVBa86g1xDN5cesUCCgU2dd2ifwfOLYDthZ3Ef63txPlkr oLOQ6WNwT606PvEQ6oRqbypN22JoBy3kyEs5dwk6CgVVH5xFEdcbJ11tl0R+StdzC6Dh AxSg== X-Gm-Message-State: ANoB5pm9dH+t23D70qSu77UOeonLymsD0WbUHznj8f4QfUqkxCGuKuvJ v2dfbqNEQGbeLki7H4UJs9SNGxX5IN+lgQ== X-Google-Smtp-Source: AA0mqf4JmR1iMz2f0E+iSzNDoFZVJaB2Oa4k8ppuUhBQPU0kjN6guqSR3uQmQR7z26oTDmCkD3oWlg== X-Received: by 2002:ae9:c116:0:b0:6fa:da78:6945 with SMTP id z22-20020ae9c116000000b006fada786945mr12327713qki.367.1668951270465; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:30 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 050/241] global: Migrate CONFIG_G_DNL_THOR_VENDOR_NUM to CFG Date: Sun, 20 Nov 2022 08:30:41 -0500 Message-Id: <20221120133352.3055600-51-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/samsung/common/gadget.c | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index 38d8773f9083..f883c95f9643 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -10,7 +10,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { if (!strcmp(name, "usb_dnl_thor")) { - put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor); + put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor); put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index b29d9b0d5bac..defbe4bf335c 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -16,7 +16,7 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 /* USB Samsung's IDs */ -#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 +#define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index c6f6246d76ce..967ba83d4510 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -21,7 +21,7 @@ #define DFU_MANIFEST_POLL_TIMEOUT 25000 /* THOR */ -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM +#define CFG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D /* UMS */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 5567505c8182..67d01e816f9a 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -26,7 +26,7 @@ /* USB Samsung's IDs */ -#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 +#define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2304c23b80f..f04275b6b1d4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -50,7 +50,7 @@ CFG_FSL_SERDES2 CFG_GATEWAYIP CFG_GMII CFG_G_DNL_THOR_PRODUCT_NUM -CONFIG_G_DNL_THOR_VENDOR_NUM +CFG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR From patchwork Sun Nov 20 13:30:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706757 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=d3NYHOf1; 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 4NFWtr3TTgz23n6 for ; Mon, 21 Nov 2022 00:43:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04932852D2; Sun, 20 Nov 2022 14:35: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="d3NYHOf1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4652F85299; Sun, 20 Nov 2022 14:34: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-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 8843085261 for ; Sun, 20 Nov 2022 14:34: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-x72b.google.com with SMTP id v8so6485865qkg.12 for ; Sun, 20 Nov 2022 05:34: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=Hlp0eECUSfHXCuDbr9Dlv1WI3TQi0TqMwv0rdREXSos=; b=d3NYHOf1LaTWOJlyEGf/upyFfLCb/txafkZA5Da5TjHRHXCvZxexvlYea1Vw3YDo+A naZ9Etr8hB77idEPkxir+nkLtKEg7uI28rtDniXb8JooOB4vnJs0ltb+kX49LBoxfUbg 1SbPhdZ5jzYbrZzFXFD+QAqBfri9FZcnDQpSQ= 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=Hlp0eECUSfHXCuDbr9Dlv1WI3TQi0TqMwv0rdREXSos=; b=nANrOic6w5fbmlJuh1UOOkqMPXt1B2PJIVvT/rPV2FxM46Gj453uEgAR+WjVLF8t+4 Ge2qE06pD7DzLcexz/TWxUe7KMAjcmn8tjEsNNMVxXgyFE7XGI9WNZMBmF06+dTC9YBG HzJvjyUnUA6Dzo/6mrg/mqxqXEkekAdwutM2cc+JtVeAGwpP0/Gg/NEwQe14fW3RdAkJ FUiRfXAY3FjV9ZKWIkCuKrg1loa08juVfAmmiOyqKyud1JdaYI9nnGMDyIgCfYtweisI vWQ4MB158k0uE/uUcFvXh8cb8MK/2jPVT0Tf4eqyul4iavTpZiA0zjm7Ok34Q9HKBphf Eyng== X-Gm-Message-State: ANoB5plR83agARNHWku+lRr2yNwBl5TVCHXulkYGD01xxarRoMpvVuac CCQYkjoohn0yGSTs2H2Dn8OSWEGrzJT8nQ== X-Google-Smtp-Source: AA0mqf4htURAYln+mcWKY8ysoSNAve7nUPfAN5sQYEZqAiBOlmZGvzPyDgI/ag9i4mMwr4EDdv2Vng== X-Received: by 2002:a37:4043:0:b0:6ee:b095:a047 with SMTP id n64-20020a374043000000b006eeb095a047mr12848687qka.524.1668951271106; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:30 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 051/241] global: Migrate CONFIG_G_DNL_UMS_PRODUCT_NUM to CFG Date: Sun, 20 Nov 2022 08:30:42 -0500 Message-Id: <20221120133352.3055600-52-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/samsung/common/gadget.c | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index f883c95f9643..71d361548434 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -14,7 +14,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); - put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); + put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); } else { put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor); put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct); diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 56bb856a6dc2..a53846b762c1 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -41,7 +41,7 @@ /* USB IDs */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif #endif diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index defbe4bf335c..f3db02d78d8b 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -19,7 +19,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 /* Common environment variables */ #define ENV_ITB \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 967ba83d4510..bd8d455375dd 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -26,7 +26,7 @@ /* UMS */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #define CFG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 67d01e816f9a..d1c3f495c253 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -29,7 +29,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3603bb9f4a0b..dbb84ab9ad08 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -86,7 +86,7 @@ /* USB IDs */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f04275b6b1d4..5da8953712a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -51,7 +51,7 @@ CFG_GATEWAYIP CFG_GMII CFG_G_DNL_THOR_PRODUCT_NUM CFG_G_DNL_THOR_VENDOR_NUM -CONFIG_G_DNL_UMS_PRODUCT_NUM +CFG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR CONFIG_HOSTNAME From patchwork Sun Nov 20 13:30:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706756 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=H+TVLRtf; 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 4NFWtc6Xtqz23n6 for ; Mon, 21 Nov 2022 00:43:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 02F718532D; Sun, 20 Nov 2022 14:35:21 +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+TVLRtf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0879E85293; Sun, 20 Nov 2022 14:34: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-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 6851B85283 for ; Sun, 20 Nov 2022 14:34: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-x72d.google.com with SMTP id k2so6488454qkk.7 for ; Sun, 20 Nov 2022 05:34: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=Tz5qT1FF9+5aXGI5FyYSkAFfuAaWW4/Rvrao3ojrVIc=; b=H+TVLRtfe4IrZSElGtKIS0hfeQkVSpL3zzVY0CH8laQcd/4pIdzfm6AihE0qJ1vE3f N0wp8Ax3SiigLheGoYy6HWFlaw124sq4rFNfqqaoyrAD/Gva2jZUdQPhuqEy4SGjmIoR /LrMz1c7AX9P6oMkmSjr+qrBJiXd/f/lVTVVk= 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=Tz5qT1FF9+5aXGI5FyYSkAFfuAaWW4/Rvrao3ojrVIc=; b=4b15tBnsUNHxqwX0O/3nwFtLuw05OuveimlLY7qsv8ScEwZ3iV6lcgSmUGvyDGP3sQ tit3Up5jGn75AIbbejyavMh5l+HNBFzBoBqIBYABas4u+zDdYjVbGbvhpCAdf2vipTLY fUdvSEbS6osSpccqPjjWqsM/3ZQkw6OKIUvQ0mi7Y/J/wTJ6h7gupxTw2hZHy33SaZSV oc16rFWUPlR2svwsvAaPSo/hImsfBC+vqbqi+yAGgT3qte9LNi1bN9lWy5Omv9KlmkRY zh4y+Zeip+1/a49U3ZkZeRxRHyTZxU3vFFV0REM5LG8JyT7Ouf/gyEZJmx1UIZZYhKEi f84w== X-Gm-Message-State: ANoB5pkB2HYtDB/VmzhXlttYobGh0YndA8NEpPOYs6FkhHx1JtzVJqaF pPCLAJYrxr9MwMD+gpJI3zAijJJ0GC+4jw== X-Google-Smtp-Source: AA0mqf6t2lW1Ypr5l6d9uZQo7GI+u0alATsR3yvf50/S5w/SrwpaqtqkOZQBIMtYd3+G4FgegvMRfw== X-Received: by 2002:a37:64c8:0:b0:6f9:6c61:ea58 with SMTP id y191-20020a3764c8000000b006f96c61ea58mr13133338qkb.518.1668951271798; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:31 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 052/241] global: Migrate CONFIG_G_DNL_UMS_VENDOR_NUM to CFG Date: Sun, 20 Nov 2022 08:30:43 -0500 Message-Id: <20221120133352.3055600-53-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/samsung/common/gadget.c | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index 71d361548434..0fe20be48556 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -13,7 +13,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor); put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { - put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); + put_unaligned(CFG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); } else { put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor); diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index a53846b762c1..1fbdebb64511 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -40,7 +40,7 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 /* USB IDs */ -#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif #endif diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index f3db02d78d8b..63e26687dbce 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -18,7 +18,7 @@ /* USB Samsung's IDs */ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D -#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 /* Common environment variables */ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index bd8d455375dd..50213a383528 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -25,7 +25,7 @@ #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D /* UMS */ -#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #define CFG_DFU_ALT_SYSTEM \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d1c3f495c253..1e211eccee7b 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -28,7 +28,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D -#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index dbb84ab9ad08..d6809f8118d7 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -85,7 +85,7 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 /* USB IDs */ -#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5da8953712a5..3473e7c4560b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -52,7 +52,7 @@ CFG_GMII CFG_G_DNL_THOR_PRODUCT_NUM CFG_G_DNL_THOR_VENDOR_NUM CFG_G_DNL_UMS_PRODUCT_NUM -CONFIG_G_DNL_UMS_VENDOR_NUM +CFG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR CONFIG_HOSTNAME CONFIG_HSMMC2_8BIT From patchwork Sun Nov 20 13:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706771 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=png2FO9P; 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 4NFWxl3WDPz23mR for ; Mon, 21 Nov 2022 00:45:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1561B8535B; Sun, 20 Nov 2022 14:35: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="png2FO9P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 56EA4852DD; Sun, 20 Nov 2022 14:34: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-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 0F01A85262 for ; Sun, 20 Nov 2022 14:34: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-x72f.google.com with SMTP id z17so6489029qki.11 for ; Sun, 20 Nov 2022 05:34: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=yQJ4BIu9w4bvKUdmRUUY3d4u8ctIzcgDiROrXigP4Ho=; b=png2FO9Pp3xqrIxOc5eQzsScdsrNhNYMMAb45j5++rsFlW4BaKFxHN9eer6dYlW0Si s/45AittdXheg10+pin15U66YKq/W8aTF4d2LAYNZn7nznsr/3l2tf6x2DPuBqDzevOx lpIhje7Dtxef0ukBjjIJ4Hu1BBs+M4p3DEpHk= 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=yQJ4BIu9w4bvKUdmRUUY3d4u8ctIzcgDiROrXigP4Ho=; b=I7QJlg5Cc0B85+yatbTU7pJNlmdJDfd1lC1ko3gExtf1sNQJ377/yC65EAPzbk7LXl I5x3Ttzd1fdDTDJk/r77m6POSVbd5PF4uUCTbccPKFpE9EZAwIikjbeB/lTpFDl9kEwm hb1SL7OwOuVqgZqj0KVzX5mYb2+OtLoN71GgXeDHsB4R90uPeiJDthWX052sCLQck1UI V+mM7ln0TyhK1fPPLKNulAn3hDcAWzT8Q+ehDLmXytMGUASXxhzCBd0ygwTOE+VMzf08 mkGyZsxSY8GTcUPCfVXmVkNq6yZlrWk0N13HyWzAVktzZiiJineHkGuXnGt2HJF0fR5Z aO+A== X-Gm-Message-State: ANoB5pnAYRULs23t/0O6wYjv7Te/O6kqN6epcoAUzdc6BJbraNGp38a/ JD6/FVJqa8DFH51+AU319rWuSU93KuWxJg== X-Google-Smtp-Source: AA0mqf4jU7s8TvW6mnlLzpC/ccp4101h5E6As6qDYer8oXe/Mp+xSv6mFmsRACilYTPLT48Hf8xkJQ== X-Received: by 2002:a05:620a:31d:b0:6fa:39f6:8c13 with SMTP id s29-20020a05620a031d00b006fa39f68c13mr12887851qkm.113.1668951272507; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:32 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 053/241] global: Migrate CONFIG_HDMI_ENCODER_I2C_ADDR to CFG Date: Sun, 20 Nov 2022 08:30:44 -0500 Message-Id: <20221120133352.3055600-54-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/T104xRDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index e6a9dccd752b..4b7b53094446 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -288,7 +288,7 @@ #define CFG_SYS_I2C_RTC_ADDR 0x68 /*DVI encoder*/ -#define CONFIG_HDMI_ENCODER_I2C_ADDR 0x75 +#define CFG_HDMI_ENCODER_I2C_ADDR 0x75 #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3473e7c4560b..9079fbb2e3f6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -53,7 +53,7 @@ CFG_G_DNL_THOR_PRODUCT_NUM CFG_G_DNL_THOR_VENDOR_NUM CFG_G_DNL_UMS_PRODUCT_NUM CFG_G_DNL_UMS_VENDOR_NUM -CONFIG_HDMI_ENCODER_I2C_ADDR +CFG_HDMI_ENCODER_I2C_ADDR CONFIG_HOSTNAME CONFIG_HSMMC2_8BIT CONFIG_HW_ENV_SETTINGS From patchwork Sun Nov 20 13:30:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706760 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=NDDzqzpr; 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 4NFWvS5yxvz23n6 for ; Mon, 21 Nov 2022 00:43:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B419852D9; Sun, 20 Nov 2022 14:35: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="NDDzqzpr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA17C85283; Sun, 20 Nov 2022 14:34: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-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 AD2078528F for ; Sun, 20 Nov 2022 14:34: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-qt1-x835.google.com with SMTP id s4so5904442qtx.6 for ; Sun, 20 Nov 2022 05:34: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=dB2AcxhU/wT4Ge4yc/q9hPFWCmy0/fBwNKnAUJBWfLQ=; b=NDDzqzprmvioIxghsn1bzDPFSxqiBsGGbRIIqPhj9pc+ost5TNZ6xGiymQw0J4ejhS BA8+GJhHOe2qq4yzE5Sp2d46oWiybBAjhJ5C9YhDuL4c3PJkU0ZPSRKZCInXYQi/eUAx /waAcHnKyZsEuuMwqoXyg88fu4SwBcHV7wC+o= 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=dB2AcxhU/wT4Ge4yc/q9hPFWCmy0/fBwNKnAUJBWfLQ=; b=S4TUtUSr/etqwFdP90nTdCJbZgXT+zV4LGyHizQRpZBvnGS+zX/2ku/YCbs9PhVH1X 5OpNt+76L0lZG5XdQT/3vglhxhSel2mId88AtY0AtUK3cpHDwjPk0W86Yu+t9dzzIm3d sKCZdmJoa1I3GHW/jgoWR+TjXAFbToSp1dvMM39XOfETH13IQmodVBKp1773kcY76Oxi U7pIX6XoqpVD35Cm8q/owuMMe+2Ub5Lqm0oS8qpllpfvYEU6nhEoRCSXdGeADgAxxKQl q7UaBt3uzGQAH3mTHjlNa3CqxijVFt1PaHJxqHDch7CD/5JZhtQAKMq5Sdo24pSsX3mo 8PNw== X-Gm-Message-State: ANoB5pk0pAhBuv3UPCnnQpUWQWxyr6yCGWM8rJUEdZvDEWLDCigoNOC2 IQY01hHYJua987zLWz7Sklx4SGV3sevgRQ== X-Google-Smtp-Source: AA0mqf6ZdzhFJ6kFbroC5S/E1aeXcXEgQrjm1Iz+P7LW3bslwjobP7fVTwjUqSvXKpIpV8PnzPWIFg== X-Received: by 2002:a05:622a:5a8d:b0:35b:62a:6532 with SMTP id fz13-20020a05622a5a8d00b0035b062a6532mr3765984qtb.156.1668951273102; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:32 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 054/241] global: Migrate CONFIG_HOSTNAME to CFG Date: Sun, 20 Nov 2022 08:30:45 -0500 Message-Id: <20221120133352.3055600-55-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5253DEMO.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/MPC837XERDB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/amcore.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/bcm_ns3.h | 2 +- include/configs/controlcenterdc.h | 2 +- include/configs/gazerbeam.h | 2 +- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/kmcent2.h | 6 +++--- include/configs/kmcoge5ne.h | 2 +- include/configs/kmeter1.h | 2 +- include/configs/kmopti2.h | 2 +- include/configs/kmsupx5.h | 2 +- include/configs/kmtepr2.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/microblaze-generic.h | 2 +- include/configs/novena.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- include/configs/socfpga_vining_fpga.h | 2 +- include/configs/stmark2.h | 2 +- include/configs/tuge1.h | 2 +- include/configs/tuxx1.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/x86-common.h | 2 +- include/configs/xea.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 40 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 83ffe7ce76d9..ce75c4cbcaf0 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -24,7 +24,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME "M5208EVBe" +#define CFG_HOSTNAME "M5208EVBe" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index fc56834bd9be..8cebf099f1db 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -33,7 +33,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME "M5235EVB" +#define CFG_HOSTNAME "M5235EVB" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index a1cb1a8a7022..bf31d203e664 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -42,7 +42,7 @@ "" #endif -#define CONFIG_HOSTNAME "M5253DEMO" +#define CFG_HOSTNAME "M5253DEMO" /* I2C */ #define CFG_SYS_I2C_PINMUX_REG (*(u32 *) (CFG_SYS_MBAR+0x19C)) diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 78eeca342c82..10bfb01a2e03 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -36,7 +36,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME "M5272C3" +#define CFG_HOSTNAME "M5272C3" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index afc19de8ce73..b69e452b9e50 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -36,7 +36,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME "M5282EVB" +#define CFG_HOSTNAME "M5282EVB" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 1fcc34184928..ce38b823436d 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -37,7 +37,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME "M53017" +#define CFG_HOSTNAME "M53017" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index a49cf6dacb81..2dc22a0b5af8 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -29,7 +29,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME "M5329EVB" +#define CFG_HOSTNAME "M5329EVB" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 53434881f4c7..bce4a8470f91 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -31,7 +31,7 @@ # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME "M5373EVB" +#define CFG_HOSTNAME "M5373EVB" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index dc7fe06ceb4b..4c3acd5b013b 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -225,7 +225,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME "mpc837x_rdb" +#define CFG_HOSTNAME "mpc837x_rdb" #define CONFIG_ROOTPATH "/nfsroot" /* U-Boot image on TFTP server */ #define CONFIG_UBOOTPATH "u-boot.bin" diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index e93b3cb97517..2ce8597c0c52 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -327,7 +327,7 @@ #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME "unknown" +#define CFG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 78060d432a86..18244d1be4c2 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -8,7 +8,7 @@ #ifndef __AMCORE_CONFIG_H #define __AMCORE_CONFIG_H -#define CONFIG_HOSTNAME "AMCORE" +#define CFG_HOSTNAME "AMCORE" #define CFG_SYS_UART_PORT 0 diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 9b11934546c1..271d15dc5e50 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -11,7 +11,7 @@ #ifndef __ARISTAINETOS2_CONFIG_H #define __ARISTAINETOS2_CONFIG_H -#define CONFIG_HOSTNAME "aristainetos2" +#define CFG_HOSTNAME "aristainetos2" #if (CONFIG_SYS_BOARD_VERSION == 5) #define CONSOLE_DEV "ttymxc1" diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index 70dd2802686f..84a72bff24f0 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -9,7 +9,7 @@ #include -#define CONFIG_HOSTNAME "NS3" +#define CFG_HOSTNAME "NS3" /* Physical Memory Map */ #define V2M_BASE 0x80000000 diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 8b31e14df31a..9cb194643492 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -21,7 +21,7 @@ * Environment Configuration */ -#define CONFIG_HOSTNAME "ccdc" +#define CFG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 7ab504f35531..f86eb4c40354 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -56,7 +56,7 @@ */ /* TODO: Turn into string option and migrate to Kconfig */ -#define CONFIG_HOSTNAME "gazerbeam" +#define CFG_HOSTNAME "gazerbeam" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 424caa0df977..f6c21e1666d1 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -31,7 +31,7 @@ #define CONFIG_KM_DEF_BOOT_ARGS_CPU "" #define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0" \ + "u-boot="CFG_HOSTNAME "/u-boot.bin\0" \ "update=" \ "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ "erase " __stringify(BOOTFLASH_START) " +${filesize} && "\ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 64fb706a1ce6..ddeabc0f79ce 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -188,7 +188,7 @@ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ + "u-boot=" CFG_HOSTNAME "/u-boot.bin\0" \ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize} && " \ "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 639f2075e69f..729278ebb246 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -8,8 +8,8 @@ #ifndef __KMCENT2_H #define __KMCENT2_H -#define CONFIG_HOSTNAME "kmcent2" -#define KM_BOARD_NAME CONFIG_HOSTNAME +#define CFG_HOSTNAME "kmcent2" +#define KM_BOARD_NAME CFG_HOSTNAME /* * The Linux fsl_fman driver needs to be able to process frames with more @@ -401,7 +401,7 @@ int get_scl(void); "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ + "u-boot=" CFG_HOSTNAME "/u-boot.bin\0" \ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize} && " \ "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \ diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 6b30fb4b617e..8681145c309f 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -8,7 +8,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_HOSTNAME "kmcoge5ne" +#define CFG_HOSTNAME "kmcoge5ne" #define NAND_MAX_CHIPS 1 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 910fc1b2cb25..deffde289601 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -8,7 +8,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_HOSTNAME "kmeter1" +#define CFG_HOSTNAME "kmeter1" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h index 5050c7030390..32f5089656d9 100644 --- a/include/configs/kmopti2.h +++ b/include/configs/kmopti2.h @@ -23,7 +23,7 @@ /* * High Level Configuration Options */ -#define CONFIG_HOSTNAME "kmopti2" +#define CFG_HOSTNAME "kmopti2" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h index e3de6c61e71c..2e666c45dc80 100644 --- a/include/configs/kmsupx5.h +++ b/include/configs/kmsupx5.h @@ -23,7 +23,7 @@ /* * High Level Configuration Options */ -#define CONFIG_HOSTNAME "kmsupx5" +#define CFG_HOSTNAME "kmsupx5" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h index a4ceb1c50d6b..e41a61f9d9d0 100644 --- a/include/configs/kmtepr2.h +++ b/include/configs/kmtepr2.h @@ -23,7 +23,7 @@ /* * High Level Configuration Options */ -#define CONFIG_HOSTNAME "kmtepr2" +#define CFG_HOSTNAME "kmtepr2" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 81ca83fdbfab..e57ae20a74ea 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -23,7 +23,7 @@ /* Board and environment settings */ #define CONFIG_MXC_UART_BASE UART4_BASE -#define CONFIG_HOSTNAME "kontron-mx6ul" +#define CFG_HOSTNAME "kontron-mx6ul" #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 2e21aacd1893..56d0036147c6 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -23,7 +23,7 @@ #define CFG_SYS_INIT_RAM_SIZE 0x200000 /* Board and environment settings */ -#define CONFIG_HOSTNAME "kontron-mx8mm" +#define CFG_HOSTNAME "kontron-mx8mm" #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 4123964256bd..979fddab5e32 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -84,7 +84,7 @@ /* * Extra Environments */ -#define CONFIG_HOSTNAME "m53menlo" +#define CFG_HOSTNAME "m53menlo" #define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttymxc0\0" \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ede4ffd53f4e..53498e1c78d8 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -16,7 +16,7 @@ # define CFG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} -#define CONFIG_HOSTNAME "microblaze-generic" +#define CFG_HOSTNAME "microblaze-generic" /* architecture dependent code */ #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP) diff --git a/include/configs/novena.h b/include/configs/novena.h index 19b40070be92..520c4ba130f1 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -25,7 +25,7 @@ */ /* Booting Linux */ -#define CONFIG_HOSTNAME "novena" +#define CFG_HOSTNAME "novena" /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 93909eda55dd..de6440a07564 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -418,7 +418,7 @@ /* * Environment Configuration */ -#define CONFIG_HOSTNAME "unknown" +#define CFG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index 1b72739d143d..5b5637762aca 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -7,7 +7,7 @@ #define __CONFIG_PG_WCOM_EXPU1_H #define WCOM_EXPU1 -#define CONFIG_HOSTNAME "EXPU1" +#define CFG_HOSTNAME "EXPU1" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index e4bcae5bb5e1..a1c1ca993d7e 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -6,7 +6,7 @@ #ifndef __CONFIG_PG_WCOM_SELI8_H #define __CONFIG_PG_WCOM_SELI8_H -#define CONFIG_HOSTNAME "SELI8" +#define CFG_HOSTNAME "SELI8" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index cd48650dd554..31ebf34c1c68 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -13,7 +13,7 @@ /* Booting Linux */ /* Extra Environment */ -#define CONFIG_HOSTNAME "socfpga_vining_fpga" +#define CFG_HOSTNAME "socfpga_vining_fpga" /* * Active LOW GPIO buttons: diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index be0193105b4b..63040adf97cb 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -8,7 +8,7 @@ #ifndef __STMARK2_CONFIG_H #define __STMARK2_CONFIG_H -#define CONFIG_HOSTNAME "stmark2" +#define CFG_HOSTNAME "stmark2" #define CFG_SYS_UART_PORT 0 diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h index d43ccbe8dd94..7ddb44124c2f 100644 --- a/include/configs/tuge1.h +++ b/include/configs/tuge1.h @@ -23,7 +23,7 @@ /* * High Level Configuration Options */ -#define CONFIG_HOSTNAME "tuge1" +#define CFG_HOSTNAME "tuge1" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index 7eed31c35f03..d18c57c4d198 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -23,7 +23,7 @@ /* * High Level Configuration Options */ -#define CONFIG_HOSTNAME "tuxx1" +#define CFG_HOSTNAME "tuxx1" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index f273533be429..b2153b441142 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -28,7 +28,7 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Linux boot */ -#define CONFIG_HOSTNAME "usbarmory" +#define CFG_HOSTNAME "usbarmory" #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 7705d31a313a..fdd7dba9a6f2 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -42,7 +42,7 @@ /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" -#define CONFIG_HOSTNAME "x86" +#define CFG_HOSTNAME "x86" #define CONFIG_RAMDISK_ADDR 0x4000000 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) #define CONFIG_OTHBOOTARGS "othbootargs=\0" diff --git a/include/configs/xea.h b/include/configs/xea.h index 50b96f31e163..974ed4224bc5 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -26,7 +26,7 @@ #define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Extra Environment */ -#define CONFIG_HOSTNAME "xea" +#define CFG_HOSTNAME "xea" #define CFG_EXTRA_ENV_SETTINGS \ "bootmode=update\0" \ diff --git a/include/env_default.h b/include/env_default.h index 7d0af83a5913..b1fe945bae5b 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -74,8 +74,8 @@ const char default_environment[] = { #ifdef CONFIG_NETMASK "netmask=" __stringify(CONFIG_NETMASK) "\0" #endif -#ifdef CONFIG_HOSTNAME - "hostname=" CONFIG_HOSTNAME "\0" +#ifdef CFG_HOSTNAME + "hostname=" CFG_HOSTNAME "\0" #endif #ifdef CONFIG_USE_BOOTFILE "bootfile=" CONFIG_BOOTFILE "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9079fbb2e3f6..0fc29f456c13 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -54,7 +54,7 @@ CFG_G_DNL_THOR_VENDOR_NUM CFG_G_DNL_UMS_PRODUCT_NUM CFG_G_DNL_UMS_VENDOR_NUM CFG_HDMI_ENCODER_I2C_ADDR -CONFIG_HOSTNAME +CFG_HOSTNAME CONFIG_HSMMC2_8BIT CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS From patchwork Sun Nov 20 13:30:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706809 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=UjcAiJlR; 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 4NFX5p4BhGz23lt for ; Mon, 21 Nov 2022 00:52:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7AF408526B; Sun, 20 Nov 2022 14:38: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=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="UjcAiJlR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40B5C85313; Sun, 20 Nov 2022 14:38:14 +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 407758526B for ; Sun, 20 Nov 2022 14:34: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-qt1-x832.google.com with SMTP id cg5so5884217qtb.12 for ; Sun, 20 Nov 2022 05:34: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=79xtcON3Z5+Rst/dZIGO0K9OkohI/b20o1/F2dmKDUE=; b=UjcAiJlR6U5C5TO8MmWBgM6qRfP4YqToTTpJmDRRFhWsqKZW6ye/Rf5b0PoFJ4dEYW HqAEHkSN48wWbXIhazinje17N73cSTdRd0ogwBBy+HHMbRK4mifnDdPVqiOmylyaZ3+s rphKrw9ozsJPGQdbGVadGkzbcZNRl4JaSokDw= 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=79xtcON3Z5+Rst/dZIGO0K9OkohI/b20o1/F2dmKDUE=; b=P30d0IYAuuEme3+zYLCCOE+E3+J7A8RLM0j2CQAP+zBq721INgBDmvyGJjm9O4G0Tf vqkMYUvDQQ57kNkcCej6DlHvgkX1NNumcmJKZv8fB5wHIDWleVKWlQeqbRAb5bKf/MQ+ o2ocZjXve5eumuOZph4ls947tgDEm6hbEC9tkodFufEYShFnA1LnYRvcNFUIH7mm+E2x ercYjWOxtI/t8medcBgjZcdrpChljLWdEBg21fcslNVT9ELSrEmdiYLCGlu27jrPmq31 KqFL3unVOteCivhfWzDy71VW6EHFNF0qdlocaOGcwgxDLwNamHp4+IdaeJU9ZqUDkUHi IWMg== X-Gm-Message-State: ANoB5pkikmhUz833YZjeXT2iOH/aWadnJN5YFW/jDU4COsEEYiNnNBvL NzbPXQySz/E/VqzZgLwiiTzbvxy0QXvPnQ== X-Google-Smtp-Source: AA0mqf4kvC3GNcYohY2KN+9Nh8lCCIQo7LZz1up7NAfwNXSm++eG3l7uv+BQxMPhYpRtrnqOkkmXEQ== X-Received: by 2002:ac8:4688:0:b0:3a5:3622:6831 with SMTP id g8-20020ac84688000000b003a536226831mr3257443qto.479.1668951273711; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 055/241] global: Migrate CONFIG_HSMMC2_8BIT to CFG Date: Sun, 20 Nov 2022 08:30:46 -0500 Message-Id: <20221120133352.3055600-56-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/mmc/omap_hsmmc.c | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/omap5_uevm.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index a2595d19e7f6..80dd70f087e2 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -1560,7 +1560,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio, #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \ defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \ defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \ - defined(CONFIG_HSMMC2_8BIT) + defined(CFG_HSMMC2_8BIT) /* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */ host_caps_val |= MMC_MODE_8BIT; #endif diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index c66650c8e8d1..577a622d42c9 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -20,7 +20,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT #ifndef CONFIG_SPL_BUILD #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index dacfd41ccedf..afacf70e74a9 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -36,7 +36,7 @@ #include /* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT /* CPSW Ethernet */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 06de4dbeb6d5..5a795fe99171 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -36,7 +36,7 @@ * we don't need to do it twice. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT #include diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index ac3fcacc68ed..30def6abf8f4 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -49,7 +49,7 @@ #include /* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT /* * Default to using SPI for environment, etc. diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index d7fa2d43914a..8a9a6dfc4c34 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -33,7 +33,7 @@ /* MMC ENV related defines */ /* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT /* Required support for the TCA642X GPIO we have on the uEVM */ #define CFG_SYS_I2C_TCA642X_BUS_NUM 4 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0fc29f456c13..d7265e370d05 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -55,7 +55,7 @@ CFG_G_DNL_UMS_PRODUCT_NUM CFG_G_DNL_UMS_VENDOR_NUM CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME -CONFIG_HSMMC2_8BIT +CFG_HSMMC2_8BIT CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS From patchwork Sun Nov 20 13:30:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706758 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=lIwquhJd; 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 4NFWv32MLfz23n6 for ; Mon, 21 Nov 2022 00:43:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EE52085334; Sun, 20 Nov 2022 14:35: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="lIwquhJd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A726185299; Sun, 20 Nov 2022 14:34: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-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 D676D8529D for ; Sun, 20 Nov 2022 14:34: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-qt1-x832.google.com with SMTP id w4so5945259qts.0 for ; Sun, 20 Nov 2022 05:34: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=7U3EptamJ5MOxnNBcFdCkgmEWuU5+V0Tr6E8z1llsHg=; b=lIwquhJdTs0p+fhkuA0/36UhUOkNv97BbA4Bs0zb+TjKACK2NPIuKh+LXe+1PMWtAs /MnV0zGnXj4RQmc35vqqPMeIDg64IWe5K7r/ZrjeureNHXI2fZxoeU+vdYYfx2DJ/6V/ kso1O8Y3dn3ql+JCSCndXKXBfwYiWAmx8jtPE= 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=7U3EptamJ5MOxnNBcFdCkgmEWuU5+V0Tr6E8z1llsHg=; b=lbFfqsIw6iDdkvwN6E2lT0FwK0y8V81z3AS3KxOIdoN2e5iudU4LHsYaWKmxCj1CIB pqd9Y20y/lBrjaTIoFlzgP4A2FbswEGFL64myyneT7Law2qjbh4E0LUriQYPDcx5RO0t qv7kgVRifhGNmrixio3aTAX9fzTiHT0i3vKnvSP0b6SJxKZPl2fcosRV+NOGtS+eMEIl bYJSJpI9SifY19OIuYPTLosmvtk+nNQbz7GBljxaWfnPdEVqiA0Mn/tzAbXFx9OSD3iL Mt/gQewrCsTHYIkqb1uAb8nXlk/zXeKJDNUJpicMoYEKcR1O10owgDvg8XdHSNPDT2LK YIXg== X-Gm-Message-State: ANoB5pnSYTLCi+oz+iMxh2AOJ+bj01W2kDtOFWOA0n396aPp27h6PpAW VLClO0erbzpUeoTuG3khuL6agM1BOwteDw== X-Google-Smtp-Source: AA0mqf4SiFrUMFM0W3s3YAzmmHGSriDqt8LRmUR+FAyb8u1wSNUCwU91JdjRjCkYPxciQ5DnXD9Plg== X-Received: by 2002:a05:622a:5c90:b0:3a5:6de2:b400 with SMTP id ge16-20020a05622a5c9000b003a56de2b400mr13543343qtb.631.1668951274351; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 056/241] global: Migrate CONFIG_HW_ENV_SETTINGS to CFG Date: Sun, 20 Nov 2022 08:30:47 -0500 Message-Id: <20221120133352.3055600-57-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index ddeabc0f79ce..80027f3a773a 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -217,7 +217,7 @@ "protect on " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" -#define CONFIG_HW_ENV_SETTINGS \ +#define CFG_HW_ENV_SETTINGS \ "hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \ "can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \ "asrc,spdif,lpuart1,ftm1\0" @@ -225,7 +225,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ CONFIG_KM_DEF_ENV \ - CONFIG_HW_ENV_SETTINGS \ + CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "ethrotate=no\0" \ "" diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 729278ebb246..d7d5bce15c59 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -423,7 +423,7 @@ int get_scl(void); "fpgacfg=true\0" \ "" -#define CONFIG_HW_ENV_SETTINGS \ +#define CFG_HW_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline\0" \ "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0" @@ -445,7 +445,7 @@ int get_scl(void); CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ - CONFIG_HW_ENV_SETTINGS \ + CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d7265e370d05..44956bff3940 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -56,7 +56,7 @@ CFG_G_DNL_UMS_VENDOR_NUM CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME CFG_HSMMC2_8BIT -CONFIG_HW_ENV_SETTINGS +CFG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS CONFIG_I2C_MVTWSI From patchwork Sun Nov 20 13:30:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706759 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=dr9lP87Z; 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 4NFWvG0wL8z23n6 for ; Mon, 21 Nov 2022 00:43:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23860852EB; Sun, 20 Nov 2022 14:35: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="dr9lP87Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AB0C285280; Sun, 20 Nov 2022 14:34: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-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 9259185261 for ; Sun, 20 Nov 2022 14:34: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-qt1-x835.google.com with SMTP id s4so5904465qtx.6 for ; Sun, 20 Nov 2022 05:34: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=SlDSo4zL+PzAK/0nasnGnSRM1sg2Ts2DYbd8QpPjQ94=; b=dr9lP87ZzqfAGV1zw6tHama9wVB/aU88OqoEyic/u8nsQHP6lRqRkVIAW2Pxl3BZJm QQHuyFBXAJwLpb4YrXsM8/7NYi4VA+DDhPM+dd02yq1vIjAE8Re8jKQRq5p7NyF/9iWo LQRS+4YFAD/4YZgDzIPdgZAgJDVfoLsmZl87o= 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=SlDSo4zL+PzAK/0nasnGnSRM1sg2Ts2DYbd8QpPjQ94=; b=WGn6jD7yorSeiB168JUOpFrB6hqWSzgZvut8c6/Vn3JztNE7UBNWiXe2UpMt1CNG1h Rd+0qtA7MkKglMqGTdHZVXZbRrbvcBNoVCKAZFB6lZb3SQWJpgA7ZAmnFm5q2P4jlQ/O r7bjrWFcRWX2bvppuHP0CmL7aEt6DIf1TApwytYImQBmetWm9Ln8vux41EF6zS7Wi9+u 6n33hbv+aOUVZv1WbtZqWc1t9iU38ZHTML+u2aRA4v2KV+pRmWz1eVdYWbQ2xFqd302U HrVOei+MYqG0FE+GmpQXKnSk5aZr6nqhkufY3CbRn6jPQcKmb/m7YYdsS3WUd6nFKjni Mi1w== X-Gm-Message-State: ANoB5plpHdg5vJrOwK/PzxOeR0xbWhSZ6gdDziIhrCAdxfeY/wXC0Br6 YQ/yI3po3yPmzyVAEoeOYyX7+Uc4VGC4Kw== X-Google-Smtp-Source: AA0mqf6oi9CPvN8dQG7foVwZi/PBEBozUiSwnv2DUBe6SrnYbcv7gO+CH29naofcVnWnSSXVo649aw== X-Received: by 2002:ac8:100f:0:b0:3a5:eeb:88a8 with SMTP id z15-20020ac8100f000000b003a50eeb88a8mr13818146qti.1.1668951275060; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:34 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 057/241] global: Migrate CONFIG_I2C_ENV_EEPROM_BUS to CFG Date: Sun, 20 Nov 2022 08:30:48 -0500 Message-Id: <20221120133352.3055600-58-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- env/Kconfig | 4 ++-- env/eeprom.c | 18 +++++++++--------- scripts/config_whitelist.txt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index 5a7e2f299b06..1c7a414321ce 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -78,12 +78,12 @@ config ENV_IS_IN_EEPROM still be one byte because the extra address bits are hidden in the chip address. - - CONFIG_I2C_ENV_EEPROM_BUS + - CFG_I2C_ENV_EEPROM_BUS if you have an Environment on an EEPROM reached over I2C muxes, you can define here, how to reach this EEPROM. For example: - #define CONFIG_I2C_ENV_EEPROM_BUS 1 + #define CFG_I2C_ENV_EEPROM_BUS 1 EEPROM which holds the environment, is reached over a pca9547 i2c mux with address 0x70, channel 3. diff --git a/env/eeprom.c b/env/eeprom.c index f8556a47213c..192e0f3af6d0 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -15,7 +15,7 @@ #include #include #include -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) #include #endif #include @@ -28,16 +28,16 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) { int rcode; -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) int old_bus = i2c_get_bus_num(); - if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS) - i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS); + if (old_bus != CFG_I2C_ENV_EEPROM_BUS) + i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS); #endif rcode = eeprom_read(dev_addr, offset, buffer, cnt); -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif @@ -48,16 +48,16 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) { int rcode; -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) int old_bus = i2c_get_bus_num(); - if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS) - i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS); + if (old_bus != CFG_I2C_ENV_EEPROM_BUS) + i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS); #endif rcode = eeprom_write(dev_addr, offset, buffer, cnt); -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 44956bff3940..440bef90575d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,7 @@ CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME CFG_HSMMC2_8BIT CFG_HW_ENV_SETTINGS -CONFIG_I2C_ENV_EEPROM_BUS +CFG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS CONFIG_I2C_MVTWSI CONFIG_I2C_MVTWSI_BASE0 From patchwork Sun Nov 20 13:30:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706762 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=JkM09kbs; 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 4NFWvt0Ls8z23n6 for ; Mon, 21 Nov 2022 00:44:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C0233852F8; Sun, 20 Nov 2022 14:35: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="JkM09kbs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A8311852AB; Sun, 20 Nov 2022 14:34: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-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 2D01285289 for ; Sun, 20 Nov 2022 14:34: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-qv1-xf2a.google.com with SMTP id e15so6471142qvo.4 for ; Sun, 20 Nov 2022 05:34: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=pkeTVerYMnnCLOEKGGlFWOVaceb06N2rs5NrGhwlBfM=; b=JkM09kbsmK/qFZoE4QIQyZU2GZ431nOeemF+83B7nnIF6QuKpC34Nqz4l9Dw3nZ5Cr s+xaoKBqN4VQm71lrcLpXR/ybMANH6RWMMjxg3N/upByni1orYMfCBwWXrIgAiu8DEoL bAoVPBbilsAeBpI7otJwJVp0kbEWMfZpjwXpM= 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=pkeTVerYMnnCLOEKGGlFWOVaceb06N2rs5NrGhwlBfM=; b=BH3QGp2Zkl5fTjhbBEYolkeI5yqE6bOvfv7MSBISaFxkSz0q4AYmTRmDlJk+MGGDqh eAz8EDZnjJyetbMEHWX1HTkExcBsxgmsS8g3pYp9b+8pEqwFSofBd4hoNftUoOqfTLxK YpMt6+zoJZnNKdYZ71RybHhDr4TVjTNNChVX9Qlotqrs1XN9VUAYwKK7A+7TZ5JEyvLx WDazy9pMBO1QO5vZsFv4greJqOx0s5Huf9+ElnOu8OwrRHe/zy9T5llPOM3QgXKwumnx 8vpVqYMxfTUOFLW2zm+selPN78qXiQwQl5M6x/tmhIbYmSpwz1VW0A49VRS3SioPDCV0 LQUw== X-Gm-Message-State: ANoB5pnfsQyodFbaDFrHVNNRM78ZHJvlWEHs+0S6bi4eIsDxD0YlCwpg ieM1vkBXY2wWQAMDrRXF5RggW/4b6Xptvg== X-Google-Smtp-Source: AA0mqf504pgS3uejt+52uxqxJVurMpNmzdDiekepLoNDbogoNdBAWBAkRNanDiLh8Szp+BbGoinwvw== X-Received: by 2002:a0c:edc1:0:b0:4c6:dce:fe12 with SMTP id i1-20020a0cedc1000000b004c60dcefe12mr13867792qvr.122.1668951275742; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:35 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 058/241] global: Migrate CONFIG_I2C_MULTI_BUS to CFG Date: Sun, 20 Nov 2022 08:30:49 -0500 Message-Id: <20221120133352.3055600-59-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- README | 8 ++++---- cmd/i2c.c | 12 ++++++------ drivers/i2c/mv_i2c.c | 4 ++-- include/configs/display5.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/novena.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/sniper.h | 2 +- include/configs/tqma6.h | 2 +- include/i2c.h | 2 +- scripts/config_whitelist.txt | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README b/README index d76058e1ab41..50bfd7e4fffc 100644 --- a/README +++ b/README @@ -1006,7 +1006,7 @@ The following options need to be configured: You should define these to the GPIO value as given directly to the generic GPIO functions. - CONFIG_I2C_MULTI_BUS + CFG_I2C_MULTI_BUS This option allows the use of multiple I2C buses, each of which must have a controller. At any point in time, only one bus is @@ -1016,17 +1016,17 @@ The following options need to be configured: CFG_SYS_I2C_NOPROBES This option specifies a list of I2C devices that will be skipped - when the 'i2c probe' command is issued. If CONFIG_I2C_MULTI_BUS + when the 'i2c probe' command is issued. If CFG_I2C_MULTI_BUS is set, specify a list of bus-device pairs. Otherwise, specify a 1D array of device addresses e.g. - #undef CONFIG_I2C_MULTI_BUS + #undef CFG_I2C_MULTI_BUS #define CFG_SYS_I2C_NOPROBES {0x50,0x68} will skip addresses 0x50 and 0x68 on a board with one I2C bus - #define CONFIG_I2C_MULTI_BUS + #define CFG_I2C_MULTI_BUS #define CFG_SYS_I2C_NOPROBES {{0,0x50},{0,0x68},{1,0x54}} will skip addresses 0x50 and 0x68 on bus 0 and address 0x54 on bus 1 diff --git a/cmd/i2c.c b/cmd/i2c.c index da8b4c255555..2f9acc6670a3 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -98,7 +98,7 @@ static uint i2c_mm_last_alen; * pairs. The following macros take care of this */ #if defined(CFG_SYS_I2C_NOPROBES) -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) static struct { uchar bus; @@ -1764,7 +1764,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc, * Returns zero on success, CMD_RET_USAGE in case of misuse and negative * on error. */ -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) || \ +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) || \ CONFIG_IS_ENABLED(DM_I2C) static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -1916,9 +1916,9 @@ static struct cmd_tbl cmd_i2c_sub[] = { #endif U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""), #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \ - defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C) + defined(CFG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C) U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""), -#endif /* CONFIG_I2C_MULTI_BUS */ +#endif /* CFG_I2C_MULTI_BUS */ #if defined(CONFIG_I2C_EDID) U_BOOT_CMD_MKENT(edid, 1, 1, do_edid, "", ""), #endif /* CONFIG_I2C_EDID */ @@ -1993,9 +1993,9 @@ static char i2c_help_text[] = #endif "crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n" #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \ - defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C) + defined(CFG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C) "i2c dev [dev] - show or set current I2C bus\n" -#endif /* CONFIG_I2C_MULTI_BUS */ +#endif /* CFG_I2C_MULTI_BUS */ #if defined(CONFIG_I2C_EDID) "i2c edid chip - print EDID configuration information\n" #endif /* CONFIG_I2C_EDID */ diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c index 8ee17f0a4501..dffd551f2c29 100644 --- a/drivers/i2c/mv_i2c.c +++ b/drivers/i2c/mv_i2c.c @@ -374,7 +374,7 @@ static int __i2c_write(struct mv_i2c *base, uchar chip, u8 *addr, int alen, static struct mv_i2c *base_glob; -#ifdef CONFIG_I2C_MULTI_BUS +#ifdef CFG_I2C_MULTI_BUS static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG; static unsigned int bus_initialized[CONFIG_MV_I2C_NUM]; static unsigned int current_bus; @@ -407,7 +407,7 @@ void i2c_init(int speed, int slaveaddr) { u32 val; -#ifdef CONFIG_I2C_MULTI_BUS +#ifdef CFG_I2C_MULTI_BUS current_bus = 0; base_glob = (struct mv_i2c *)i2c_regs[current_bus]; #else diff --git a/include/configs/display5.h b/include/configs/display5.h index f95c1602e676..191c8fb8ab46 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -37,7 +37,7 @@ #define CONFIG_MXC_UART_BASE UART5_BASE /* I2C Configs */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 80027f3a773a..e64cf24bd5e9 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -154,7 +154,7 @@ * I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS #define CFG_SYS_I2C_MAX_HOPS 1 #define CFG_SYS_NUM_I2C_BUSES 3 #define I2C_MUX_PCA_ADDR 0x70 diff --git a/include/configs/novena.h b/include/configs/novena.h index 520c4ba130f1..af99ba4f193c 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -35,7 +35,7 @@ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE /* I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* I2C EEPROM */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index efeb7bf10078..af7cb3513f8f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -29,7 +29,7 @@ #endif /* CONFIG_MTD_RAW_NAND */ /* Enable Multi Bus support for I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* DSS Support */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index eaee8dd37396..45a3102aeeef 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -38,7 +38,7 @@ * I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* * Input diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 14d7730f67bf..cb5f7fc25af9 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -28,7 +28,7 @@ #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K /* I2C Configs */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS #if !defined(CONFIG_DM_PMIC) #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 diff --git a/include/i2c.h b/include/i2c.h index 51390f8fd84f..3811b26c08e0 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -930,7 +930,7 @@ unsigned int i2c_get_bus_speed(void); * only for backwardcompatibility, should go away if we switched * completely to new multibus support. */ -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) # if !defined(CFG_SYS_MAX_I2C_BUS) # define CFG_SYS_MAX_I2C_BUS 2 # endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 440bef90575d..501e39bb4900 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -58,7 +58,7 @@ CFG_HOSTNAME CFG_HSMMC2_8BIT CFG_HW_ENV_SETTINGS CFG_I2C_ENV_EEPROM_BUS -CONFIG_I2C_MULTI_BUS +CFG_I2C_MULTI_BUS CONFIG_I2C_MVTWSI CONFIG_I2C_MVTWSI_BASE0 CONFIG_I2C_MVTWSI_BASE1 From patchwork Sun Nov 20 13:30: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: 1706763 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=MKQgyC/M; 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 4NFWw46HHzz23n6 for ; Mon, 21 Nov 2022 00:44:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 50DC685342; Sun, 20 Nov 2022 14:35: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="MKQgyC/M"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED3D6852AD; Sun, 20 Nov 2022 14:34: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-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 3A6D785292 for ; Sun, 20 Nov 2022 14:34: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-x82c.google.com with SMTP id z6so5900720qtv.5 for ; Sun, 20 Nov 2022 05:34: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=zfi0DCeb2c+9yhR3ZgDZt/k/XmAwf0ckNO389iFrXLE=; b=MKQgyC/MVQ4++w02gfDRRJwKta3qHjY5v/9jhUaGAcralSJbcF/lMKNFBYp7rHd7sp kwFW15zQNb8iWxtvwpxUTDJdKCnT6vE0vDND8ymWKzznju3ip1ZCyJ7rxSOiKdVv5zgm qw5kgxyUuS79mg0AXcvtn/7AM1dEUEucbp1yc= 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=zfi0DCeb2c+9yhR3ZgDZt/k/XmAwf0ckNO389iFrXLE=; b=mWKNas33+3KCIXJ/j/DQduesYm1MBM14VtYwSFRk5hYgUpMS02oOkVVyiU1CcMFgyW ChIhgTbjwbDArFCel01oP2rXfDz26TwyazBcuPpvoSLsnYLiGt4X4J/nV2knvwLsgNXK cD4nBEVf4ExxBf5FHQujpSX0wrDJ37rBsgsAedjeA82nfMKixQdriiP+b93HQOdaoDKJ cvhxg6kcw0tLn7nnEaTuLWhbITi+FGeTYXEgdntO/aa++Bje0O0x1g7VYVsgu4e/PdBc o555MOE7/oOEy4ikKS6ecGWqgWUvgDjxLgJQY7Go6vZOuy84pbHZJdUIZ/7utcQKoL0b wM2A== X-Gm-Message-State: ANoB5pmfLMcMGBJ/goWMnhzU5Px/cc2guDqoyEr0jG0OCNUDSDxSToBQ vQjV0/y12/bz70DbrEu860VDh66CNLQK7w== X-Google-Smtp-Source: AA0mqf4LK9frQ3mV2IT8TOYUMNbFpp5N8N1pSLiHeWmVIBlAC9X1Yr4E0bUneMB80Cmqw4iOapPbrQ== X-Received: by 2002:ac8:44b5:0:b0:3a4:e32b:2f7e with SMTP id a21-20020ac844b5000000b003a4e32b2f7emr13844212qto.320.1668951276630; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:35 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 059/241] global: Migrate CONFIG_I2C_MVTWSI to CFG Date: Sun, 20 Nov 2022 08:30:50 -0500 Message-Id: <20221120133352.3055600-60-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/arch-sunxi/i2c.h | 6 ++-- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- arch/arm/mach-mvebu/include/mach/config.h | 2 +- drivers/i2c/mvtwsi.c | 38 ++++++++++---------- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/ds414.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/theadorable.h | 4 +-- scripts/config_whitelist.txt | 6 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h index 241b44928a95..f0da46d863cf 100644 --- a/arch/arm/include/asm/arch-sunxi/i2c.h +++ b/arch/arm/include/asm/arch-sunxi/i2c.h @@ -8,13 +8,13 @@ #include #ifdef CONFIG_I2C0_ENABLE -#define CONFIG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE +#define CFG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE #endif #ifdef CONFIG_I2C1_ENABLE -#define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE +#define CFG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE #endif #ifdef CONFIG_R_I2C_ENABLE -#define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE +#define CFG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE #endif /* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */ diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index a6de7676294b..fbef9c99b1d3 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -24,7 +24,7 @@ #include -#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 KW_TWSI_BASE #define MV_UART_CONSOLE_BASE KW_UART0_BASE #define MV_SATA_BASE KW_SATA_BASE #define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index 2e06f2bdaee3..19f9f083129b 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -35,7 +35,7 @@ */ #ifdef CONFIG_CMD_I2C #ifndef CONFIG_SYS_I2C_SOFT -#define CONFIG_I2C_MVTWSI +#define CFG_I2C_MVTWSI #endif #endif diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index a9c7d6e1bc26..55f9b983e884 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; /* - * Include a file that will provide CONFIG_I2C_MVTWSI_BASE*, and possibly other + * Include a file that will provide CFG_I2C_MVTWSI_BASE*, and possibly other * settings */ @@ -197,29 +197,29 @@ inline uint calc_tick(uint speed) static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap) { switch (adap->hwadapnr) { -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 case 0: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE1 +#ifdef CFG_I2C_MVTWSI_BASE1 case 1: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE2 +#ifdef CFG_I2C_MVTWSI_BASE2 case 2: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE2; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE2; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE3 +#ifdef CFG_I2C_MVTWSI_BASE3 case 3: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE3; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE3; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE4 +#ifdef CFG_I2C_MVTWSI_BASE4 case 4: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE4; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE4; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE5 +#ifdef CFG_I2C_MVTWSI_BASE5 case 5: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE5; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE5; #endif default: printf("Missing mvtwsi controller %d base\n", adap->hwadapnr); @@ -737,41 +737,41 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr, 10000); } -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0) #endif -#ifdef CONFIG_I2C_MVTWSI_BASE1 +#ifdef CFG_I2C_MVTWSI_BASE1 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 1) #endif -#ifdef CONFIG_I2C_MVTWSI_BASE2 +#ifdef CFG_I2C_MVTWSI_BASE2 U_BOOT_I2C_ADAP_COMPLETE(twsi2, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 2) #endif -#ifdef CONFIG_I2C_MVTWSI_BASE3 +#ifdef CFG_I2C_MVTWSI_BASE3 U_BOOT_I2C_ADAP_COMPLETE(twsi3, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 3) #endif -#ifdef CONFIG_I2C_MVTWSI_BASE4 +#ifdef CFG_I2C_MVTWSI_BASE4 U_BOOT_I2C_ADAP_COMPLETE(twsi4, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 4) #endif -#ifdef CONFIG_I2C_MVTWSI_BASE5 +#ifdef CFG_I2C_MVTWSI_BASE5 U_BOOT_I2C_ADAP_COMPLETE(twsi5, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index ef9c457e1020..54de2d0d8334 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -17,7 +17,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* USB/EHCI configuration */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 6dbf582d733b..2cbe4eb440b4 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -11,7 +11,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* Environment in SPI NOR flash */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index bf8b35102ad7..5c6d7fa1b776 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -13,7 +13,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* USB/EHCI configuration */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e69883ba73bc..9446acba7923 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -17,7 +17,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 5ad945b55896..413597e09b26 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -19,7 +19,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 9722b0db72aa..2ce92845f1c0 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -25,8 +25,8 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE /* USB/EHCI configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 501e39bb4900..1798a7420cd7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -59,9 +59,9 @@ CFG_HSMMC2_8BIT CFG_HW_ENV_SETTINGS CFG_I2C_ENV_EEPROM_BUS CFG_I2C_MULTI_BUS -CONFIG_I2C_MVTWSI -CONFIG_I2C_MVTWSI_BASE0 -CONFIG_I2C_MVTWSI_BASE1 +CFG_I2C_MVTWSI +CFG_I2C_MVTWSI_BASE0 +CFG_I2C_MVTWSI_BASE1 CONFIG_I2C_RTC_ADDR CONFIG_ICS307_REFCLK_HZ CONFIG_IMX6_PWM_PER_CLK From patchwork Sun Nov 20 13:30: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: 1706811 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=dX+x80Wy; 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 4NFX6D1RVMz23lt for ; Mon, 21 Nov 2022 00:53:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 69489852AC; Sun, 20 Nov 2022 14:38: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="dX+x80Wy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 68B6185200; Sun, 20 Nov 2022 14:38:16 +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 69C5785283 for ; Sun, 20 Nov 2022 14:34: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-qv1-xf2a.google.com with SMTP id df6so4247993qvb.0 for ; Sun, 20 Nov 2022 05:34: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=BRYWLye1tPkXrLgM5EEnpSGDgFM5LR0e0WL26+eY74Q=; b=dX+x80WyKmP12aD2v03qI77XlEk7YLXsSjuWpyjS+uDQUk4X1KZPxGdYMyAawzWrEf AXR8Ny4tX86YFhwSm7h+ylPNZ2avPlwwPokqMScNJxMABNRSRpFw6Kt2NdUKm3cnfZq5 c8H4SgmHv2pGXkO90a4lmQXzILUAkkaSCH2lU= 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=BRYWLye1tPkXrLgM5EEnpSGDgFM5LR0e0WL26+eY74Q=; b=rzuNVmASzL08UatWAaGp9Q3/dl0kXNGmiPyCnDDOYlTBSFcxx47qb5oyKOsGqH5psm MhwhaJVUYXdL7jN9n6gP9Yhc+8fl5/plHqLvsCsLdn13/lpYEMxYrT2STjZJ21AX9Hp1 uotg3QT5IEXfYgj2vG0WYuaKLTq579s3WJgYNly8ZgQmPi4CKy4dTC8V5meIYMHE5YlL FzvXDxkCxUjfXZRhRSy3PG6tpnS18vp/G/Z+Z3GoV3Ew26tmf2qBhbFbwScM/ac99UK4 DQHJJNh2M7pMNUEjHQKgtYA++tERRr19yaTaY/QvdmwHhrkiKTRSOTqlbXEaRxcA6+Xz NIiQ== X-Gm-Message-State: ANoB5pm0wwQDt2OrIfXPUyt2CizzpvRJ342IXNkukpmHg4Ez/C49gB0+ F0a9q+pDgGuzDlZJDEQRJBZxjo9mfY8i/w== X-Google-Smtp-Source: AA0mqf6fZFQarbFo5BBsQsLx3CDh+Jl3ciVrM2mmWNwSvt+zBtLh6PHHOk7tUOYXdvDfmKqXgdQNRw== X-Received: by 2002:ad4:534b:0:b0:4b1:8429:a8a7 with SMTP id v11-20020ad4534b000000b004b18429a8a7mr538133qvs.52.1668951277313; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:36 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 060/241] global: Migrate CONFIG_I2C_RTC_ADDR to CFG Date: Sun, 20 Nov 2022 08:30:51 -0500 Message-Id: <20221120133352.3055600-61-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/eb_cpu5282.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 5ef51c94dab8..a4370ca5c7cc 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -150,7 +150,7 @@ */ #ifdef CONFIG_CMD_DATE -#define CONFIG_I2C_RTC_ADDR 0x68 +#define CFG_I2C_RTC_ADDR 0x68 #endif #endif /* _CONFIG_M5282EVB_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1798a7420cd7..e507dca614f5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -62,7 +62,7 @@ CFG_I2C_MULTI_BUS CFG_I2C_MVTWSI CFG_I2C_MVTWSI_BASE0 CFG_I2C_MVTWSI_BASE1 -CONFIG_I2C_RTC_ADDR +CFG_I2C_RTC_ADDR CONFIG_ICS307_REFCLK_HZ CONFIG_IMX6_PWM_PER_CLK CONFIG_IPADDR From patchwork Sun Nov 20 13:30: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: 1706761 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=r44C+GNe; 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 4NFWvg4j5Vz23n6 for ; Mon, 21 Nov 2022 00:43:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EA0E8532C; Sun, 20 Nov 2022 14:35: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=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="r44C+GNe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C225852AB; Sun, 20 Nov 2022 14:34: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-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 9C18285293 for ; Sun, 20 Nov 2022 14:34: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-qt1-x832.google.com with SMTP id l15so5912486qtv.4 for ; Sun, 20 Nov 2022 05:34: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=+tf10g530TXcHeP0g0GGLKajc1/ROmjjbwfwYu/l68U=; b=r44C+GNeOz9Y4fyNENfnwcmlhRCbvQOt46OctoIXj1dDUekShgIKLN6YPs/pxyU3DY 98xA7jwfeCd8nVbIjAC7aWd/8pRkn93evaaF48Y1y04sn6gNF1y3DXnIbxUSPsrH5YZe n6kwm7iCA9VNgkoWdu7YPo+sgRiFBxeY/Psas= 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=+tf10g530TXcHeP0g0GGLKajc1/ROmjjbwfwYu/l68U=; b=qAsXHaFybqvkLSvqwU7+l5dTDfuEStc4XDI8U7NVjlxSyHkqaes9F3fSF8CZbFRSAV mbHpG7EmtOLEzejWxYUl6x+epd2huFIH/Yd3ctmTszlqlV8m3EFvOvs4hxbSj0K1TspM vBEpKj3SRR5/SdAN6FX6YlaHvHxhqgvee3LRTSjANaImWfM3tATazd9ljqH9cKNow9Ks rh1UdZi1HPTe4UcjQgy5t152Gkr/r05kNseUtzR3AJ1bpPO91ayWUvuG26KjSEGlzRF6 QCx9A8CjjnSuvzy1dRQiedqoSOrjIog07KBbtJ7t4dXut0AY63pHZ5gjXccqM3CbldE0 jmfg== X-Gm-Message-State: ANoB5pnOGg616BGCSUv0Io9W58PdylrCxUSeemkQ8sGsN52c0RLDLORS Z2mfL19E1+uoLdDbg4uh+GbajRfDA8h/vQ== X-Google-Smtp-Source: AA0mqf5tvyPEcnvIE98zndB5DlkUbUs0lWv8e0eIMAq7KvKpvOFw1W6ReTrOBiRvgrlzikozExHfmA== X-Received: by 2002:a05:622a:514e:b0:3a5:2988:c67c with SMTP id ew14-20020a05622a514e00b003a52988c67cmr1446649qtb.487.1668951278033; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:37 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 061/241] global: Migrate CONFIG_ICS307_REFCLK_HZ to CFG Date: Sun, 20 Nov 2022 08:30:52 -0500 Message-Id: <20221120133352.3055600-62-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- board/freescale/common/ics307_clk.c | 4 ++-- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c index 01662d36e9fb..5f95571d24cc 100644 --- a/board/freescale/common/ics307_clk.c +++ b/board/freescale/common/ics307_clk.c @@ -50,7 +50,7 @@ static u8 ics307_s_to_od[] = { */ unsigned long ics307_sysclk_calculator(unsigned long out_freq) { - const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ; + const unsigned long input_freq = CFG_ICS307_REFCLK_HZ; unsigned long vdw, rdw, odp, s_vdw = 0, s_rdw = 0, s_odp = 0, od; unsigned long tmp_out, diff, result = 0; int found = 0; @@ -101,7 +101,7 @@ unsigned long ics307_sysclk_calculator(unsigned long out_freq) */ static unsigned long ics307_clk_freq(u8 cw0, u8 cw1, u8 cw2) { - const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ; + const unsigned long input_freq = CFG_ICS307_REFCLK_HZ; unsigned long vdw = ((cw1 << 1) & 0x1FE) + ((cw2 >> 7) & 1); unsigned long rdw = cw2 & 0x7F; unsigned long od = ics307_s_to_od[cw0 & 0x7]; diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 0d245940dc0e..c614a539b391 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -13,7 +13,7 @@ #include -#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ /* High Level Configuration Options */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 28c59b4e66f8..2da4f5a09b14 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -13,7 +13,7 @@ #include -#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ /* High Level Configuration Options */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 640c12d91ab5..b8bfc52f07ae 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -12,7 +12,7 @@ #include -#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e507dca614f5..9516ba848bfc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -63,7 +63,7 @@ CFG_I2C_MVTWSI CFG_I2C_MVTWSI_BASE0 CFG_I2C_MVTWSI_BASE1 CFG_I2C_RTC_ADDR -CONFIG_ICS307_REFCLK_HZ +CFG_ICS307_REFCLK_HZ CONFIG_IMX6_PWM_PER_CLK CONFIG_IPADDR CONFIG_IRAM_BASE From patchwork Sun Nov 20 13:30: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: 1706765 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=OiXiommM; 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 4NFWwW0Lzlz23n6 for ; Mon, 21 Nov 2022 00:44:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8DB985349; Sun, 20 Nov 2022 14:35: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="OiXiommM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B192C852B4; Sun, 20 Nov 2022 14:34: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-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 5440685280 for ; Sun, 20 Nov 2022 14:34: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-qk1-x734.google.com with SMTP id s20so6511730qkg.5 for ; Sun, 20 Nov 2022 05:34: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=57erM5JMbXoN1QDywUfXyL9BIxVaq2/ZeJjbQqFRoOc=; b=OiXiommMrheQIrg+HpAMk0yDmxjTKDrmK6i7WrFijC6ibGrQGLaKz2CFJTajES9UXD phUy0xcM2cLyJbBCxYMUrcbNksIfvHFGbwqLtfZgaNTWsBZsTAevwbzz79TUEYiBdRKa 8ZURvr5YNXAKCS6Ay98NuyDtrfNMibX13KLEI= 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=57erM5JMbXoN1QDywUfXyL9BIxVaq2/ZeJjbQqFRoOc=; b=bwNOKXEGxWfHTdRrxZ+DHUkYQhp5L7XDffDuUWxrIh4Jgi+ZwC8kR8haaUjuz5V6qi Gc8l2MH1l8LRj0QvJOe0PRs/BN0Omj37WxivuIfGqJtfdzdP0+eRC7KoiI3xCu4YeDQo FIUg37Ii3W+OZp8fN1VpU1WeMUGS2JQaYPKHEc+yrIPW1eGv+eTRqOXtFYVx5Xul6YAw QzpY8bzCWdH5++t9AMHhSf2SNuPdcJh+J/Keka67aWl02/oLyBga96lgbqcdTTSNA59K 1GZWF/8s4ytOGw1bcBALAKBKV2LFCeaxzkoglbroCL6Zjmi4mIPJQtYYOBRvKrHA4Ym8 BxYw== X-Gm-Message-State: ANoB5pkvLWRg3uxmHmDtNK1gT9/64EF1tzEnA6/OZt31xaR2Vn3Evga9 L3X/mNg3HDxYxT8e4i0amZOgfr9KcPoWtw== X-Google-Smtp-Source: AA0mqf5cNLmqzKf2853ziKDzwIWK3KzHhjRAlYYYM9dbmrWUL82CwGNHPiFobBBEkT6Qa2RzkhGJUw== X-Received: by 2002:a37:ac05:0:b0:6fb:4ef0:3f38 with SMTP id e5-20020a37ac05000000b006fb4ef03f38mr12947011qkm.439.1668951278712; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 062/241] global: Migrate CONFIG_IMX6_PWM_PER_CLK to CFG Date: Sun, 20 Nov 2022 08:30:53 -0500 Message-Id: <20221120133352.3055600-63-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/pwm/pwm-imx.c | 2 +- include/configs/vining_2000.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 9b8a8c189d09..8fbb40cc2767 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -76,7 +76,7 @@ int pwm_imx_get_parms(int period_ns, int duty_ns, unsigned long *period_c, * value here as a define. Replace it when we have the clock * framework. */ - c = CONFIG_IMX6_PWM_PER_CLK; + c = CFG_IMX6_PWM_PER_CLK; c = c * period_ns; do_div(c, 1000000000); *period_c = c; diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index c84353ebea66..cdd2eeef0ac9 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -43,7 +43,7 @@ #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6) #endif -#define CONFIG_IMX6_PWM_PER_CLK 66000000 +#define CFG_IMX6_PWM_PER_CLK 66000000 #ifdef CONFIG_ENV_IS_IN_MMC /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9516ba848bfc..48de265ee7e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -64,7 +64,7 @@ CFG_I2C_MVTWSI_BASE0 CFG_I2C_MVTWSI_BASE1 CFG_I2C_RTC_ADDR CFG_ICS307_REFCLK_HZ -CONFIG_IMX6_PWM_PER_CLK +CFG_IMX6_PWM_PER_CLK CONFIG_IPADDR CONFIG_IRAM_BASE CONFIG_IRAM_END From patchwork Sun Nov 20 13:30: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: 1706813 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=Ngm7WPLL; 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 4NFX6d0VKgz23lt for ; Mon, 21 Nov 2022 00:53:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5DC9A853DC; Sun, 20 Nov 2022 14:38: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="Ngm7WPLL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE98B8528A; Sun, 20 Nov 2022 14:38: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-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 37166852A4 for ; Sun, 20 Nov 2022 14:34: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-qk1-x729.google.com with SMTP id d7so6499243qkk.3 for ; Sun, 20 Nov 2022 05:34: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=obwsbgdBO91JGcAHgtPyCld0U6+C/IezfbTRpBPU00w=; b=Ngm7WPLLjom/cE8OUQJGGM5pfy/fecwmys9YnknTpTv8dC/mkRKe+qNRvCehczO+iR B9QFv+9/R+sTWmBUbxyvT39CjFs1PpISAcYxJ5ezYGeFopmmMZMUZ45Zz+JcrhEQcqOo 2+2eiACFPT8RTxwf46o+nf/P40vyinkI0pxTM= 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=obwsbgdBO91JGcAHgtPyCld0U6+C/IezfbTRpBPU00w=; b=EJ0hdggUg8ACiZw1IiZfEI181KJqlVVOwA7LZQV4KfEOZrCBNHX1OmcUfU/oxDAV0q 91dHBc9Z5C84CK9yHQ+c/deVHwXG4yWyrQgC8VGQ3PdHEQpTbx3lXCTDAP5Ux5TsBp7J WZKjtVTBbnp0i5WOw7eJP/j9K8lfwk+b0UaASEXGXpnbXeDx7/GwZTuPaQrs7NyO2XMl V6xqwMgE7curU8IIONws9Nb4LaVT/9RHpXB/8D0nv/mH1avWHB/xUUg7kVluSYAb/1P2 JGC+Ho3g8qb0Lunh3i2QKDBhZMQYtbuyVAPRRvAhFfSeWkJuLvgpOtOO9xenGK840/lB FQjw== X-Gm-Message-State: ANoB5pnuSgTsJ3S35MAWF6JJofzaoxPJoYi4w14D7IKpTQPyKu6W4N07 ke8bmdQBxISuugfDPI7Qtw7lxCjKKe7vdg== X-Google-Smtp-Source: AA0mqf63k1jL/WvST0yYEP9A9JVY9aAhwMJsDNKUeqEvOLQF16GFEYfF03yoHLFfAf5IzV/0/NR0Wg== X-Received: by 2002:a05:620a:a1d:b0:6fa:3477:d62f with SMTP id i29-20020a05620a0a1d00b006fa3477d62fmr12763034qka.279.1668951279472; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:39 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 063/241] global: Migrate CONFIG_IPADDR to CFG Date: Sun, 20 Nov 2022 08:30:54 -0500 Message-Id: <20221120133352.3055600-64-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- 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/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 30 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README b/README index 50bfd7e4fffc..d09ebd47cd83 100644 --- a/README +++ b/README @@ -735,7 +735,7 @@ The following options need to be configured: command issued before MII status register can be read - IP address: - CONFIG_IPADDR + CFG_IPADDR Define a default value for the IP address to use for the default Ethernet interface, in case this is not diff --git a/doc/README.usb b/doc/README.usb index 650a6daae0a5..495b1859a771 100644 --- a/doc/README.usb +++ b/doc/README.usb @@ -162,7 +162,7 @@ common executable is discouraged, as it leads to potential conflicts, 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 CONFIG_IPADDR 10.0.0.2 (replace with your value) +#define CFG_IPADDR 10.0.0.2 (replace with your value) #define CONFIG_SERVERIP 10.0.0.1 (replace with your value) #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ce75c4cbcaf0..647e23f380b8 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -18,7 +18,7 @@ /* I2C */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 8cebf099f1db..7bc86eb8b5f6 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -27,7 +27,7 @@ /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 10bfb01a2e03..4b88cfc2cdd9 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -30,7 +30,7 @@ env/embedded.o(.text); #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index b69e452b9e50..f34985c47d4b 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -30,7 +30,7 @@ env/embedded.o(.text*); #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index ce38b823436d..5afd8383c1bd 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -31,7 +31,7 @@ /* I2C */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 2dc22a0b5af8..9d5f0e1c0964 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -23,7 +23,7 @@ /* I2C */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index bce4a8470f91..807d591c9f12 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -25,7 +25,7 @@ /* I2C */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 6e7b6e81208f..d61ed82ab3bf 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -52,7 +52,7 @@ "${ofl_args}; " \ "bootm ${loadaddr} - 0xf00000\0" -#define CONFIG_IPADDR 192.168.0.3 +#define CFG_IPADDR 192.168.0.3 #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_NETMASK 255.0.0.0 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 2ce8597c0c52..d2a70aa88f88 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -325,7 +325,7 @@ * Environment Configuration */ -#define CONFIG_IPADDR 192.168.1.253 +#define CFG_IPADDR 192.168.1.253 #define CFG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 15bedc0afc29..0258a70d923b 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -14,7 +14,7 @@ #define USDHC2_BASE_ADDR 0x5b020000 /* Networking */ -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index f0a02ae17953..4db3465cd9b7 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -33,8 +33,8 @@ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_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 4899dfb4dee1..8db2909c96b2 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -35,8 +35,8 @@ /* Command definition */ -#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 6d6e2fc69620..1b5115f7caf1 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -91,7 +91,7 @@ enter a valid image address in flash */ /* User network settings */ -#define CONFIG_IPADDR 192.168.100.2 /* default board IP address */ +#define CFG_IPADDR 192.168.100.2 /* default board IP address */ #define CONFIG_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 a748d4f3169f..4f5287b6bcfb 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 #define CFG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index e4bb71d47d62..35f29da0c351 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -14,7 +14,7 @@ #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 0486db6b51ed..2f30322bb4f8 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -30,8 +30,8 @@ /* Command definition */ -#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_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 99ed8183ef21..0da7553e0245 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -21,7 +21,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index ef49969598c9..808d69d0c865 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -16,7 +16,7 @@ /* NAND support */ -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4d0a78c6269c..e71f10a24fa1 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -57,7 +57,7 @@ /* Persistent Environment Config */ /* Environment */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.146 #endif /* __CONFIG_H */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 25bb41ebc46c..ccf73604480b 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -20,7 +20,7 @@ #define CFG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */ #define CONFIG_SERVERIP 192.168.1.100 -#define CONFIG_IPADDR 192.168.1.104 +#define CFG_IPADDR 192.168.1.104 /* * Miscellaneous configurable options diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 8c297266d8b1..199da46ad018 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -18,7 +18,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000 /* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.3 #endif diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 031c1aea0c00..d3cf6597a633 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -33,7 +33,7 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" /* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2 #ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index bfa44aacc726..8c0b02b40e50 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -28,7 +28,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000 /* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2 #endif diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 204a9b0b5458..0d38645c0e60 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -15,7 +15,7 @@ 115200, 230400, 460800, 921600 } /* Default Env vars */ -#define CONFIG_IPADDR 0.0.0.0 /* In order to cause an error */ +#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_GATEWAYIP 0.0.0.0 diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 7998ef7347fb..3e4309512cc1 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -15,7 +15,7 @@ /* Default environemnt variables */ #define CONFIG_SERVERIP 192.168.0.1 -#define CONFIG_IPADDR 192.168.0.2 +#define CFG_IPADDR 192.168.0.2 #define CONFIG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 874f75404712..3ec3caade49c 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -47,7 +47,7 @@ * Network Configuration */ #define CONFIG_SERVERIP 192.168.11.1 -#define CONFIG_IPADDR 192.168.11.10 +#define CFG_IPADDR 192.168.11.10 #define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0 diff --git a/include/env_default.h b/include/env_default.h index b1fe945bae5b..5ee28a54960d 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -53,8 +53,8 @@ const char default_environment[] = { #ifdef CONFIG_ETHPRIME "ethprime=" CONFIG_ETHPRIME "\0" #endif -#ifdef CONFIG_IPADDR - "ipaddr=" __stringify(CONFIG_IPADDR) "\0" +#ifdef CFG_IPADDR + "ipaddr=" __stringify(CFG_IPADDR) "\0" #endif #ifdef CONFIG_SERVERIP "serverip=" __stringify(CONFIG_SERVERIP) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 48de265ee7e1..9e927d81200a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -65,7 +65,7 @@ CFG_I2C_MVTWSI_BASE1 CFG_I2C_RTC_ADDR CFG_ICS307_REFCLK_HZ CFG_IMX6_PWM_PER_CLK -CONFIG_IPADDR +CFG_IPADDR CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE From patchwork Sun Nov 20 13:30:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706812 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=VCCzRwMS; 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 4NFX6Q570sz23lt for ; Mon, 21 Nov 2022 00:53:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D850853D8; Sun, 20 Nov 2022 14:38: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="VCCzRwMS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3ADA88528A; Sun, 20 Nov 2022 14:38: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-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 B0E61852A7 for ; Sun, 20 Nov 2022 14:34: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-x833.google.com with SMTP id e15so5911191qts.1 for ; Sun, 20 Nov 2022 05:34: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=nO2skLf+2YwBChjrChY+VggUtLUYsruPCQMkYrDJnCI=; b=VCCzRwMSI2x8rx6quVKAf4KdGqacEdptDJRdFZEwp7hOuzP0dbAv/HtjNnySvkICcP nTIIVxeKOmQPQtL9VVICaf87MeiBMGwL/mrX9rt5lVdQ0X5Qo6M57X1mC+YmZht6FyXe jOdT1bp4qJnxNQmKvagueeeVmUqhQEG/bMps0= 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=nO2skLf+2YwBChjrChY+VggUtLUYsruPCQMkYrDJnCI=; b=eIpigXhV3nPFo8eZq4KWLaMccv/dmPbHBov97b/LbQsaInJ7MTzUOQ3F2FgQfGpv0A /81O1PV010KUuwqVuuzhM0OJKjzsSaAdmjBVYIDYMjLPYC+cJz/a1XwRKBr86wzYDKrD NFmRPmGqq9JBX5VKNEACxgS9xdve3Q1+scYCFNKigkst9J9M3PBZ/VrpVQyeAuiF/FFi DL8snzAyO2prX1rJIoA6QvkRcj2m/Ki14siPtRIYp6exwhCHaeE4TV36snVAq9f0S1mT xtAcF19GFBzzdt99T5Up82JH12cehlVcwgzhvKu4DiSjLamqwKp9Mld1xAV+BVdzFyWl MEfA== X-Gm-Message-State: ANoB5pm4Dq25JSPPZR1jfnBLw12JOrlc6fsK2dha6taQauUDhE4fRaOM Sn/5W+pxlVZ9B8di95FgkfUJK96SxkEScg== X-Google-Smtp-Source: AA0mqf6BSj1KYnArGdrJk0XRLeALP1OwDlPK6uYUKpYv3Le/e79WD+Vb+CVneDSu4zVhVAdr31sUWA== X-Received: by 2002:ac8:734f:0:b0:3a5:a2:3486 with SMTP id q15-20020ac8734f000000b003a500a23486mr2047361qtp.560.1668951280010; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:39 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 064/241] global: Migrate CONFIG_IRAM_BASE to CFG Date: Sun, 20 Nov 2022 08:30:55 -0500 Message-Id: <20221120133352.3055600-65-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/arch-rockchip/bootrom.h | 2 +- include/configs/exynos7420-common.h | 4 ++-- include/configs/px30_common.h | 2 +- include/configs/rk3066_common.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3308_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rk3399_common.h | 2 +- include/configs/rk3568_common.h | 2 +- include/configs/rv1108_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h index 0da78f30b619..4276a0f6811a 100644 --- a/arch/arm/include/asm/arch-rockchip/bootrom.h +++ b/arch/arm/include/asm/arch-rockchip/bootrom.h @@ -57,6 +57,6 @@ extern const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1]; /** * Locations of the boot-device identifier in SRAM */ -#define BROM_BOOTSOURCE_ID_ADDR (CONFIG_IRAM_BASE + 0x10) +#define BROM_BOOTSOURCE_ID_ADDR (CFG_IRAM_BASE + 0x10) #endif diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index c8408eb39200..937a3c8820c1 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -16,9 +16,9 @@ /* select serial console configuration */ /* IRAM Layout */ -#define CONFIG_IRAM_BASE 0x02100000 +#define CFG_IRAM_BASE 0x02100000 #define CONFIG_IRAM_SIZE 0x58000 -#define CONFIG_IRAM_END (CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE) +#define CONFIG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE) #define CPU_RELEASE_ADDR secondary_boot_addr /* select serial console configuration */ diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 003686930a4b..3f1595cdc95f 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -9,7 +9,7 @@ #include "rockchip-common.h" /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */ -#define CONFIG_IRAM_BASE 0xff020000 +#define CFG_IRAM_BASE 0xff020000 #define GICD_BASE 0xff131000 #define GICC_BASE 0xff132000 diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index c4758e148ba7..1a6d3678df3e 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -9,7 +9,7 @@ #include #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000 #define CFG_SYS_SDRAM_BASE 0x60000000 #define SDRAM_BANK_SIZE (1024UL << 20UL) diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 5b0ec3700040..8aa17bfbd364 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -10,7 +10,7 @@ #define CFG_SYS_HZ_CLOCK 24000000 -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000 /* RAW SD card / eMMC locations. */ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 58f491c2f320..ac9195672fb7 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -9,7 +9,7 @@ #include #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000 /* spl size 32kb sram - 2kb bootrom */ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index b95268df87c2..fcaf9c52c4be 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -10,7 +10,7 @@ #define CFG_SYS_HZ_CLOCK 24000000 -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000 #define CFG_SYS_SDRAM_BASE 0x60000000 #define SDRAM_BANK_SIZE (512UL << 20UL) diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index d3b8a5150f6b..5f29432be10b 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -11,7 +11,7 @@ #define CFG_SYS_HZ_CLOCK 24000000 -#define CONFIG_IRAM_BASE 0xff700000 +#define CFG_IRAM_BASE 0xff700000 /* RAW SD card / eMMC locations. */ diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index bc03e113fef0..55a0dfecb21b 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -8,7 +8,7 @@ #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xfff80000 +#define CFG_IRAM_BASE 0xfff80000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 85d2186f23e0..fadcb93a5f7e 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -8,7 +8,7 @@ #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xff090000 +#define CFG_IRAM_BASE 0xff090000 /* FAT sd card locations. */ #define CFG_SYS_SDRAM_BASE 0 diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 17636250510b..9aa256b59592 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -14,7 +14,7 @@ #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define CONFIG_IRAM_BASE 0xff8c0000 +#define CFG_IRAM_BASE 0xff8c0000 #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 43066933d02f..9512cfdcd2d5 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -8,7 +8,7 @@ #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xff8c0000 +#define CFG_IRAM_BASE 0xff8c0000 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT) #else diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index 750f16d03999..ae360105d508 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -8,7 +8,7 @@ #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xfdcc0000 +#define CFG_IRAM_BASE 0xfdcc0000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf0000000 diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 6e17b23b624c..63551b47e200 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -8,7 +8,7 @@ #include #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000 #define CFG_SYS_TIMER_RATE (24 * 1000 * 1000) /* TIMER1,initialized by ddr initialize code */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9e927d81200a..ccc719a3b985 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -66,7 +66,7 @@ CFG_I2C_RTC_ADDR CFG_ICS307_REFCLK_HZ CFG_IMX6_PWM_PER_CLK CFG_IPADDR -CONFIG_IRAM_BASE +CFG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP From patchwork Sun Nov 20 13:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706768 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=D3Dwmj1v; 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 4NFWx80Ksjz23mR for ; Mon, 21 Nov 2022 00:45:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EC0AE852FF; Sun, 20 Nov 2022 14:35: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=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="D3Dwmj1v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4FC09852D0; Sun, 20 Nov 2022 14:34: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-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 055B1852AA for ; Sun, 20 Nov 2022 14:34: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-qk1-x735.google.com with SMTP id i9so6486466qki.10 for ; Sun, 20 Nov 2022 05:34: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=rmgzvjAXMyq1v2YYF/x7Lx8Y+KVmOYxs4fZvgUWvqeI=; b=D3Dwmj1vn8IZ7rEQa2FMi5CQC/DJkwG6DeutauUX+IWIlitiHVwG+I2c7jMERRWRV+ cThyC3fMS+5o4x3lel0YQLhnPpnWLJ+Qph+xCo1WLAGSbz05+lNz9l7do7KHleQMqeTT c9UiC43AwLIqwcQy7fYrjcno2eEaq+/rehOk8= 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=rmgzvjAXMyq1v2YYF/x7Lx8Y+KVmOYxs4fZvgUWvqeI=; b=ABvtQ2IXJelVhFqy2ROB5+4BVbN9aKjGwtFeCspoq27+j9uqsNc8WGVgGyX9d6uRiD oPYSdGcJS6iSvBlO6OtgncBXjiqS3BwSmYtq/5pOrp1K6sDcZwEYbr3AnIgLXSHHUtK3 n/ccbm1lZtY5uAaoH/Ej1mBbFGK7RJGE2a7/zUQmiA1Hv1DmfZ7XDrGI8SuHFhz8Q5lt nuCNFid5MnvhmvE5IP2X/QpjoIh/S3whbdHcNh61ACXP8gFc+n8tT6jH52pf1AYrLlj6 HvLd1qZAAwWLisDDtByiglTO6HGpZaIeti79xfsnG9dSE4yfE94AqclpTpXjkzpQ9uWF V+Pw== X-Gm-Message-State: ANoB5pkHdbB7yCnN6DKV69ZgBs/TJfm/XT8sLCfsXaNeOmcfH6d6oWUg WhloKKDpxAJXFzdFKMEtcpkVNc4RBQolBQ== X-Google-Smtp-Source: AA0mqf4XHbi7E+nR0jHkvmuCtZlAmMCOizovpri7z5ZiXGjshize2uWQav2FWgrZ2IwMaGW5BGsKLg== X-Received: by 2002:a05:620a:747:b0:6ee:c0c5:a70b with SMTP id i7-20020a05620a074700b006eec0c5a70bmr12456462qki.592.1668951280501; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:40 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 065/241] global: Migrate CONFIG_IRAM_END to CFG Date: Sun, 20 Nov 2022 08:30:56 -0500 Message-Id: <20221120133352.3055600-66-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/exynos7420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 937a3c8820c1..44843aba3c30 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -18,7 +18,7 @@ /* IRAM Layout */ #define CFG_IRAM_BASE 0x02100000 #define CONFIG_IRAM_SIZE 0x58000 -#define CONFIG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE) +#define CFG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE) #define CPU_RELEASE_ADDR secondary_boot_addr /* select serial console configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ccc719a3b985..ee3bb81bb47f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -67,7 +67,7 @@ CFG_ICS307_REFCLK_HZ CFG_IMX6_PWM_PER_CLK CFG_IPADDR CFG_IRAM_BASE -CONFIG_IRAM_END +CFG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP CONFIG_KM_DEF_ARCH From patchwork Sun Nov 20 13:30: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: 1706764 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=M/2SxLY3; 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 4NFWwJ1vBrz23n6 for ; Mon, 21 Nov 2022 00:44:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA2B485345; Sun, 20 Nov 2022 14:35: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="M/2SxLY3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E586A852AD; Sun, 20 Nov 2022 14:34:43 +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 892F58529D for ; Sun, 20 Nov 2022 14:34: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-x835.google.com with SMTP id s4so5904555qtx.6 for ; Sun, 20 Nov 2022 05:34: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=bjSUbTmNgabeU5pmlPZzcqMjTA2c3VEbUKOBZOe9oDI=; b=M/2SxLY3ispsem9NVOOrsBDYyehA9pX9V5PG2Z3fr+FNoAGBqRwOb5nNJY5fXrfm21 QZmgudmtAVKjl7wMztKXOeUW/OQdI1siAuRq4i6CTfafXeQvSOFZ35fivgqj48wuWsJ3 G6VmhD1qiu9WoUtpmjXPv+bR29SC5ciytRTlU= 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=bjSUbTmNgabeU5pmlPZzcqMjTA2c3VEbUKOBZOe9oDI=; b=T2iRUsIO4jwARJvoKbCYZD6ewx4oujmGTzflqcBwEE8YrGuf6Qdn+8w13rpC73oMLU JM4g+hisU1eqcuqxZI10bBOsiPmfuh56K9vhzyN63zdjZPR6QSxXMVch/ruXfJ0MogMc Er4f4ecZSaQh71g+f3+RPcks9oDv8i6EJ7Lp6turOMQgY5RaZZZ8UMBfdsadE6e799NW T38Ug1h8lNNf11WjWv6Rclalu5xOyoh6m+phSttekg1SzwFL8qBNpqzhvE/u0NTrn0sK 6TkyFUCJ5+gRZ9Ad8RkOk50YlIMrreg+chifTmmg/gy8yb24mCyV8g/Q3IHISiUzFaMk R6Hg== X-Gm-Message-State: ANoB5pkAKkhYiyJgjDjcIKZSc41lU/IcSLthNLPGwWXiM6NCQz0ZBXqA oYaj5Pn/Ij3yt7glrjULCp7E4EYaAhqpzQ== X-Google-Smtp-Source: AA0mqf4v9/7ti0HpVtkCxaguRngofVZ6Ep6dAFRu1kVATGj2E+/Q5Dij0cTAN37XusK3aMw9Nse1gQ== X-Received: by 2002:a05:622a:1386:b0:3a6:18ff:c6c1 with SMTP id o6-20020a05622a138600b003a618ffc6c1mr13615537qtk.683.1668951281038; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:40 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 066/241] global: Migrate CONFIG_IRAM_SIZE to CFG Date: Sun, 20 Nov 2022 08:30:57 -0500 Message-Id: <20221120133352.3055600-67-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/exynos7420-common.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 44843aba3c30..0a522baed894 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -17,8 +17,8 @@ /* IRAM Layout */ #define CFG_IRAM_BASE 0x02100000 -#define CONFIG_IRAM_SIZE 0x58000 -#define CFG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE) +#define CFG_IRAM_SIZE 0x58000 +#define CFG_IRAM_END (CFG_IRAM_BASE + CFG_IRAM_SIZE) #define CPU_RELEASE_ADDR secondary_boot_addr /* select serial console configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ee3bb81bb47f..249ec5090b8a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -68,7 +68,7 @@ CFG_IMX6_PWM_PER_CLK CFG_IPADDR CFG_IRAM_BASE CFG_IRAM_END -CONFIG_IRAM_SIZE +CFG_IRAM_SIZE CONFIG_IRAM_TOP CONFIG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU From patchwork Sun Nov 20 13:30:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706766 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=VEteD+Ev; 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 4NFWwk2cFkz23n6 for ; Mon, 21 Nov 2022 00:44:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22DA48529D; Sun, 20 Nov 2022 14:35: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="VEteD+Ev"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7BD84852C7; Sun, 20 Nov 2022 14:34:48 +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 33B47852AE for ; Sun, 20 Nov 2022 14:34: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-qk1-x731.google.com with SMTP id p18so6507293qkg.2 for ; Sun, 20 Nov 2022 05:34: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=l/revevxMHM+oQegdLyMo15QV1l44G8WjuOECH5k0qA=; b=VEteD+EvtwjKAnzt5AELtltvOfE9pUXAPgiNQbJtISi7Dkw+KMa9NQcGdiV9GBkqKK Aq45rbZT3XbnICa8aK7TApPPqpxX7FzI3FYYsV2utKn2c8eOv5v8+oCueYUuyQ5f9vBb jYkzwXAPCDWv2LZfYHIuf+ZOW9Tnc1kHt/HeE= 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=l/revevxMHM+oQegdLyMo15QV1l44G8WjuOECH5k0qA=; b=aJbmQP/wFW9iLPFx0n+tzqVK9Sde50XykaprLgxpHZeNNaYten5v5T1n4s7i817eRx YvgkvARUaEMNsko4CmrcYJOltEcXQpFz+IAPmdAfowScQUOmHBxJ+iJSkYx7CCk8ovbJ 7gmXrW+GRwmeR4t7Kx2hVwt2rbvVICOhzaGp7A/0DwxUGCgaOzKmI8Z9jPwKzsmWoO/C pYN2FHLpf6owhHW75n05fo+KWYKy7r9wqFbDTxfcvyvgaXj96FlPBgqSTyBC8RkbiWI2 8qCIQN/L4TPRIlWeeJLuAx92H0FeWuMKnni3Al3Dt2fdW6DzNwLNM8hys6ttw9bUuwYC A2Pg== X-Gm-Message-State: ANoB5pmVzFfZ+f6SCIbcr5f5D5pHBMiDr6pH+eIOsYyakmQRO7qmZ5Bi /o3KBtRdkwUTKpcoJmupXIMKuv56/Tx5Vg== X-Google-Smtp-Source: AA0mqf6z2Z1k6tUQJqUIINbvIM8rKreJp1kbcdo7G7Ekehk41sSw6hb342PdTAFAkxoKvbCjq6s1UA== X-Received: by 2002:a05:620a:530c:b0:6fa:6e0c:ab79 with SMTP id oo12-20020a05620a530c00b006fa6e0cab79mr13147922qkn.74.1668951281658; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:41 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 067/241] global: Migrate CONFIG_IRAM_TOP to CFG Date: Sun, 20 Nov 2022 08:30:58 -0500 Message-Id: <20221120133352.3055600-68-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/mach-exynos/lowlevel_init.c | 2 +- arch/arm/mach-exynos/sec_boot.S | 2 +- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 1ff5fcac1b38..9225d2cc1f2a 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -51,7 +51,7 @@ enum { #ifdef CONFIG_EXYNOS5420 /* Address for relocating helper code (Last 4 KB of IRAM) */ -#define EXYNOS_RELOCATE_CODE_BASE (CONFIG_IRAM_TOP - 0x1000) +#define EXYNOS_RELOCATE_CODE_BASE (CFG_IRAM_TOP - 0x1000) /* * Power up secondary CPUs. diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S index 40c07209e475..1303544d83b6 100644 --- a/arch/arm/mach-exynos/sec_boot.S +++ b/arch/arm/mach-exynos/sec_boot.S @@ -21,7 +21,7 @@ relocate_wait_code: .ltorg /* * Secondary core waits here until Primary wake it up. - * Below code is copied to (CONFIG_IRAM_TOP - 0x1000) + * Below code is copied to (CFG_IRAM_TOP - 0x1000) * This is a workaround code which is supposed to act as a * substitute/supplement to the iROM code. * diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 7a9307ccc3db..d5f480de0ef7 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -10,7 +10,7 @@ #define CONFIG_VAR_SIZE_SPL -#define CONFIG_IRAM_TOP 0x02074000 +#define CFG_IRAM_TOP 0x02074000 #define CONFIG_PHY_IRAM_BASE 0x02020000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 249ec5090b8a..d2683e317bd6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -69,7 +69,7 @@ CFG_IPADDR CFG_IRAM_BASE CFG_IRAM_END CFG_IRAM_SIZE -CONFIG_IRAM_TOP +CFG_IRAM_TOP CONFIG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV From patchwork Sun Nov 20 13:30: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: 1706769 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=eP8WhgGZ; 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 4NFWxL3vRHz23mR for ; Mon, 21 Nov 2022 00:45:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BBB6B85354; Sun, 20 Nov 2022 14:35: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="eP8WhgGZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2B0E1852D8; Sun, 20 Nov 2022 14:34: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-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 B8B3885286 for ; Sun, 20 Nov 2022 14:34: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-x829.google.com with SMTP id h24so5890594qta.9 for ; Sun, 20 Nov 2022 05:34: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=pRKuKsciadfKwMUQaqjD2n7AWsDOpS1xpJkZrxNpoRk=; b=eP8WhgGZcY59f9PV6udmk7Mz2Cn3tGCiOizqUkd1wwCX5/LWD4tvOaI+OhbQjr3LxA hbqAvFeBG3CBdZjuQjPKLcOPAUuhmrduE7KZxtq3gXX5LVkZ/E0NmJdxew5FPrOtZCyZ ez+ycpeWXwq4iMrWHOIVjiHK+Hgz734T8LJyE= 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=pRKuKsciadfKwMUQaqjD2n7AWsDOpS1xpJkZrxNpoRk=; b=J0EEbmrx9mA1Y+JAB1/nzmH0E2c3S4e56D4Ne/aVLOHsC/Hnx5hFAvQL+HB9/KXjVr tq/r0z/f2DPa8jY/xYD+MDq1dIO7R/iLx4K0u6pvkDV6V9p11nvOBra4rhR1mBHP2hIH CgLbuAYpyyNMUzTkiu+hOiSdYo47t/w9vyriQVYtfWLqgQrqVa9qNkd8PiB0wKFhTJie shAtWMdqPtGNsUogltZPvULPMbtLslYo6+HYLtNy43XA2GRQkT7zK4oXGM0zENQl+SEz OOfUIbR+n940M5L0y5UuRcvQ187BYFBRveX5hphxavaXqjpiyhJmG1RhWenbhHeyqNtA kzzA== X-Gm-Message-State: ANoB5plb/ZzKUkoFjdSNrgTe1O/7snr/g+L2IX+IW7T0qwG/XYN5Nogg +y+GGrLY7A9U1hugerYFbnMlKmSaTzPqgQ== X-Google-Smtp-Source: AA0mqf6NvBHxr2GNLHyBr49UMBBsJxMaEg/uTgwFJG+9jLUUvkX/1EiD48SOvB8r2a+Ri3TxIvqZCQ== X-Received: by 2002:a05:622a:1e1b:b0:3a4:30bc:849a with SMTP id br27-20020a05622a1e1b00b003a430bc849amr13547778qtb.524.1668951282211; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:41 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 068/241] global: Migrate CONFIG_KM_DEF_ARCH to CFG Date: Sun, 20 Nov 2022 08:30:59 -0500 Message-Id: <20221120133352.3055600-69-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/kmcent2.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 227c45f0634a..33655d144df1 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -78,13 +78,13 @@ #define CONFIG_KM_DEF_ENV "km-common=empty\0" #endif -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ "era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index d7d5bce15c59..870603d461af 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -437,13 +437,13 @@ int get_scl(void); " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d2683e317bd6..12edc317773f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -70,7 +70,7 @@ CFG_IRAM_BASE CFG_IRAM_END CFG_IRAM_SIZE CFG_IRAM_TOP -CONFIG_KM_DEF_ARCH +CFG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS From patchwork Sun Nov 20 13:31: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: 1706767 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=R82+A7Be; 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 4NFWwx2tvxz23lt for ; Mon, 21 Nov 2022 00:45:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C9EED852F9; Sun, 20 Nov 2022 14:35: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="R82+A7Be"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96562852C8; Sun, 20 Nov 2022 14:34: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-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 806EA85261 for ; Sun, 20 Nov 2022 14:34: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-qk1-x72b.google.com with SMTP id v8so6486025qkg.12 for ; Sun, 20 Nov 2022 05:34: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=OtdOlorUVNIzwhSW6rqajMS7IoaQFOP7ftqUCYq347g=; b=R82+A7BeGoXzNMX5opKSDLrhFzFvSaDIvB/BKtEo5lRtn14vTtPNABwkD53V/TlHJh iyDgsvrxyY18rA+mDMcDBhwrbdOCLJhFzE1SXmYjcAS53jgyvXqqbMEg8EfbUUL++9jL IReYwr1/gicJBFt3j47q73cyIvbKuB0iQo+RQ= 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=OtdOlorUVNIzwhSW6rqajMS7IoaQFOP7ftqUCYq347g=; b=TjFeiALQdM45+fkWjyUR+E7FXJu62nokhramDMxgVzIFKMueRM+EMXzfTnryPwF4lq GWCA02vw3TduaIYZNGVkKVhOJoAzg+2xKBb7RAdK67ZZHnwQfWau8JMv9JGKm8ojq9xQ qbCvDGLWhwUYxeZwjq7NjDKCqsZVExpmQ63XNQBaVm5pZdl7E5CgiP4k6oxhNkb0Sqz9 QUzNn5/F/p8gQIaBoNv1iNZOALHOHnWFvBOL6DNDthwbTekFfEloFD+7Sna/QprJjDPH GnOdU1NfgeXprH82c5UxY+0YQhb0mBOoCNFqpzJHGEmyr3GObHfp49n8O3LKcVU0y/id dHHA== X-Gm-Message-State: ANoB5pnF6Gn2xq58Pic4/PQsfBoV9CS0bfT9km3l7z5TSZje+FMtbMSU ghV3DTEuj1q1GJjSU/7lrbF58Tt9FXsBIQ== X-Google-Smtp-Source: AA0mqf6H5Xf9590OcXWX+bB0t6OSp+V8cnHAmiK5kKc//JPl/G4qgQcEF9rL687VzGeScQpWIIrADg== X-Received: by 2002:a37:9ad7:0:b0:6ee:aeae:6891 with SMTP id c206-20020a379ad7000000b006eeaeae6891mr12771519qke.717.1668951282828; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:42 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 069/241] global: Migrate CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG Date: Sun, 20 Nov 2022 08:31:00 -0500 Message-Id: <20221120133352.3055600-70-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 2 +- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index cc5ec219b8db..94408e6efd9a 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -98,7 +98,7 @@ CONFIG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ " " CONFIG_KM_UBI_LINUX_MTD " " \ - CONFIG_KM_DEF_BOOT_ARGS_CPU \ + CFG_KM_DEF_BOOT_ARGS_CPU \ "\0" \ "addpanic=" \ "setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0" \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index f6c21e1666d1..da0ee3f27e7e 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -28,7 +28,7 @@ #define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10) /* architecture specific default bootargs */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#define CFG_KM_DEF_BOOT_ARGS_CPU "" #define CONFIG_KM_DEF_ENV_CPU \ "u-boot="CFG_HOSTNAME "/u-boot.bin\0" \ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index e64cf24bd5e9..516fa76e3209 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -179,8 +179,8 @@ #define CONFIG_KM_DEF_ENV #endif -#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#ifndef CFG_KM_DEF_BOOT_ARGS_CPU +#define CFG_KM_DEF_BOOT_ARGS_CPU "" #endif #define CONFIG_KM_DEF_ENV_CPU \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 870603d461af..3c49e174d9a0 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -16,7 +16,7 @@ * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot * parameters */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558" +#define CFG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558" #include "km/keymile-common.h" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 12edc317773f..d203ede8c963 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -71,7 +71,7 @@ CFG_IRAM_END CFG_IRAM_SIZE CFG_IRAM_TOP CFG_KM_DEF_ARCH -CONFIG_KM_DEF_BOOT_ARGS_CPU +CFG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS CONFIG_KM_DEF_ENV_BOOTPARAMS From patchwork Sun Nov 20 13:31: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: 1706773 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=cuaBzrHg; 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 4NFWy76xd8z23mR for ; Mon, 21 Nov 2022 00:46:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8DCF85362; Sun, 20 Nov 2022 14:35: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="cuaBzrHg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87798852F8; Sun, 20 Nov 2022 14:34:59 +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-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 33D7F8529D for ; Sun, 20 Nov 2022 14:34: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-x72d.google.com with SMTP id k2so6488605qkk.7 for ; Sun, 20 Nov 2022 05:34: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=fgw6lI2SF65OtsYasWzC/DOe++Q8CsKATQGgYSmjEPA=; b=cuaBzrHg0JhNY2ukOOjZbOaG43KdgYNnqTXwd2fqm8U893aXPG4dh12Bw1CT6lq0I2 XJPUNA3gemvBH8HiJWsH8AmNu/D12KeBYkhsPP0Hcfxl3Laf5g4OPQRp4/kcPDmGJ38S S+emhjlfOFdeO2qUhiVHIxJyzOV0NX0SXeNfI= 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=fgw6lI2SF65OtsYasWzC/DOe++Q8CsKATQGgYSmjEPA=; b=iqFum8XubyfGKwUlS0GrbR6o6HvJEUaHLjcbGdy7YqUzh/zVTZIavnH73hOU701VNN RRRfq4USyl8ZlFR4DVcFJCCldYhIJn+TWN0cF+Muky3mlUaiq9ObSTIxDtDPSLdZCxHI NJNpzl+RypVGHsVANd6t36nV4TAiiOJ0GWeHnIo4D3+PdYgbXb0hKt7NQIDWJJGr/WaS aLjA28eheCLw0wp+8XedEpuhGu+ttbnkzIN2xa8TfbshEIqa4EU08SwGzEtvjTHZUzjV zZQ8jhnvtkMt6wbo6ppVVa6MCbb1fvTxLHJNUsrP0wKoC17m5kt7H0rI03oKIGlTZOL6 z/fw== X-Gm-Message-State: ANoB5plbPB9ZHUidPHZyfPLDzvIzSnOoNro56BazS0ukKwMZtfML3pX1 kVYy6xVRdv9gk7nG3CTNUwHIaPPBuZz6bQ== X-Google-Smtp-Source: AA0mqf56JvWaNGa7r0qdgcWXud/kYFC0EuIDUeyWQu4igHQcEA8kIW5p2pGtrbuo6olzzy2HhNAnHQ== X-Received: by 2002:a05:620a:3706:b0:6e2:5472:345e with SMTP id de6-20020a05620a370600b006e25472345emr13004526qkb.391.1668951283540; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:43 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 070/241] global: Migrate CONFIG_KM_DEF_ENV to CFG Date: Sun, 20 Nov 2022 08:31:01 -0500 Message-Id: <20221120133352.3055600-71-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 30 +++++++++++++------------- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 8 +++---- include/configs/kmcent2.h | 8 +++---- include/configs/socfpga_arria5_secu1.h | 4 ++-- scripts/config_whitelist.txt | 14 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 94408e6efd9a..3d77b1770651 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -15,8 +15,8 @@ #define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS -#define CONFIG_KM_DEF_ENV_BOOTPARAMS \ +#ifndef CFG_KM_DEF_ENV_BOOTPARAMS +#define CFG_KM_DEF_ENV_BOOTPARAMS \ "actual_bank=0\0" #endif @@ -65,7 +65,7 @@ * available targets: * - 'release': for a standalone system kernel/rootfs from flash */ -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ +#define CFG_KM_DEF_ENV_BOOTTARGETS \ "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \ "set_fdthigh cramfsloadkernel flashargs add_default " \ "addpanic boot\0" \ @@ -88,7 +88,7 @@ * - 'flashargs': defaults arguments for flash base boot * */ -#define CONFIG_KM_DEF_ENV_BOOTARGS \ +#define CFG_KM_DEF_ENV_BOOTARGS \ "add_default=" \ "setenv bootargs ${bootargs} " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ @@ -120,7 +120,7 @@ * processor specific settings * - 'cramfsloadfdt': copy fdt from a cramfs to ram */ -#define CONFIG_KM_DEF_ENV_FLASH_BOOT \ +#define CFG_KM_DEF_ENV_FLASH_BOOT \ "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ @@ -133,7 +133,7 @@ * * - 'default': setup default environment */ -#define CONFIG_KM_DEF_ENV_CONSTANTS \ +#define CFG_KM_DEF_ENV_CONSTANTS \ "backup_bank=0\0" \ "release=run newenv; reset\0" \ "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \ @@ -142,15 +142,15 @@ "env_version=1\0" \ "" -#ifndef CONFIG_KM_DEF_ENV -#define CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ENV_BOOTPARAMS \ +#ifndef CFG_KM_DEF_ENV +#define CFG_KM_DEF_ENV \ + CFG_KM_DEF_ENV_BOOTPARAMS \ "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0" \ - CONFIG_KM_DEF_ENV_CPU \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_DEF_ENV_BOOTARGS \ - CONFIG_KM_DEF_ENV_FLASH_BOOT \ - CONFIG_KM_DEF_ENV_CONSTANTS \ + CFG_KM_DEF_ENV_CPU \ + CFG_KM_DEF_ENV_BOOTTARGETS \ + CFG_KM_DEF_ENV_BOOTARGS \ + CFG_KM_DEF_ENV_FLASH_BOOT \ + CFG_KM_DEF_ENV_CONSTANTS \ "altbootcmd=run bootcmd\0" \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "bootcmd=km_checkbidhwk && " \ @@ -169,6 +169,6 @@ "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ "load=tftpboot ${load_addr_r} ${u-boot}\0" \ "" -#endif /* CONFIG_KM_DEF_ENV */ +#endif /* CFG_KM_DEF_ENV */ #endif /* __CONFIG_KEYMILE_H */ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 33655d144df1..3192ca7742a7 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -74,8 +74,8 @@ /* * Environment Configuration */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV "km-common=empty\0" +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV "km-common=empty\0" #endif #ifndef CFG_KM_DEF_ARCH @@ -83,7 +83,7 @@ #endif #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index da0ee3f27e7e..73a224f790e1 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -30,7 +30,7 @@ /* architecture specific default bootargs */ #define CFG_KM_DEF_BOOT_ARGS_CPU "" -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "u-boot="CFG_HOSTNAME "/u-boot.bin\0" \ "update=" \ "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 516fa76e3209..974486fc4c32 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -175,15 +175,15 @@ #define CFG_ENV_TOTAL_SIZE 0x40000 #define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND /* direct for newenv */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV #endif #ifndef CFG_KM_DEF_BOOT_ARGS_CPU #define CFG_KM_DEF_BOOT_ARGS_CPU "" #endif -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ @@ -224,7 +224,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "ethrotate=no\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 3c49e174d9a0..35ec79f7b7db 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -390,13 +390,13 @@ int get_scl(void); /* * Environment Configuration */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV #endif #define __USB_PHY_TYPE utmi -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ @@ -442,7 +442,7 @@ int get_scl(void); #endif #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index f12163ccc990..71aa5a7ca949 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -46,7 +46,7 @@ "newenv=" \ "nand erase 0x100000 0x40000\0" -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ +#define CFG_KM_DEF_ENV_BOOTTARGETS \ "release=" \ "run newenv; reset\0" \ "develop=" \ @@ -54,7 +54,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ + CFG_KM_DEF_ENV_BOOTTARGETS \ CONFIG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d203ede8c963..d5909de8762e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -72,13 +72,13 @@ CFG_IRAM_SIZE CFG_IRAM_TOP CFG_KM_DEF_ARCH CFG_KM_DEF_BOOT_ARGS_CPU -CONFIG_KM_DEF_ENV -CONFIG_KM_DEF_ENV_BOOTARGS -CONFIG_KM_DEF_ENV_BOOTPARAMS -CONFIG_KM_DEF_ENV_BOOTTARGETS -CONFIG_KM_DEF_ENV_CONSTANTS -CONFIG_KM_DEF_ENV_CPU -CONFIG_KM_DEF_ENV_FLASH_BOOT +CFG_KM_DEF_ENV +CFG_KM_DEF_ENV_BOOTARGS +CFG_KM_DEF_ENV_BOOTPARAMS +CFG_KM_DEF_ENV_BOOTTARGETS +CFG_KM_DEF_ENV_CONSTANTS +CFG_KM_DEF_ENV_CPU +CFG_KM_DEF_ENV_FLASH_BOOT CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI CONFIG_KM_ECC_MODE CONFIG_KM_NEW_ENV From patchwork Sun Nov 20 13:31: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: 1706774 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=bWoYaTuM; 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 4NFWyL3Fmhz23mR for ; Mon, 21 Nov 2022 00:46:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96E14852E7; Sun, 20 Nov 2022 14:35: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="bWoYaTuM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F431852FE; Sun, 20 Nov 2022 14:35:00 +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 66BAD85291 for ; Sun, 20 Nov 2022 14:34: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-qt1-x82a.google.com with SMTP id fz10so5913594qtb.3 for ; Sun, 20 Nov 2022 05:34: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=XLuF/5cWu6Zy35voS8fKsk3wmwoiql52EvE+6LOcErY=; b=bWoYaTuMH+MiXXJrv3msidg+naEiHeeaDIbp8d8Kcn4NLmftr+lDSohGhoBpF1A7NI kafE3UcW+mZOwVkSRXVCjF02hI0fyt2I8yYjdy3xYGzDu+6f2ZP7SA5rWEDfx+luHkJb fKWtl5w7RPPOXIVYT7I0pjQrCQnUI2iBtchNU= 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=XLuF/5cWu6Zy35voS8fKsk3wmwoiql52EvE+6LOcErY=; b=aEctm6009jSEst2a5omYOQhTb4PGKLTKmdjr721lpp4qpROH1GJIEixBdk8a7Ojy7/ OvhlGLjIaUuLa5kCWocFJTpepf/+kVvqINUzR95WJmw1Sc9n+Hu+THBbqJxLbga5PPko XZ5p+1Y6tTfmJr5gQZpFZjaWw369AfyAibQoe+K841+JyrH7GS9ZvrnS76QnZDp7zvvm 77cgRlOvA8GwNMLSg8FHgAoaqolfjrPGJI2nQm+R7BLaG3aZbi6aLU8/3rtdbkunGYDg S7cvv7XFf5xFIACpg5jZtNo++aY61+puS06wU6+Zh7YWn7vpBuVbkr8D4IzkvA79X85t 5xww== X-Gm-Message-State: ANoB5pnoOAyKDtlkJrL3MZXOj30Na0OBUAhVEog3g4BOVULzjdiI0daF 0v0Ie0mujylCwwDAcJ5W5TAijM0RbJQ2ng== X-Google-Smtp-Source: AA0mqf5l942Qevvu808xoipmQTyZoh41WtMBUPDqawX5I3sCgjF38gWshKHIIDiWraoXP8wzDMjsBA== X-Received: by 2002:a05:622a:1a2a:b0:3a5:5e38:c294 with SMTP id f42-20020a05622a1a2a00b003a55e38c294mr13643207qtb.122.1668951284153; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:43 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 071/241] global: Migrate CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG Date: Sun, 20 Nov 2022 08:31:02 -0500 Message-Id: <20221120133352.3055600-72-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 3d77b1770651..5e3baca75b23 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -34,7 +34,7 @@ # define CONFIG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ @@ -44,7 +44,7 @@ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" @@ -125,7 +125,7 @@ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ "uimage=" CONFIG_KM_UIMAGE_NAME \ - CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI + CFG_KM_DEV_ENV_FLASH_BOOT_UBI /* * constants diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d5909de8762e..fb702a42bd6b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -79,7 +79,7 @@ CFG_KM_DEF_ENV_BOOTTARGETS CFG_KM_DEF_ENV_CONSTANTS CFG_KM_DEF_ENV_CPU CFG_KM_DEF_ENV_FLASH_BOOT -CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI +CFG_KM_DEV_ENV_FLASH_BOOT_UBI CONFIG_KM_ECC_MODE CONFIG_KM_NEW_ENV CONFIG_KM_UBI_LINUX_MTD From patchwork Sun Nov 20 13:31: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: 1706807 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=bO5usUde; 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 4NFX5P1W36z23lt for ; Mon, 21 Nov 2022 00:52:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8D1AD85331; Sun, 20 Nov 2022 14:38: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="bO5usUde"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 337A185313; Sun, 20 Nov 2022 14:35: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-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 4E20E852B5 for ; Sun, 20 Nov 2022 14:34: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-qt1-x82c.google.com with SMTP id z6so5900817qtv.5 for ; Sun, 20 Nov 2022 05:34: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=jbQkraWr9IVovYOLwDRp7MLI/xabF4yta0GEJofFXOw=; b=bO5usUdeSynBoxyqMFu1yt/5auaI3iOcRnL/saX/8aUu3ZGWCblGRfFiVSLuVbCau+ 7wI+4gm1Riyu7SBw4/YMUe3yhNU6YAsNTxRp0JfKFfzq5VoXb0pqW4nd/n2/kSf7jRGK txVHBF2+SO4CvLmY1A0FA/0x69LeZliAAjVQE= 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=jbQkraWr9IVovYOLwDRp7MLI/xabF4yta0GEJofFXOw=; b=Q6NCxgikeZJ9utmCVPALxZJta54zffyMr24GAupb8sgORLujNV5xQgHjJECO17YCoG NkxqfICJ9D7iqPJrlVhz2C3dZLNCUcqqT1ml1DBcCiaB/MZxsSpwcRTIxoGFRZkRsBzp g29JumPmEQuMyaY2+rjRVyUTmKr6ry5WNZSlvux521gx+a+hLILVNa7HoqzXqEmpjD97 OnJ6uD+1CthzsL4FTOt7spK+cqk5qZL2l7fPzEgc8ccb9Pl8Qj+auqLQyBh4NXTkUOZy QkzSsjP962ltnC4qBV7HKuIe4i+nfSNVJCCziwd0cM6pF5+w2o0aqf+EAghDntw+qfxQ ZA1g== X-Gm-Message-State: ANoB5pnzk/QPgq3Y8YnSacVgr8u+ZMZBxsD7MZxNt0ZBVx+mnfA3rKHO JzBAKCb5mQPmTUivvS9LVzThRqFxwqsFZg== X-Google-Smtp-Source: AA0mqf4R3NPs1uS6QObcjaKdOHQxfXu2nRRBvHgW3/RASgIHBhxaXCrDey6mIdEMvX58g2fMjNhKZg== X-Received: by 2002:ac8:7601:0:b0:3a6:3455:d1a6 with SMTP id t1-20020ac87601000000b003a63455d1a6mr7787511qtq.448.1668951284810; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:44 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 072/241] global: Migrate CONFIG_KM_ECC_MODE to CFG Date: Sun, 20 Nov 2022 08:31:03 -0500 Message-Id: <20221120133352.3055600-73-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 5e3baca75b23..1ae134c2ae3e 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -52,10 +52,10 @@ #ifdef CONFIG_NAND_ECC_BCH #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" -#define CONFIG_KM_ECC_MODE " eccmode=bch" +#define CFG_KM_ECC_MODE " eccmode=bch" #else #define CONFIG_KM_UIMAGE_NAME "uImage\0" -#define CONFIG_KM_ECC_MODE +#define CFG_KM_ECC_MODE #endif /* @@ -95,7 +95,7 @@ ":${hostname}:${netdev}:off:" \ " console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}" \ " mem=${kernelmem} init=${init}" \ - CONFIG_KM_ECC_MODE \ + CFG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ " " CONFIG_KM_UBI_LINUX_MTD " " \ CFG_KM_DEF_BOOT_ARGS_CPU \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fb702a42bd6b..11a501212b8c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -80,7 +80,7 @@ CFG_KM_DEF_ENV_CONSTANTS CFG_KM_DEF_ENV_CPU CFG_KM_DEF_ENV_FLASH_BOOT CFG_KM_DEV_ENV_FLASH_BOOT_UBI -CONFIG_KM_ECC_MODE +CFG_KM_ECC_MODE CONFIG_KM_NEW_ENV CONFIG_KM_UBI_LINUX_MTD CONFIG_KM_UBI_PARTITION_NAME_APP From patchwork Sun Nov 20 13:31: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: 1706786 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=Cj4xP869; 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 4NFX130FKrz23mR for ; Mon, 21 Nov 2022 00:48:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F00818538E; Sun, 20 Nov 2022 14:36: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="Cj4xP869"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E95AC85337; Sun, 20 Nov 2022 14:35: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-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 E2A11852B4 for ; Sun, 20 Nov 2022 14:34: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-x72e.google.com with SMTP id x18so6505419qki.4 for ; Sun, 20 Nov 2022 05:34: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=QO2kz4xDDJdrVhW6gubZbga46uWQ3v8K+53nVTKt2Qs=; b=Cj4xP869WFA3HZRBW0fGl3GD1KryM8RFoiST65vW4GlD+B+BZ/jTCi4JAHqBu7weZA m+jQQ69dx7PEKm3ntZLPTEf8QrQI6isuGGlxEXssZQBqFHI9mCYSvEOm4HNvSMxZ6rfV GPCs35RppMuemxEoW/P0KR3nX6RfJMLawic3E= 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=QO2kz4xDDJdrVhW6gubZbga46uWQ3v8K+53nVTKt2Qs=; b=muTjeFFvrskgweeOQ2KdViMQiF4Pj6wB4o0wSxs21SRKyMvZBokgPsrQirffwVx8T9 twdRJCMseSXMOWUnYTVlza8VWSG4jw0p/kWa3MNzGtuV968x9ttScS7v6V/fPxVxF95z kEdLW1LN90KM+RTfXGYresD+tIIkzG563ql5+GTViNI670HWF/LiS/zegjhdL6A0M8x7 ltD/AHB0vanCIwM8JGlsdrs7fBU10BmDnuDTR3bDE2S3T3q5Thoemen2ojMxFST6ifUf vzaNlbZXen1jEOxmrWUI6oxgkP1/5Rjd+NojNvy7Rqveg5mRcZNMpiEXZuoqmncauskv GSYw== X-Gm-Message-State: ANoB5pmN7pxaCkMZ9/a8uL5ksCSjxq6PDC1XkRUtMxcSKKZ3GIMRJP90 ZGJQwCMePFN4F8msEOGAL519riK+uEpF0g== X-Google-Smtp-Source: AA0mqf4xKeVejMo+5mGQbxUAdc9v1255UsplTNRXVM5F1KzUvJONHFFu3aj7pLGvenRfOh3oztB1kw== X-Received: by 2002:a05:620a:2005:b0:6fa:2ddc:87f4 with SMTP id c5-20020a05620a200500b006fa2ddc87f4mr12659892qka.479.1668951285354; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 073/241] global: Migrate CONFIG_KM_NEW_ENV to CFG Date: Sun, 20 Nov 2022 08:31:04 -0500 Message-Id: <20221120133352.3055600-74-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- include/configs/socfpga_arria5_secu1.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 974486fc4c32..856d2e909200 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -209,7 +209,7 @@ "checkfdt=true\0" \ "" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -223,7 +223,7 @@ "asrc,spdif,lpuart1,ftm1\0" #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 35ec79f7b7db..97070bc77c45 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -428,7 +428,7 @@ int get_scl(void); "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -444,7 +444,7 @@ int get_scl(void); #define CFG_EXTRA_ENV_SETTINGS \ CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "" diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 71aa5a7ca949..6fb7a895995b 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -42,7 +42,7 @@ "_fpga_loadsafe=echo Loading FPGA SAFE image..." \ " && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \ -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=" \ "nand erase 0x100000 0x40000\0" @@ -55,7 +55,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CFG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ "bootlimit=6\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 11a501212b8c..471b3243f380 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -81,7 +81,7 @@ CFG_KM_DEF_ENV_CPU CFG_KM_DEF_ENV_FLASH_BOOT CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE -CONFIG_KM_NEW_ENV +CFG_KM_NEW_ENV CONFIG_KM_UBI_LINUX_MTD CONFIG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT From patchwork Sun Nov 20 13:31: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: 1706772 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=UtTZjQKt; 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 4NFWxx156Yz23mR for ; Mon, 21 Nov 2022 00:45:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDAB185359; Sun, 20 Nov 2022 14:35: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="UtTZjQKt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74D21852F6; Sun, 20 Nov 2022 14:34:59 +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 AE096852C0 for ; Sun, 20 Nov 2022 14:34: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-x734.google.com with SMTP id s20so6511811qkg.5 for ; Sun, 20 Nov 2022 05:34: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=XFJMOowrys2j6gxQAFyJHYAvs0joO+QT7foQ5DAdy9U=; b=UtTZjQKtZVtB+LIhW5yy/GP9zVSCkFU+IS7G5ib0PNFFJiRq23hPMRINQIGmomvKiU EwiiB5hrbFXXzbmYaER+jawETTfbMQW0eI40zOZ4hGC5otynLZ2R8hnr/Jujy9kGvuyA vgBsBlfY4vIi4YZKFNMkqw0SpMrewyZAbwg3M= 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=XFJMOowrys2j6gxQAFyJHYAvs0joO+QT7foQ5DAdy9U=; b=ussdsU3I6T7weXeF+lV50K5TOnOTkIKXS8DklzpSC6kiuAROKgtnjvoBg5gEKx8XQI VPPvf0bfhUSGbK5PQBkMK2zlp3hAOjW25COOoPSRDnGK6MPxfNh5W0eltWbxH9dHXrDL +hS+OOuvrYfZDdfZ4yiTXljmUEuzAJClapxmXE95Ym30M7xZE6xlif3Ho9iM5F5Bj5jH utCIlq7UMzXW6UjJ6H+pAVWsw4Ig0WEGzOtxUaeoS3GW6yjcaTz3jM8dgLcFpFUbyJGT 3uQS82BiRC2hkJOwi9CqPJQlgHViGHYv2Vgtoh+EnUDy45nOzF1wtZEBcw3ZM5fyoh+Q PuIw== X-Gm-Message-State: ANoB5pn2a6XbqZiQydo6GZqE6I0Z/evHU3+KhckolP1TSplPqGpIIsMs B7AIAaYbvls6Ajpzs+EtIdIex1rdP5hgjg== X-Google-Smtp-Source: AA0mqf5DCeQU8LM6DxW0SZPMqbckYeoUu2hEOEbRyIWsGfRMd0lp7AJKfYGssfPg7JMkxnKSCQxisg== X-Received: by 2002:a05:620a:15d5:b0:6ee:988f:84b7 with SMTP id o21-20020a05620a15d500b006ee988f84b7mr12833391qkm.315.1668951286062; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 074/241] global: Migrate CONFIG_KM_UBI_LINUX_MTD to CFG Date: Sun, 20 Nov 2022 08:31:05 -0500 Message-Id: <20221120133352.3055600-75-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 1ae134c2ae3e..7e347e5b8f4f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -31,7 +31,7 @@ #ifndef CONFIG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -# define CONFIG_KM_UBI_LINUX_MTD \ +# define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ @@ -40,7 +40,7 @@ /* two flash chips called boot and app */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ /* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ -# define CONFIG_KM_UBI_LINUX_MTD \ +# define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP @@ -97,7 +97,7 @@ " mem=${kernelmem} init=${init}" \ CFG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ - " " CONFIG_KM_UBI_LINUX_MTD " " \ + " " CFG_KM_UBI_LINUX_MTD " " \ CFG_KM_DEF_BOOT_ARGS_CPU \ "\0" \ "addpanic=" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 471b3243f380..19a4fc540336 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -82,7 +82,7 @@ CFG_KM_DEF_ENV_FLASH_BOOT CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE CFG_KM_NEW_ENV -CONFIG_KM_UBI_LINUX_MTD +CFG_KM_UBI_LINUX_MTD CONFIG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT CONFIG_KM_UBI_PART_BOOT_OPTS From patchwork Sun Nov 20 13:31: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: 1706777 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=rB/fU+WY; 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 4NFWyx0mymz23mR for ; Mon, 21 Nov 2022 00:46:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3633A8533E; Sun, 20 Nov 2022 14:35: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=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="rB/fU+WY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C3AE7852C5; Sun, 20 Nov 2022 14:35:11 +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 3E384852C5 for ; Sun, 20 Nov 2022 14:34: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 g10so6495682qkl.6 for ; Sun, 20 Nov 2022 05:34: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=u5AtVz2SBU0fx5uNkiqgxI5vTxcegGOG793IpaER8W0=; b=rB/fU+WYD9gLSQVilE8A+0mbeNoj2wjxK7kcu3w7bAo+cp+6Fr0MESrYGdPPbeJB/O 2vgJlsQxiqC8zfza56EdRjxPZPg7jrh9pITWXDs86hLWJNCHbp9LulliBw2Y77gxidS8 1es/5y0zTyEGbbM2K+ll9B2z9b1ovlrse0XTE= 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=u5AtVz2SBU0fx5uNkiqgxI5vTxcegGOG793IpaER8W0=; b=GTua2TvpkiWhAxeW3vs1edpGU4NrNRndmbhTrqqkE7ccMKeWPkXn+4nCnQIiFS6Z+X PN1X1BZWLFP/8Na9M+iJtRS8FupTjSKWLJdD4SrbK+jbuEsl2eddr2wwAIRlt7i+leet 2MptbEGcVvuXW38jUUIOXqMtqxM9YCxunck07hUSyFiUV1QHTahoQUAJdM8rQm0iPepq 08N3FPZdt0h2r64romg2ZskPcwGpZ23WlQW6m3GutBDd2ZcnvKHc4e+i3nL1bkvBsRrS mXC6BhwHt6tevX1zdeTNybTLhvnHTBM8qG6cyhth2tc31Fx4URIttsXVeLTJPyLHtTFM Qhow== X-Gm-Message-State: ANoB5pmfSoQQrVsl2zIPcYhR6VDBmGDXUEUTAedSO6Ot1Smj3kBKYDgl bYotZe6r838zaj3aPu0fYaZkZGGvwIQssA== X-Google-Smtp-Source: AA0mqf77giqNXHy3kkYpNLbMJJE9/fd+cs+j9Yn3ckdhytmu3UBnrlNmY/tpNk8ToR1BZHeylESezQ== X-Received: by 2002:a05:620a:884:b0:6fa:3974:7f74 with SMTP id b4-20020a05620a088400b006fa39747f74mr12937155qka.631.1668951286908; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:46 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 075/241] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG Date: Sun, 20 Nov 2022 08:31:06 -0500 Message-Id: <20221120133352.3055600-76-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 12 ++++++------ include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 7e347e5b8f4f..2e73d9d6d28f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -28,7 +28,7 @@ #define CONFIG_KM_UBI_PART_BOOT_OPTS "" #endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ -#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP +#ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ @@ -36,19 +36,19 @@ CONFIG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" -#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ +#else /* CFG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ +/* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ + "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0" +#endif /* CFG_KM_UBI_PARTITION_NAME_APP */ #ifdef CONFIG_NAND_ECC_BCH #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 8681145c309f..9386daa19ccc 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -13,7 +13,7 @@ #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index 5b5637762aca..f7a598b5f9cb 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -10,7 +10,7 @@ #define CFG_HOSTNAME "EXPU1" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* CLIPS FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00) diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index a1c1ca993d7e..b7051e3749d0 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -9,7 +9,7 @@ #define CFG_HOSTNAME "SELI8" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* PAXK FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 19a4fc540336..a311539ab15c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -83,7 +83,7 @@ CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE CFG_KM_NEW_ENV CFG_KM_UBI_LINUX_MTD -CONFIG_KM_UBI_PARTITION_NAME_APP +CFG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT CONFIG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME From patchwork Sun Nov 20 13:31: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: 1706775 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=OdqrkECH; 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 4NFWyX4S2rz23mR for ; Mon, 21 Nov 2022 00:46:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A31185366; Sun, 20 Nov 2022 14:35: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="OdqrkECH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E8FA85307; Sun, 20 Nov 2022 14:35:07 +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, UPPERCASE_50_75 autolearn=no 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 6CE9C852CA for ; Sun, 20 Nov 2022 14:34: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-qt1-x829.google.com with SMTP id l2so5885439qtq.11 for ; Sun, 20 Nov 2022 05:34: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=epw42V2sFMmIWFZ7BBmyXejCWlv/MEr/SKV6WJtvBB4=; b=OdqrkECHCm95BIiWdvtTZGG+Z8DmGnhO8KjQ66ARzX+NSpVb75SaL9YKn7F1DURtbG kVkhGpcOUVZLnln7rWJsXowhjW4DzrZOP3VX8lA7gXKYDinC3EOslXdiemeLNtayMTHU ISBNYSrQd4RiyRW3T/zIpU74kNk5SSCAjIACw= 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=epw42V2sFMmIWFZ7BBmyXejCWlv/MEr/SKV6WJtvBB4=; b=VmhHBsfMCSVKgZZ86jkxYxzL/aL9tsgepyO6+ptHe5SA/N0CRE7PHcSnL1OcUWTV9b 9RDUpF3AoQS4RtBoz3reY68AeUZdKfLUvv/xz5qDVfIQJdHKIBW/t24YAv6SEYHzIM2F fC+rQrfggs1O708p7SDeH9A4JkNhuEQ5gq1d2v621n3r0L30k3/zUxPLA65Yc45EaiaF bBq+iuJBfgZAo33rEREr3gQ2X6HulWgvJKwmQTOAd+QthXbZD6BWwbDB6ZTT1z2NvOYU Cp8QvQnpP5Kn83a/bJNwIXbtdax6yZ+UlVsBzzDGNpv6I/mhmOHYdHeBhnY/5WIaTnm6 mKlg== X-Gm-Message-State: ANoB5pkCtX7DXv/maVLqe0Ty9uV7wgPTOS9jaXpzxbaIeaWiSbk73QKn KBoO/Hp4Hgb0FvdSslBvfLD1XM3/hFahzQ== X-Google-Smtp-Source: AA0mqf5KEWDEWgrUyp18fJtTU1LLuDIXo4BuUO2WSYNimpznNG+ATZdIX8Dt5RYy/icCsIQDqq4l0A== X-Received: by 2002:a05:622a:50a7:b0:39c:eb15:b6df with SMTP id fp39-20020a05622a50a700b0039ceb15b6dfmr13712413qtb.518.1668951288147; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:47 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 077/241] global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG Date: Sun, 20 Nov 2022 08:31:08 -0500 Message-Id: <20221120133352.3055600-78-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 10 +++++----- scripts/config_whitelist.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 720711ac8dde..b33bf3615e4f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -24,16 +24,16 @@ #define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */ -#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS -#define CONFIG_KM_UBI_PART_BOOT_OPTS "" -#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ +#ifndef CFG_KM_UBI_PART_BOOT_OPTS +#define CFG_KM_UBI_PART_BOOT_OPTS "" +#endif /* CFG_KM_UBI_PART_BOOT_OPTS */ #ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS + CFG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CFG_KM_UBI_PARTITION_NAME_APP */ @@ -42,7 +42,7 @@ /* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS " " \ + CFG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e166916e8f40..e5eeb35bfec4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -85,7 +85,7 @@ CFG_KM_NEW_ENV CFG_KM_UBI_LINUX_MTD CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT -CONFIG_KM_UBI_PART_BOOT_OPTS +CFG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE From patchwork Sun Nov 20 13:31: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: 1706780 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=NtqsV4ZD; 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 4NFWzm585Hz23mR for ; Mon, 21 Nov 2022 00:47:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6EDA8536F; Sun, 20 Nov 2022 14:36: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="NtqsV4ZD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B5A7985316; Sun, 20 Nov 2022 14:35:14 +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 468B7852B6 for ; Sun, 20 Nov 2022 14:34: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-x72b.google.com with SMTP id v8so6486101qkg.12 for ; Sun, 20 Nov 2022 05:34: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=3aLRAV0cTQuHj04uXLJJbmoDa8x22r3TWZeI+n+xiVU=; b=NtqsV4ZDA3Nti4ad6Tb1P3W5SoT1yoJshF5uyfKz3CpaDqIVNXRQ6yKjH8UEsB7dsS A7IPRZc7VKwrk+p1vNgCd54BHFhB4bI//cEdSleRDl8vis8z3qESrDD1ZlLiFzE2Z6Zd iPbQEEpxDKOdZkxky6Kk6YdqaAhS4QDZ3iZuY= 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=3aLRAV0cTQuHj04uXLJJbmoDa8x22r3TWZeI+n+xiVU=; b=V63iPhHkVa2ADxguCfe0Ehqepi+KTtpkp96JKGCXK1spp7LwtB+CUQsJjpkziqdO6D A2rBDLweYO7iIjfDbLruwh6GaiB2fzbCPcedCr4JIUoM5WJgciQgWy1WKnMkHxxruGyN AwjApK5kMxujmoLTUT5CIKXw5vHCtYSp8PMTRj62OQxdrGFzWfyKVWTzDhZjQtL2BFvp rjdKylTo5tsSXBCIFjgcbqEi60cQ3mT24FT7RPOfuDMmteWhZHXH16uQmPxj2rdDy26W Me7Upr5qcv8T4D3dDzDub5CtdUDRXVWTrvXnwqxi6qI66uX3yujvZ08QW1f1JnU6bO3L BW9Q== X-Gm-Message-State: ANoB5pmpyrf9pHVO1Mn++zsxenEcN7ElWtTFrcAf5UuEC62Vuocrtuu8 D6bN2U7l4sNQgxJgqyaiuuEvdwEJYrpxwg== X-Google-Smtp-Source: AA0mqf7v4i/Fj0tZALNM5gLl/6Psi2e7mnOi7wt8F9QBZBsWUDhizbZLUHj8oZFd5Gtaxu0/8yLYsw== X-Received: by 2002:a37:ad0c:0:b0:6ee:91b3:2484 with SMTP id f12-20020a37ad0c000000b006ee91b32484mr12593778qkm.648.1668951288769; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:48 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 078/241] global: Migrate CONFIG_KM_UIMAGE_NAME to CFG Date: Sun, 20 Nov 2022 08:31:09 -0500 Message-Id: <20221120133352.3055600-79-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/km/keymile-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index b33bf3615e4f..ffcd44d5ef97 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -51,10 +51,10 @@ #endif /* CFG_KM_UBI_PARTITION_NAME_APP */ #ifdef CONFIG_NAND_ECC_BCH -#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" +#define CFG_KM_UIMAGE_NAME "ecc_bch_uImage\0" #define CFG_KM_ECC_MODE " eccmode=bch" #else -#define CONFIG_KM_UIMAGE_NAME "uImage\0" +#define CFG_KM_UIMAGE_NAME "uImage\0" #define CFG_KM_ECC_MODE #endif @@ -124,7 +124,7 @@ "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ - "uimage=" CONFIG_KM_UIMAGE_NAME \ + "uimage=" CFG_KM_UIMAGE_NAME \ CFG_KM_DEV_ENV_FLASH_BOOT_UBI /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e5eeb35bfec4..2b4db3778e20 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -86,7 +86,7 @@ CFG_KM_UBI_LINUX_MTD CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT CFG_KM_UBI_PART_BOOT_OPTS -CONFIG_KM_UIMAGE_NAME +CFG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE From patchwork Sun Nov 20 13:31: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: 1706778 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=D+exE60b; 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 4NFWz75zyVz23mR for ; Mon, 21 Nov 2022 00:46:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7879A85306; Sun, 20 Nov 2022 14:35: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="D+exE60b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3DCD5852C5; Sun, 20 Nov 2022 14:35:12 +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 AD0C0852C9 for ; Sun, 20 Nov 2022 14:34: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-x72b.google.com with SMTP id d8so6473002qki.13 for ; Sun, 20 Nov 2022 05:34: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=8NmXz5SfWWb2hf5H9VnZAbJ1iq50HFsX3f4h6I5gnH4=; b=D+exE60bEaHLXjRe1mXLwcCO95a1nMN6+SN+yEGlB5fbQ3hhJFQvO1P25GZDzXQSm7 gH4PSr2fuEGABe8Afi3nmnAmBLt0bgbIg7ucrIDxBDJ4VvwuxSpdOvNqZHJgFFQ+DT+f VQAuWbdOiXbmjB8M3rwM7KGPels/84U2tBw/U= 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=8NmXz5SfWWb2hf5H9VnZAbJ1iq50HFsX3f4h6I5gnH4=; b=asrkexOHtfKlBRXGtNUcByTQ3sdxP+685jKDpeFQisxZcZ45i0TiY/iI07+qT5wySZ nKzsQlNAf4zmik67QclZmYHwrQ0yuA3g21IrnjyUdL2yGl9KsFQhF8PMJHT5mA7JWH4Z YvPy73xaL1vYcZVocvr9ybfAYHAZ+7qXRsXYXNVg0yINjRf8ACxL0W5UxQyzligNVm+s IsmrN5B6RKWh7tO/HyS/m974xOxzA5BQ244DeuFsorofShFAYtm3ivI8aADOiHa8yYBs q1aihFlCRP+PteJYa6WW5FuvfphCI5AhqziIV9GpeXedmiuvPlJ4pFLlCuiJZbx+Flxa nAxg== X-Gm-Message-State: ANoB5pkM2EmavdhEOs8NV+yORSnys7zwAcogv7msh3J8lOr2n8qKPI+N 3AX9Bjj6qY7ARPXLqTErkeCsUMq2OQaMAw== X-Google-Smtp-Source: AA0mqf5dIlt74k/EU0zvdyyeUCoDGT4aUfCEodueGOPLP6tw7UKGJHtAeXFNcciBPFrRoSWThPRGdg== X-Received: by 2002:a37:7c6:0:b0:6ea:a9e4:6225 with SMTP id 189-20020a3707c6000000b006eaa9e46225mr12812039qkh.320.1668951289415; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:49 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 079/241] global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG Date: Sun, 20 Nov 2022 08:31:10 -0500 Message-Id: <20221120133352.3055600-80-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/ti-common/keystone_net.h | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2hk_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 0852ce80a641..21cac6ea312a 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -117,7 +117,7 @@ struct mac_sl_cfg { #define CPSW_CTL_VLAN_AWARE BIT(1) #define CPSW_CTL_FIFO_LOOPBACK BIT(0) -#define DEVICE_CPSW_NUM_PORTS CONFIG_KSNET_CPSW_NUM_PORTS +#define DEVICE_CPSW_NUM_PORTS CFG_KSNET_CPSW_NUM_PORTS #define DEVICE_N_GMACSL_PORTS (DEVICE_CPSW_NUM_PORTS - 1) #ifdef CONFIG_KSNET_NETCP_V1_0 diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index bbc58be511e4..026568c4dfb3 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -38,7 +38,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 -#define CONFIG_KSNET_CPSW_NUM_PORTS 9 +#define CFG_KSNET_CPSW_NUM_PORTS 9 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2E_EVM_H */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index bb91751d5d90..feaa43ba7f71 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -52,7 +52,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 -#define CONFIG_KSNET_CPSW_NUM_PORTS 2 +#define CFG_KSNET_CPSW_NUM_PORTS 2 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 68cbe98b553b..e35f080279ae 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -38,6 +38,6 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_0 -#define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CFG_KSNET_CPSW_NUM_PORTS 5 #endif /* __CONFIG_K2HK_EVM_H */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index a18158a7eb33..b60fc2a55de3 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -38,7 +38,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 -#define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CFG_KSNET_CPSW_NUM_PORTS 5 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2L_EVM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2b4db3778e20..ddcc89f508e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -87,7 +87,7 @@ CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT CFG_KM_UBI_PART_BOOT_OPTS CFG_KM_UIMAGE_NAME -CONFIG_KSNET_CPSW_NUM_PORTS +CFG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE CONFIG_KSNET_NETCP_BASE From patchwork Sun Nov 20 13:31: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: 1706776 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=fP97EFlF; 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 4NFWyk3nf2z23mR for ; Mon, 21 Nov 2022 00:46:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 685B085344; Sun, 20 Nov 2022 14:35: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="fP97EFlF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E8AA85304; Sun, 20 Nov 2022 14:35:09 +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-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 8D356852C8 for ; Sun, 20 Nov 2022 14:34: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-x735.google.com with SMTP id i9so6486590qki.10 for ; Sun, 20 Nov 2022 05:34: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=rFpPhpGModLj4aKaqrdBf49vABTtsbmTJA79nsthdmc=; b=fP97EFlF5LEuI53JCH9oRs+ep9bCuB4Lzr5Cvg1DHdbZvaFZxuLAyHKpTlcvTQ3N7G u5zTlJBwILf/8/5i2D29O3mbX7/NT/liIf32enyv+8kBe8eluqPf+tGjNjWtmFZUhHrE 2A++X1triIu4TkUKV15kKPl5rxzJUh/1a0B20= 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=rFpPhpGModLj4aKaqrdBf49vABTtsbmTJA79nsthdmc=; b=Y4NrpYkBkdcoCI49LFD/AETyfC8T9t+uEwJTXnxGZ05vYq+AwSn9APVNxSX9QgUCTV gLPmvwQCrltC4rVTK8Sqj/kDkagHF2GVFmD44ccc92qIjghOBQCnR2KfLmhXjI5wGUsY UBrXMlTgCyi060UqDXrZ8dK9GF5yoa7yi7PWPBAYfdTY6O0e+S+rUaTr7/DyJed6IVBk uoxJUpuIIl+2Mwr7FYIPNXKm7NU4l1auXZDfdUmB/gp1FTAzighuhXPnKVsMGosa3GI/ b62n9xLOkUtKsVRz4H3NxhJEoQjGQAxKZ5sxSar7BiWgdSbEOVNKSj0gRJ8FZtyM324i tH0A== X-Gm-Message-State: ANoB5pm8GS/L4CPOaZsMdBGdE8i1gOMMlIXAKmP998cN/sQHpLRhzBt8 wKEZ6+COsPngl+GirMwTX71vJ6Na8F8w/w== X-Google-Smtp-Source: AA0mqf7WOb4XOEmxRDoJE9kudfeEO712e1nZvq2JBbO998GVlraClgsYn8xBRobru32dHn4CiYl7Dw== X-Received: by 2002:a37:4141:0:b0:6fa:1032:10a1 with SMTP id o62-20020a374141000000b006fa103210a1mr12776195qka.167.1668951290039; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:49 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 080/241] global: Migrate CONFIG_KSNET_MAC_ID_BASE to CFG Date: Sun, 20 Nov 2022 08:31:11 -0500 Message-Id: <20221120133352.3055600-81-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/ti-common/keystone_net.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 21cac6ea312a..f191c909f41f 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -49,7 +49,7 @@ #define KEYSTONE2_EMAC_GIG_ENABLE -#define MAC_ID_BASE_ADDR CONFIG_KSNET_MAC_ID_BASE +#define MAC_ID_BASE_ADDR CFG_KSNET_MAC_ID_BASE /* MDIO module input frequency */ #ifdef CONFIG_SOC_K2G diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 479ab46e4edd..e46d635ca032 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -47,7 +47,7 @@ #define CFG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6) /* Keystone net */ -#define CONFIG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR +#define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ddcc89f508e1..031e72702307 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -88,7 +88,7 @@ CFG_KM_UBI_PARTITION_NAME_BOOT CFG_KM_UBI_PART_BOOT_OPTS CFG_KM_UIMAGE_NAME CFG_KSNET_CPSW_NUM_PORTS -CONFIG_KSNET_MAC_ID_BASE +CFG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE CONFIG_KSNET_NETCP_BASE CONFIG_KSNET_NETCP_V1_0 From patchwork Sun Nov 20 13:31: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: 1706783 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=fZ/wFdU0; 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 4NFX0P2QBCz23mR for ; Mon, 21 Nov 2022 00:48:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0775785382; Sun, 20 Nov 2022 14:36: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="fZ/wFdU0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF6758532D; Sun, 20 Nov 2022 14:35:19 +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 5BA63852AA for ; Sun, 20 Nov 2022 14:34: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-x729.google.com with SMTP id d7so6499389qkk.3 for ; Sun, 20 Nov 2022 05:34: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=znYiIoikRlQDAnZCksUW3/mG47ijwqfeWfWeGywyEQQ=; b=fZ/wFdU0JFGqfB/7ngUHkdpxk4KCgcYjq1j5xQd/JaSj0GzOWzT58Y036me9f3pU7f 2QCEqIsML5QAIjZaOkx0zeDigtbdt4uPwPDxy/UFiw/xVGClFrXp9jKC97C3YGAFmi/W WW0K5y7ZVHCnRl2FT5q+vhBuliiYxn1L7oykc= 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=znYiIoikRlQDAnZCksUW3/mG47ijwqfeWfWeGywyEQQ=; b=wicHoSTl1Zaaejh+XMMsPHEcoMqOeVKEH+eIwmpnKu5BHc7rE8cx9TC1UiE26Cm8rl KMgRPsAsjlEqgqpPDynH8hZMfYOzHe8ku8BlST2jNSeQKJQUPZOsU2TeU417rmkFvWnF jnnlvn5HjqrnqUqc42CaTJy97zPCKhchMXIF1eONa6ISYoxWQuZ2Fhf2Rz5ZCRr23z2C 9fIaC06d2Hzy9ATebmWq1mIIbnDcl1NC12Q78yrsNq5iE++Se2slWdMW2G/agzln90th csWkpmqlmAysHd2hLGwzdjk5DYaO//Twdc79rx5k+g26aliXJhdHGntBub87gvNlkkmJ byGQ== X-Gm-Message-State: ANoB5pmzUlNqVqtG3WtT5RYZm5agnULHELpZZZDTQFz9ubyMTSwm1Sju jPHBr/sEZEYfWTM2iAlNpJVR1V7qDMm+kw== X-Google-Smtp-Source: AA0mqf6YkheMosLUKF2PBKOsib6dU6ckwbZX1iuZWIcQxIKzNxSvbIJcaobBNtUN5P+zfii6wth4xA== X-Received: by 2002:a37:354:0:b0:6fb:9b2:b946 with SMTP id 81-20020a370354000000b006fb09b2b946mr13162049qkd.487.1668951290805; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:50 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 081/241] global: Migrate CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE to CFG Date: Sun, 20 Nov 2022 08:31:12 -0500 Message-Id: <20221120133352.3055600-82-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 026568c4dfb3..eabd06ff9b7a 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -39,6 +39,6 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 9 -#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE +#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2E_EVM_H */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index feaa43ba7f71..e3f4f5ed4743 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -53,7 +53,7 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 2 -#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE +#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ #define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index b60fc2a55de3..aa9075cfd8ef 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -39,6 +39,6 @@ /* Network */ #define CONFIG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 5 -#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE +#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #endif /* __CONFIG_K2L_EVM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 031e72702307..70296e18643b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -89,7 +89,7 @@ CFG_KM_UBI_PART_BOOT_OPTS CFG_KM_UIMAGE_NAME CFG_KSNET_CPSW_NUM_PORTS CFG_KSNET_MAC_ID_BASE -CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE +CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CONFIG_KSNET_NETCP_BASE CONFIG_KSNET_NETCP_V1_0 CONFIG_KSNET_NETCP_V1_5 From patchwork Sun Nov 20 13:31: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: 1706806 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=MQ1BiNGu; 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 4NFX596W8jz23lt for ; Mon, 21 Nov 2022 00:52:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 303C485296; Sun, 20 Nov 2022 14:38:13 +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="MQ1BiNGu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CC2B985331; Sun, 20 Nov 2022 14:35: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-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 1C7B7852D2 for ; Sun, 20 Nov 2022 14:34: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-qt1-x829.google.com with SMTP id l2so5885484qtq.11 for ; Sun, 20 Nov 2022 05:34: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=Ri3lheZH3n1XdIMP+/4tlT1e/FYYMiDdfFflt4+nngA=; b=MQ1BiNGuKtC/XGAN0/+8jIHcSuwrAyJZxZmH7hpMc3xuGcGUvhas84amsvl/UN4h9f gIUNXX+eGhD4BiKFus0HC2fYoiUCPGEiO0w+9a6m/+Z6qTZ2dWvwDd75KV2qMQ3ZE4gD Mr3/Lap/pGfFth+ZaI8qfd1/jPUNO87ZgFboE= 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=Ri3lheZH3n1XdIMP+/4tlT1e/FYYMiDdfFflt4+nngA=; b=L0vHnWESq+FpCZwX4VtaSPLHR1lu6aHhNKFVwiDNv3gnxv/CsFhurApqxQN9uBh1/V oIkjguXiuuIh+XbOfVxXUkCBYW1p3gJVW66Fl3BTthxYKZK6uIH45V4BaUB/LpgpJblR QVAQGOsQJmGf0J3IwTOj6/8oeYpovd/y9/Re/WW4Xrz1dPK9rB6gYIqn5qush7bv/XIi bXArJ+glosV2moV2yaozNym11YDt9vtkuI0D2J5DejTxucmT3WoUv+V0Y9aR2QYwVQir SjrvLOTvCn7e3k/3gX97Sex812TpoxEUsasADwNDTRy4HzyAK860vecYsIxPcZvmQ/rE 7IUQ== X-Gm-Message-State: ANoB5pmI4FhHm5RnWxzJ9cssncEdKxiQZqWWHFV1CiiqN+7yPF2LQ+MK EarFUVTkdOPN1sQsPo+ZrCf2v55LLHVDYQ== X-Google-Smtp-Source: AA0mqf5qLqq7PmoTKpfy0woqxyzB2V+xvsCDwXlcXpimfe9P4iHjxQMfDGHpugY09WzyZo5bxetgxg== X-Received: by 2002:ac8:72d7:0:b0:3a5:2bb7:55d5 with SMTP id o23-20020ac872d7000000b003a52bb755d5mr13751612qtp.439.1668951291590; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 082/241] global: Migrate CONFIG_KSNET_NETCP_BASE to CFG Date: Sun, 20 Nov 2022 08:31:13 -0500 Message-Id: <20221120133352.3055600-83-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index f191c909f41f..bedbcdc8bac6 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -18,7 +18,7 @@ /* EMAC */ #ifdef CONFIG_KSNET_NETCP_V1_0 -#define GBETH_BASE (CONFIG_KSNET_NETCP_BASE + 0x00090000) +#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00090000) #define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x900) #define EMAC_MDIO_BASE_ADDR (GBETH_BASE + 0x300) #define EMAC_SGMII_BASE_ADDR (GBETH_BASE + 0x100) @@ -32,7 +32,7 @@ #elif defined CONFIG_KSNET_NETCP_V1_5 -#define GBETH_BASE (CONFIG_KSNET_NETCP_BASE + 0x00200000) +#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000) #define CPGMACSL_REG_RX_PRI_MAP 0x020 #define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x22000) #define EMAC_MDIO_BASE_ADDR (GBETH_BASE + 0x00f00) @@ -190,14 +190,14 @@ struct mac_sl_cfg { /* PSS */ #ifdef CONFIG_KSNET_NETCP_V1_0 -#define DEVICE_PSTREAM_CFG_REG_ADDR (CONFIG_KSNET_NETCP_BASE + 0x604) +#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x604) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x06060606 #define hw_config_streaming_switch()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR); #elif defined CONFIG_KSNET_NETCP_V1_5 -#define DEVICE_PSTREAM_CFG_REG_ADDR (CONFIG_KSNET_NETCP_BASE + 0x500) +#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0 #define hw_config_streaming_switch()\ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index e46d635ca032..c21fabc36ed5 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -48,7 +48,7 @@ /* Keystone net */ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR -#define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE +#define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 70296e18643b..7d609640e855 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -90,7 +90,7 @@ CFG_KM_UIMAGE_NAME CFG_KSNET_CPSW_NUM_PORTS CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE -CONFIG_KSNET_NETCP_BASE +CFG_KSNET_NETCP_BASE CONFIG_KSNET_NETCP_V1_0 CONFIG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII From patchwork Sun Nov 20 13:31: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: 1706779 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=juyYE8c4; 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 4NFWzT5Hmyz23mR for ; Mon, 21 Nov 2022 00:47:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD717852E2; Sun, 20 Nov 2022 14:36: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="juyYE8c4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 63E3485316; Sun, 20 Nov 2022 14:35:14 +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 8880485284 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x730.google.com with SMTP id x21so6534102qkj.0 for ; Sun, 20 Nov 2022 05:34:53 -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=Lf9RRhE6lOmF8gPWi+Z13oH5x5k+OPTJ8jZK8en+6zo=; b=juyYE8c4kN/z1+I6degYftZYyYH8GAGwZDRTkmg00EoQUhS4MVq5bTi7nIrH+Cafio PItMS9gDrJuMJ31Q9vWbgrtp5gTCpx0We/OhL2CqJ3B26DMi5JDvr84sKwtMBg7CCOo3 KPTMY+yIIPsY+7OLm0Da5X+ylXCSJ7Ej8VjHY= 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=Lf9RRhE6lOmF8gPWi+Z13oH5x5k+OPTJ8jZK8en+6zo=; b=P+LWMZZILCAulzSOg8+rX3ZuRgqbmaZi1jRBQoZ+/ZyXAGMq2fAffVwPJA2XWeE5xi aLsFR4mVN1J9nABipqXVyt1iorIJO68GVrcSes0cmJL340OuPLbU/4en9tyQfP+1efMP EKEJZ+Ihn68Tuq8WoAQvue86CW6P4Bb6cmijP3+/ZQDgMXMNjMSELMwAAfmFDJNlL/Lg BXppc45XgLZrBP/Km6901XkC+7MQovlwnR4lOU7GjbihVoSaJKaap0XxCTy0zgDPucfk XCYAg5rdTXOa8d/el219MkZHiBT9vT1YOp11lObhue6t8Lr9FE3jBoiETa0XsubsLZPT 9LDg== X-Gm-Message-State: ANoB5pnYJSCY0eAQbzpo+cyh0LY2J2ZRWX/YxQZg4rvAA68MMp3xA6Ff VgPBsR6k1SQ0ouY6ai1YVF7jGlGXSOKOOw== X-Google-Smtp-Source: AA0mqf630Mrd/irkx23ffgpgZDwJTrtozEltviy87BQzl+pnAAW+Ab5ZY3NcOtKVWwAAO6Uw5pc5Wg== X-Received: by 2002:a05:620a:c95:b0:6fa:91f9:c84d with SMTP id q21-20020a05620a0c9500b006fa91f9c84dmr12649994qki.724.1668951292244; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:51 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 083/241] global: Migrate CONFIG_KSNET_NETCP_V1_0 to CFG Date: Sun, 20 Nov 2022 08:31:14 -0500 Message-Id: <20221120133352.3055600-84-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- drivers/net/ti/keystone_net.c | 2 +- include/configs/k2hk_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index bedbcdc8bac6..1576a0473850 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -16,7 +16,7 @@ #endif /* EMAC */ -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00090000) #define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x900) @@ -120,7 +120,7 @@ struct mac_sl_cfg { #define DEVICE_CPSW_NUM_PORTS CFG_KSNET_CPSW_NUM_PORTS #define DEVICE_N_GMACSL_PORTS (DEVICE_CPSW_NUM_PORTS - 1) -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define DEVICE_CPSW_BASE (GBETH_BASE + 0x800) #define CPSW_REG_CTL 0x004 @@ -166,7 +166,7 @@ struct mac_sl_cfg { #define SGMII_LINK_MAC_FIBER 3 #define SGMII_LINK_MAC_PHY_FORCED 4 -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define SGMII_OFFSET(x) ((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100)) #elif defined CONFIG_KSNET_NETCP_V1_5 #define SGMII_OFFSET(x) ((x) * 0x100) @@ -188,7 +188,7 @@ struct mac_sl_cfg { #define RGMII_STATUS_REG (GBETH_BASE + 0x18) /* PSS */ -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x604) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x06060606 diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 1bdbd599d7b4..513c7b32521f 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -58,7 +58,7 @@ enum link_type { ((mac)[2] << 16) | ((mac)[3] << 24)) #define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8)) -#ifdef CONFIG_KSNET_NETCP_V1_0 +#ifdef CFG_KSNET_NETCP_V1_0 #define EMAC_EMACSW_BASE_OFS 0x90800 #define EMAC_EMACSW_PORT_BASE_OFS (EMAC_EMACSW_BASE_OFS + 0x60) diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index e35f080279ae..600e73f11e78 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS /* Network */ -#define CONFIG_KSNET_NETCP_V1_0 +#define CFG_KSNET_NETCP_V1_0 #define CFG_KSNET_CPSW_NUM_PORTS 5 #endif /* __CONFIG_K2HK_EVM_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7d609640e855..3861edb19315 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -91,7 +91,7 @@ CFG_KSNET_CPSW_NUM_PORTS CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE -CONFIG_KSNET_NETCP_V1_0 +CFG_KSNET_NETCP_V1_0 CONFIG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE From patchwork Sun Nov 20 13:31: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: 1706781 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=EA2yHFOc; 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 4NFX004pGFz23mR for ; Mon, 21 Nov 2022 00:47:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DE5285376; Sun, 20 Nov 2022 14:36: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="EA2yHFOc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9EDA3852D8; Sun, 20 Nov 2022 14:35:16 +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 2AE67852D8 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x832.google.com with SMTP id w9so5880166qtv.13 for ; Sun, 20 Nov 2022 05:34:54 -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=ycQ87ax4O5K585JleXJ2l0Kc3bJAsd/JymN8cPxbjKA=; b=EA2yHFOcRPFs//iXqBqDeAjFnkKiFkp4tUxe8YG1cBHVnjYI++HID8cveOnr63gllw ruLE6rNYTH6w0bOSmrZewuN2xJkJEEmUBohaIUXc4raJQIRWOZnxF37m4LjuZ3/94VG0 dVWf+JeNV/vk6EY1RekWE5GEx1xhiNvpQ/rZ8= 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=ycQ87ax4O5K585JleXJ2l0Kc3bJAsd/JymN8cPxbjKA=; b=rEszDtI7IMziQGf5xqaMuv/EJ9GWfzH4VFi6/6dmydOwGkELnqt5+ndY4LN46PwLlH zyBWPDZvoQkfGqgpFXtFs4v+dijLE782FUyN7KgNXxPBfYUoSLcT4YJbvWXnKuEnCANl Bv8PQIt8Ym0I6C7s1EsnaQ6ENtsr1w82YJeXPssKC5Jo8Ws+xkaKBd9S0+LpIE+O75hh q6OzeqIITImy9C1iHJZNuVs2FOihh3aBXDamup9Pdg0tD+yAeVHSXM9jXbDh3z3XGPwn jwCQzphA+AbjakgrYZuDbk8X+6LVBSskhvN1yibkU/3NAkxOYIWIWzTyGUaJeXhVGMK3 lf8w== X-Gm-Message-State: ANoB5pmd+/rVY09s8qJTfMcK8HS/xN/rQyFN17GcwsHOOCd6sExM7Yfw bDdh0iwkqhz2tz1sGFXhSi2SmqZI912Agw== X-Google-Smtp-Source: AA0mqf7pZYmumyowx6uROMqzgUkG+ypnJv6UY0BiA8ovE0XGhbnx5IQPBDudJGp+ZxJolAd/hDahzg== X-Received: by 2002:a05:622a:514d:b0:3a5:258c:d69c with SMTP id ew13-20020a05622a514d00b003a5258cd69cmr14023495qtb.279.1668951292855; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 084/241] global: Migrate CONFIG_KSNET_NETCP_V1_5 to CFG Date: Sun, 20 Nov 2022 08:31:15 -0500 Message-Id: <20221120133352.3055600-85-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- drivers/net/ti/keystone_net.c | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 1576a0473850..3f3c580328bf 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -30,7 +30,7 @@ #define CPGMACSL_REG_RESET 0x0c #define CPGMACSL_REG_MAXLEN 0x10 -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000) #define CPGMACSL_REG_RX_PRI_MAP 0x020 @@ -130,7 +130,7 @@ struct mac_sl_cfg { #define CPSW_REG_ALE_PORTCTL(x) (0x640 + (x) * 4) #define CPSW_REG_VAL_STAT_ENABLE_ALL 0xf -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define DEVICE_CPSW_BASE (GBETH_BASE + 0x20000) #define CPSW_REG_CTL 0x00004 @@ -168,7 +168,7 @@ struct mac_sl_cfg { #ifdef CFG_KSNET_NETCP_V1_0 #define SGMII_OFFSET(x) ((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100)) -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define SGMII_OFFSET(x) ((x) * 0x100) #endif @@ -195,7 +195,7 @@ struct mac_sl_cfg { #define hw_config_streaming_switch()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR); -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0 diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 513c7b32521f..db942811db76 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -70,7 +70,7 @@ enum link_type { #define DEVICE_EMACSW_BASE(base, x) ((base) + EMAC_EMACSW_PORT_BASE_OFS + \ (x) * 0x30) -#elif defined(CONFIG_KSNET_NETCP_V1_5) +#elif defined(CFG_KSNET_NETCP_V1_5) #define EMAC_EMACSW_PORT_BASE_OFS 0x222000 diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index eabd06ff9b7a..024563b5dd68 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 9 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index e3f4f5ed4743..a6022cba68ad 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -51,7 +51,7 @@ "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0" /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 2 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index aa9075cfd8ef..5ebc108d098c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS /* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 5 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3861edb19315..262995ea1f6a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -92,7 +92,7 @@ CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 -CONFIG_KSNET_NETCP_V1_5 +CFG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE From patchwork Sun Nov 20 13:31: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: 1706785 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=T3zp0aM0; 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 4NFX0q3g4sz23mR for ; Mon, 21 Nov 2022 00:48:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F220085389; Sun, 20 Nov 2022 14:36: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="T3zp0aM0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E54F85336; Sun, 20 Nov 2022 14:35: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-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 1679A852D9 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72b.google.com with SMTP id v8so6486155qkg.12 for ; Sun, 20 Nov 2022 05:34:54 -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=jC7zy+ENnJhJSU6zqoklSq6FNpZxVpkyrpCieU2Nqhw=; b=T3zp0aM0wOh9eAsfgsEl2AjRSgfSEccexKR2wjoACMKt1CfivrobqVvt02xwv/gjKh 07dCI7z1WNKB/d+u1ENpHrA+6J9Lf6ScxRc8Lt3Q4J9IzYe632/H7WWOLpB3qLiopL04 YgFDb1HgSLIzjrqmtk67sNIW5JE/kcGytHLPA= 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=jC7zy+ENnJhJSU6zqoklSq6FNpZxVpkyrpCieU2Nqhw=; b=iRQvbf818wQfA10ONJjQzDK2AJEdmHBUWvIrCT0Dg9mDB+l8O789ZWiyAZkWk0k4Ni 0go1Plf/ynZNBoduTnAjnvUzvl/hRPbLmXJkro6Nyy+3Eq72QqcZVHhaPSHlxhoUiCJO dXGTEZJAMrHBFZaHD3PkRClNCGPJm/EXpfTtk3lT4l3UD+keTl79UhMkTw/pzOeuERiS cmqeM6txvN/pJY/WDRvtxDW55s5HxbYbanr90VSI+M6tstk2ibgn6wv2eX1xtz2taEDa E5jTLPzJHE7EuXzQ3Mi4edFomhcBuQJ0p9DzRpiTAfgyNekzzgpXj42s/ob0n+dcgxct lrmw== X-Gm-Message-State: ANoB5pmyIQTmml2Q+V+xvaFtX6GuxkYA1Kt5lkukkud/ahwrPphs0yzy JEwb1P93Xn7Mf3Sj8FJQfgYhA/qXfAaOww== X-Google-Smtp-Source: AA0mqf5gjmn83ZQw8E7YSQcSJpGlbKksRB7RoiSplCkl33zQJkQgIGZ7HCypRlPU/WqGWXMGPHP+Nw== X-Received: by 2002:a05:620a:10b4:b0:6fb:f17e:c8f8 with SMTP id h20-20020a05620a10b400b006fbf17ec8f8mr3036547qkk.404.1668951293518; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:53 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 085/241] global: Migrate CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG Date: Sun, 20 Nov 2022 08:31:16 -0500 Message-Id: <20221120133352.3055600-86-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/net/ti/keystone_net.c | 4 ++-- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index db942811db76..5d344d73c3bc 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -372,12 +372,12 @@ static void keystone2_net_serdes_setup(void) { ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE, &ks2_serdes_sgmii_156p25mhz, - CONFIG_KSNET_SERDES_LANES_PER_SGMII); + CFG_KSNET_SERDES_LANES_PER_SGMII); #if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L) ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE, &ks2_serdes_sgmii_156p25mhz, - CONFIG_KSNET_SERDES_LANES_PER_SGMII); + CFG_KSNET_SERDES_LANES_PER_SGMII); #endif /* wait till setup */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index c21fabc36ed5..cb4ea394eb8b 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -51,7 +51,7 @@ #define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE -#define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES +#define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES /* EEPROM definitions */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 262995ea1f6a..980e6bc1d9b1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -93,7 +93,7 @@ CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 CFG_KSNET_NETCP_V1_5 -CONFIG_KSNET_SERDES_LANES_PER_SGMII +CFG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE CONFIG_L1_INIT_RAM From patchwork Sun Nov 20 13:31: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: 1706782 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=NKBoNQ+Y; 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 4NFX0C065Vz23mR for ; Mon, 21 Nov 2022 00:47:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38C988537C; Sun, 20 Nov 2022 14:36: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="NKBoNQ+Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA8E585324; Sun, 20 Nov 2022 14:35: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-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) (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 879B4852CB for ; Sun, 20 Nov 2022 14:34: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-qv1-xf36.google.com with SMTP id j6so6448706qvn.12 for ; Sun, 20 Nov 2022 05:34: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=HFq0im6scX7ZSLSPGY3KMY1X4qppRN5+q9tzM2o/EYQ=; b=NKBoNQ+YKcm2iARs434zGgbRFgmSBaoGu4jE6ca4m6Hlh0JlcTgvn5sII+wK7RzDPl 60isE1NCmTAzuoRLeuXiaUqaQ6f9rbmtCUoJS0GcNd7p8BOT7LuqM6Z3G6zJCX6OYcM9 gVO2hbRdIYPqUeQ7FG0X2EDktn9biT5sI8J+k= 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=HFq0im6scX7ZSLSPGY3KMY1X4qppRN5+q9tzM2o/EYQ=; b=kioxB0icpOi6qvqY9FnXx3DoDmXMpe0vLQZ7P49ribFCMrYUuPz/w8WhrrB/tiSpT6 iXG1LVco7sZxuksqlbqKQfamriewjGLjWvwxVVjcOM75Ll4xmHgeLpXmK6P3zbjEj8kJ 6y7DuPsIHMe06+RA+JS6iXSxjO5dpQ8tS4Elw0LOgraWe/mRcsehMv907NJKz4Dr56gd Lo+6Niq2nelwcgrKfBuFVhrpma1IS1McdPs0E37SggETSBneGo8kMKjHfdluufelx/T4 Mb5OudSz9CfIlkPElseWXeUCJ0TjV4ikuf5KabORRLEaZe1blOo8HBiqI8z1OGceJrGc MsJA== X-Gm-Message-State: ANoB5pnpnsxbLVSLcz3ZPWfI5/fPMBfEjKzCJB8o7CYUNkRR9vxsnV0K lYw20bywjDqhpX6nC86byTzyfNq04cgRTA== X-Google-Smtp-Source: AA0mqf6M7GxVQU0DNZAlPOlAXWbM6oW5Hb4iJIMAG5/hevdJj0jo5YqcyjGURxUPNXhv4IbkPWn2kQ== X-Received: by 2002:a05:6214:5712:b0:4c6:90db:3393 with SMTP id lt18-20020a056214571200b004c690db3393mr11576290qvb.20.1668951294305; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:53 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 086/241] global: Migrate CONFIG_KSNET_SERDES_SGMII2_BASE to CFG Date: Sun, 20 Nov 2022 08:31:17 -0500 Message-Id: <20221120133352.3055600-87-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/net/ti/keystone_net.c | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 5d344d73c3bc..306b862e20ff 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -375,7 +375,7 @@ static void keystone2_net_serdes_setup(void) CFG_KSNET_SERDES_LANES_PER_SGMII); #if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L) - ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE, + ks2_serdes_init(CFG_KSNET_SERDES_SGMII2_BASE, &ks2_serdes_sgmii_156p25mhz, CFG_KSNET_SERDES_LANES_PER_SGMII); #endif diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index cb4ea394eb8b..1429faa534e3 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -50,7 +50,7 @@ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE -#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE +#define CFG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES /* EEPROM definitions */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 980e6bc1d9b1..7470e7e1d91f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -94,7 +94,7 @@ CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 CFG_KSNET_NETCP_V1_5 CFG_KSNET_SERDES_LANES_PER_SGMII -CONFIG_KSNET_SERDES_SGMII2_BASE +CFG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE CONFIG_L1_INIT_RAM CONFIG_L2_CACHE From patchwork Sun Nov 20 13:31: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: 1706787 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=unPduy3N; 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 4NFX1F2cFDz23mR for ; Mon, 21 Nov 2022 00:48:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1241385398; Sun, 20 Nov 2022 14:36: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="unPduy3N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9250C8533D; Sun, 20 Nov 2022 14:35: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-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 638EB852E0 for ; Sun, 20 Nov 2022 14:34: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-x835.google.com with SMTP id s4so5904724qtx.6 for ; Sun, 20 Nov 2022 05:34: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=gu2kLJUdUpV4PQAMdx8pwJj0JaUBrTXfa4EavvLJQlQ=; b=unPduy3NHXxju0FnR+kARWQC+ilDu2+xCYpARRfLchqEgI5NRwNTTYe55XPKkFSzWX LuOjmxiTRqSHetNO7J0rwWFzMwobLeB8ks+YU0epkK90S6RPylnTq8uFSC/DEFkNBPI7 j+s2T0gGGMnCVkOr3X/exziaAubabrepn6lAw= 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=gu2kLJUdUpV4PQAMdx8pwJj0JaUBrTXfa4EavvLJQlQ=; b=Wr7JVMLNbFah/fWX3QTLA9irt+2AxgYuNT5r3EJJxwTCKKGNDIzgQbCoumTkw0RrAx NGN3EDSk7M4CT521ACD/hk0dTVEB0nxyogO56SWbo7+hNhSePMM19EZfokcOKoekQwVU UU7TE5CzIreX7Bo0TzpPPoMCBSFSECz3BivrVS2At/MhPQKWsAkVzEzGl1FMrgtH40VC 8oUeuGIwmRk4qe+oFfzzTrwtYS9TSBTaqs/BUXpwEraIrqBx33o7AebDLH/64FhYn3Gy RsFafQBEnMF8I80StC+EoN26msibdHsAzd3qN/pHZvIfPHcpfNlcZWRY6zo6oYdBq4oo K2vQ== X-Gm-Message-State: ANoB5pnCkIAqDfAF9AaHYqwx6A+CZ4pLVJXH7M3d8LKOVUASWhcNNDPk KtSyUpTB3lKseeosaG8A9s3734ENQ0iavw== X-Google-Smtp-Source: AA0mqf7CLgbXhZ+pt1W0dKILW3ZGH9vQ1OiCzUi9tcqwGykhDpDAXnwOIuQPpq3UrLscAY0Wplhq6g== X-Received: by 2002:ac8:74c1:0:b0:3a5:5a43:b2da with SMTP id j1-20020ac874c1000000b003a55a43b2damr13825801qtr.592.1668951294829; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:54 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 087/241] global: Migrate CONFIG_KSNET_SERDES_SGMII_BASE to CFG Date: Sun, 20 Nov 2022 08:31:18 -0500 Message-Id: <20221120133352.3055600-88-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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/net/ti/keystone_net.c | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 306b862e20ff..f85c057e1399 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -370,7 +370,7 @@ struct ks2_serdes ks2_serdes_sgmii_156p25mhz = { #ifndef CONFIG_SOC_K2G static void keystone2_net_serdes_setup(void) { - ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE, + ks2_serdes_init(CFG_KSNET_SERDES_SGMII_BASE, &ks2_serdes_sgmii_156p25mhz, CFG_KSNET_SERDES_LANES_PER_SGMII); diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 1429faa534e3..7142d30a5994 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -49,7 +49,7 @@ /* Keystone net */ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE -#define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE +#define CFG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE #define CFG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7470e7e1d91f..bd22cbb231b8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -95,7 +95,7 @@ CFG_KSNET_NETCP_V1_0 CFG_KSNET_NETCP_V1_5 CFG_KSNET_SERDES_LANES_PER_SGMII CFG_KSNET_SERDES_SGMII2_BASE -CONFIG_KSNET_SERDES_SGMII_BASE +CFG_KSNET_SERDES_SGMII_BASE CONFIG_L1_INIT_RAM CONFIG_L2_CACHE CONFIG_LEGACY_BOOTCMD_ENV From patchwork Sun Nov 20 13:31: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: 1706804 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=KmH+SotO; 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 4NFX4n0Y5Qz23lt for ; Mon, 21 Nov 2022 00:51:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 68CF8853C8; Sun, 20 Nov 2022 14:36: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="KmH+SotO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A92E28536B; Sun, 20 Nov 2022 14:35: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-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 18012852E2 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x72f.google.com with SMTP id g10so6495798qkl.6 for ; Sun, 20 Nov 2022 05:34:56 -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=6khbEYh0CvfSoCJ5Q0X9xiib07nPmUePMJ5Rxse6LpM=; b=KmH+SotOJHTb0yTYHB5Ye0PTJg5fIkn5EcwESuWqmNjTpuwEicK5spelGte7G1NPll 7S6Czd2WrT+DvhpP0mLfi2Uc1ntP14noruu0PCm+q9vTmkvjaI79SvB0P4n7m05wKgAT XEiVAznrK2EvY0yHOjJdjq/tOakwXcqFn6TZ0= 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=6khbEYh0CvfSoCJ5Q0X9xiib07nPmUePMJ5Rxse6LpM=; b=ZGjWrJCgHjb8/0bf1VaG+KwlMbhFFDYTw6jqcEoS2Gv+/u7V1n1pLRYb72/AHAkUCg Xak2IYrRizat6JUPGYMf2AgG+Vk7K826zpOZe3Qqoo2fX4NE0mOKBDWP1mkOw41P5GDm Cv4UrUSiXZl0Wm1dI0D9zXbYcSF636ye3SMU17LoNmeT8TFIKGFaaLyVFvw4nZJ8LZ9O WeGlNXAIWCLSS2pjd8rGCKYLtrDY8hbAG7NM/sYCmprju0JoibZpBhj16Ues2ZQHCjUL fzo55qJZqXH10i9Lco3Hesx5dQv9NTY+up4QIGTv9GAypzhaL2FODay5x31uASvku/GZ etlA== X-Gm-Message-State: ANoB5pnFj1M8vSsXvBCaKcTCe09eKY1GFLk/n8ZnkZbTGJjx0bPH8Lca GAEDePYOKJlfVko1K4bb+crVC+uGiwwy6w== X-Google-Smtp-Source: AA0mqf5KtiL7p1O2DyR56XQiZdVX0Dj4FyeMdko46IHooAQ67K/rZKcDiVT5Z2i5wdArm7AkctM3MA== X-Received: by 2002:a05:620a:c02:b0:6ec:54d6:ea87 with SMTP id l2-20020a05620a0c0200b006ec54d6ea87mr12682173qki.245.1668951295527; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:55 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 088/241] global: Migrate CONFIG_L1_INIT_RAM to CFG Date: Sun, 20 Nov 2022 08:31:19 -0500 Message-Id: <20221120133352.3055600-89-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/P2041RDB.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 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index f2179db6b9b4..0a6fcde3913d 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -133,7 +133,7 @@ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS + 0x8000000} /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */ #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 09087a70895d..36ae8394d5d6 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -271,7 +271,7 @@ #endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4b7b53094446..7a31e8bcdc0a 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -249,7 +249,7 @@ #endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index c614a539b391..8e2566dd2175 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -247,7 +247,7 @@ #endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 2da4f5a09b14..6a215557104f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -212,7 +212,7 @@ #endif /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index b8bfc52f07ae..bf0c3ac1318b 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -71,7 +71,7 @@ #define CFG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CFG_SYS_FLASH_BASE) /* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bd22cbb231b8..ca45b1eeb514 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -96,7 +96,7 @@ CFG_KSNET_NETCP_V1_5 CFG_KSNET_SERDES_LANES_PER_SGMII CFG_KSNET_SERDES_SGMII2_BASE CFG_KSNET_SERDES_SGMII_BASE -CONFIG_L1_INIT_RAM +CFG_L1_INIT_RAM CONFIG_L2_CACHE CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR From patchwork Sun Nov 20 13:31: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: 1706784 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=DeiGhmpZ; 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 4NFX0c52hKz23mR for ; Mon, 21 Nov 2022 00:48:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 05AF785384; Sun, 20 Nov 2022 14:36: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="DeiGhmpZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C3C285330; Sun, 20 Nov 2022 14:35: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-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 8E260852EB for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qv1-xf34.google.com with SMTP id d13so757507qvj.8 for ; Sun, 20 Nov 2022 05:34:57 -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=dQOjLecCdp9ED6bxvMITAQcNUnHf8Dk+W+PVjTJbTPs=; b=DeiGhmpZuXvr+KpcIOp6G6Esl8UZdSS7NkLM+VHV5CarlAnoqAKiSVls3cx84GgbE8 TujGtk/5VqWGWCl74f4uDwA9keaqFjJo5L4gP073tGWYE2AViq51Lm7HcIw62f1dIiSP /r+PtR2mWbxsMCoohXcR090CkschLD418yVzE= 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=dQOjLecCdp9ED6bxvMITAQcNUnHf8Dk+W+PVjTJbTPs=; b=jXkweZcFhr3aw8GGsXbv3SjHkOSx7vg6bYyFM3Fkn+bSY4TgWGR27yKG28ZrlxZFSv iEwd0xeBgD5FGgdfsB9uWcNPHWIpJqIJvvz5g+o7uqqYJgYb3WUadGhNEijqBH0jixJm Bu7h2Z7LrH2Al4Nfd3dcZH95t/D3ZzLQf4KYTf6oJ3Xd5aHmjJX2dCSIwNbt29jqtpNk 1Wu45I0tQoGAhOaCirvvPkS51mqZyVMJOYuKmFn0aTGP4Lc2h0iF1BqmzrEzmNNk1yKJ 9NzSev0yDepic4CSxIKQCTjfmjH0TTAY8f9luXAvfb2/pMabA/Yj4iXOoiQ6SEOktE77 aJgA== X-Gm-Message-State: ANoB5pkT5j8sJLCTXsXrjUlY9cKJEHQKayyNQFGHDqisM6O8PhSBZxUK Bu7AH4CFvRnaa7d5SvZixxK+l9dfBSHbQw== X-Google-Smtp-Source: AA0mqf5ozwbF3maw1zdm4DUbq+TBqCVpi9Gs/mqtjiybaeQyCOJm5mGDlMK0xvhLbUX1/6doQJAUvg== X-Received: by 2002:a05:6214:46:b0:4c6:3f1f:e851 with SMTP id c6-20020a056214004600b004c63f1fe851mr2356976qvr.29.1668951296214; Sun, 20 Nov 2022 05:34:56 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:55 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 089/241] global: Migrate CONFIG_L2_CACHE to CFG Date: Sun, 20 Nov 2022 08:31:20 -0500 Message-Id: <20221120133352.3055600-90-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++-- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ++-- arch/x86/cpu/intel_common/car2.S | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/socrates.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index f07e8ab388e8..562d7074ed75 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -515,7 +515,7 @@ int enable_cluster_l2(void) int l2cache_init(void) { __maybe_unused u32 svr = get_svr(); -#ifdef CONFIG_L2_CACHE +#ifdef CFG_L2_CACHE ccsr_l2cache_t *l2cache = (void __iomem *)CFG_SYS_MPC85xx_L2_ADDR; #elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500) struct ccsr_cluster_l2 * l2cache = (void __iomem *)CFG_SYS_FSL_CLUSTER_1_L2; @@ -523,7 +523,7 @@ int l2cache_init(void) puts ("L2: "); -#if defined(CONFIG_L2_CACHE) +#if defined(CFG_L2_CACHE) volatile uint cache_ctl; uint ver; u32 l2siz_field; diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index a7e1df104d73..635eaed12152 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -185,7 +185,7 @@ static inline void ft_fixup_l3cache(void *blob, int off) #define ft_fixup_l3cache(x, y) #endif -#if defined(CONFIG_L2_CACHE) || \ +#if defined(CFG_L2_CACHE) || \ defined(CONFIG_BACKSIDE_L2_CACHE) || \ defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) static inline void ft_fixup_l2cache_compatible(void *blob, int off) @@ -218,7 +218,7 @@ static inline void ft_fixup_l2cache_compatible(void *blob, int off) } #endif -#if defined(CONFIG_L2_CACHE) +#if defined(CFG_L2_CACHE) /* return size in kilobytes */ static inline u32 l2cache_size(void) { diff --git a/arch/x86/cpu/intel_common/car2.S b/arch/x86/cpu/intel_common/car2.S index f8cf78586d02..908f2251b67a 100644 --- a/arch/x86/cpu/intel_common/car2.S +++ b/arch/x86/cpu/intel_common/car2.S @@ -246,7 +246,7 @@ car_cqos: or $(PREFETCH_L1_DISABLE | PREFETCH_L2_DISABLE), %eax wrmsr -#if (CONFIG_DCACHE_RAM_SIZE == CONFIG_L2_CACHE_SIZE) +#if (CONFIG_DCACHE_RAM_SIZE == CFG_L2_CACHE_SIZE) /* * If CAR size is set to full L2 size, mask is calculated as all-zeros. * This is not supported by the CPU/uCode. diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index d2a70aa88f88..5f2fc5516d5e 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -20,7 +20,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CFG_L2_CACHE /* toggle L2 cache */ /* * Only possible on E500 Version 2 or newer cores. diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 67ee74ba6232..794289627fe8 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -99,7 +99,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CFG_L2_CACHE /* toggle L2 cache */ /* DDR Setup */ #define SPD_EEPROM_ADDRESS 0x52 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index de6440a07564..c8ecd2dc0fca 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -112,7 +112,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE +#define CFG_L2_CACHE #define CFG_SYS_CCSRBAR 0xffe00000 #define CFG_SYS_CCSRBAR_PHYS_LOW CFG_SYS_CCSRBAR diff --git a/include/configs/socrates.h b/include/configs/socrates.h index fb2b76eb829a..9eee8de41644 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -40,7 +40,7 @@ /* * These can be toggled for performance analysis, otherwise use default. */ -#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CFG_L2_CACHE /* toggle L2 cache */ #define CFG_SYS_INIT_DBCR DBCR_IDM /* Enable Debug Exceptions */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ca45b1eeb514..07fd8dbeab11 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -97,7 +97,7 @@ CFG_KSNET_SERDES_LANES_PER_SGMII CFG_KSNET_SERDES_SGMII2_BASE CFG_KSNET_SERDES_SGMII_BASE CFG_L1_INIT_RAM -CONFIG_L2_CACHE +CFG_L2_CACHE CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG From patchwork Sun Nov 20 13:31: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: 1706797 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=GaF7PAg+; 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 4NFX3H14c0z23lt for ; Mon, 21 Nov 2022 00:50:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F03C4853B7; Sun, 20 Nov 2022 14:36: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="GaF7PAg+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C03158534D; Sun, 20 Nov 2022 14:35: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-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 8D430852DE for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qt1-x829.google.com with SMTP id h24so5890763qta.9 for ; Sun, 20 Nov 2022 05:34:57 -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=RwrcwesqowR6UmPR+N7+Lmk4nToKm+K8vnFd7AXG0Qw=; b=GaF7PAg+pYG4aiSozkCW9lBSr1uS9QonzCRfDEXttiIMmm/fBM4UbGDqQ58aMp6alu jdULSdqoZgiFyONxoDwHt+YkwN0YtqriHFPxz4Bof7ogkHyHr2nNuin3Vg2CemfZ5RYC Rxwi7epzBfiMEtBc4JwjCxxiNcFvePLf8A9QA= 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=RwrcwesqowR6UmPR+N7+Lmk4nToKm+K8vnFd7AXG0Qw=; b=HKTs0nhxyG7R+OXf0hFUx9JDhVysnyDFw3nkywj0QI7KZXtVBJZ7iTYmH07N4gQdpm wxS8bUoOly1oc0ei6rVB4+4ksF0tD7k8GU9ezwaj+pZp7F6FJjdjt0gabXV/yOmKzVGx DeBeLxjRkndPqlgzQJtzMIAKIoJKqq1hjmGSrz4BucOJmj5rZEVM+Jw4e5R9VjKmM/1q BNdEN09WHWuKBYLYEuRiKxlCkLQMB5RsyxMgUkgYB0XSqDc+oGl9FdgBxZ8XwtBnBOjG aNmvZXl1trBkSZLFpaFIM+y0LUNfaJz2yuye0RWMH1PdUGUgWNXgOUiZNv42T6zX9bu8 uDPA== X-Gm-Message-State: ANoB5plTaLUbSg6tCCbxkrMNEyt0J+cyAdMd/wKKjB+fOYjAOKPg3HLi SffnOvYm+nQQOgaD56XgN5ItZWbG+rcRnw== X-Google-Smtp-Source: AA0mqf5q3Hb8c5iFu5IYXjC4ZaYaupObvYCgxXbmzU3FvmxyFtwI3Jv8CWg9KBw45vr13+2EPT0Nog== X-Received: by 2002:a05:622a:989:b0:3a5:270c:fbee with SMTP id bw9-20020a05622a098900b003a5270cfbeemr14319594qtb.74.1668951297081; Sun, 20 Nov 2022 05:34:57 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:56 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 090/241] global: Migrate CONFIG_LEGACY_BOOTCMD_ENV to CFG Date: Sun, 20 Nov 2022 08:31:21 -0500 Message-Id: <20221120133352.3055600-91-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- include/configs/pic32mzdask.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 60c747327588..0ae4fc55a97b 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -52,7 +52,7 @@ "fdt_addr_r=0x89d00000\0" \ "scriptaddr=0x88300000\0" \ -#define CONFIG_LEGACY_BOOTCMD_ENV \ +#define CFG_LEGACY_BOOTCMD_ENV \ "legacy_bootcmd= " \ "if load mmc 0 ${scriptaddr} uEnv.txt; then " \ "env import -tr ${scriptaddr} ${filesize}; " \ @@ -71,7 +71,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - CONFIG_LEGACY_BOOTCMD_ENV \ + CFG_LEGACY_BOOTCMD_ENV \ BOOTENV #endif /* __PIC32MZDASK_CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 07fd8dbeab11..495467153157 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -98,7 +98,7 @@ CFG_KSNET_SERDES_SGMII2_BASE CFG_KSNET_SERDES_SGMII_BASE CFG_L1_INIT_RAM CFG_L2_CACHE -CONFIG_LEGACY_BOOTCMD_ENV +CFG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY From patchwork Sun Nov 20 13:31: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: 1706790 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=XATpee43; 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 4NFX1s43R9z23mR for ; Mon, 21 Nov 2022 00:49:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E61585392; Sun, 20 Nov 2022 14:36: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="XATpee43"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D32B785347; Sun, 20 Nov 2022 14:35:31 +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 42839852EF for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x736.google.com with SMTP id k4so6490292qkj.8 for ; Sun, 20 Nov 2022 05:34:58 -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=INmFTnHMuJw43mGJXLTjck3PmX8Umimh+2/nnGtoK/E=; b=XATpee43cgp3HyJRHou9x5wMbBF5e5eeTxYcrqAOTk4RfOezQDbSZ3CsTt3uVpRCF5 CFztyMIYm1G80gJTAGsRYoe9ZMJl9KkO8CAMTrkPTffjhicsxyRG/NMol7Uy7cEQWEfH I5mFbtSxSCbn7vXWKWuMi08kBvFkWuL1ByVX8= 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=INmFTnHMuJw43mGJXLTjck3PmX8Umimh+2/nnGtoK/E=; b=X2m0k05EwB4byEDzJeSuN6BCxsz8HA4kW25v4pKHsuGLTRTkFT8fKC7j/uelsb/28p tmzzufob/iF2dk21k/WfjFsWs528D3LQE+Bjv4EQp9zpeMwwggoYyvULlkd39yHUyjm4 UlhzqkG1UTUVq4dARXhHw0mg/0zzjLEW1t/vr4Oy44utM3iCd2P3VuYODTLnF+9VwARU yyn9UyeDcgas+o+e8srC4cgY6xL8aDocjS6Stk9vRzlWL+Z6kwom6di+uhd8IdvdGrjC uO4qqmfIx+IIIAzQmWfXrGLVe8MJJXEeCiwFdLwfAHxa3A1p+Yl0cfFoWW/jvklrmoLF keYw== X-Gm-Message-State: ANoB5pnVjg+2uyuaWZiAHqvLRPtbUzpfyPZCf+4NbW5cAqWoBSUJ7i4Q 6P1Md1Poc6yhQ5Uic1hv23X5JMj80ASMRw== X-Google-Smtp-Source: AA0mqf6FLs7Qq2CAtJOUI6bQOcjVuvJ1PL6S89Ml8Ahb95EIfwgbfRvKkNk2IknvXeqv7BAIr/aB2g== X-Received: by 2002:a05:620a:13b4:b0:6fa:b1e9:6f2d with SMTP id m20-20020a05620a13b400b006fab1e96f2dmr12927531qki.560.1668951297725; Sun, 20 Nov 2022 05:34:57 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:57 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 091/241] global: Migrate CONFIG_LOWPOWER_ADDR to CFG Date: Sun, 20 Nov 2022 08:31:22 -0500 Message-Id: <20221120133352.3055600-92-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/mach-exynos/lowlevel_init.c | 2 +- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 9225d2cc1f2a..02a79962af24 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -161,7 +161,7 @@ static void secondary_cores_configure(void) /* set lowpower flag and address */ writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG); - writel((uint32_t)&low_power_start, CONFIG_LOWPOWER_ADDR); + 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); diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index d5f480de0ef7..d7db17b2dc92 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -18,6 +18,6 @@ * Low Power settings */ #define CONFIG_LOWPOWER_FLAG 0x02020028 -#define CONFIG_LOWPOWER_ADDR 0x0202002C +#define CFG_LOWPOWER_ADDR 0x0202002C #endif /* __CONFIG_EXYNOS5420_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 495467153157..f2d7a0202c22 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -99,7 +99,7 @@ CFG_KSNET_SERDES_SGMII_BASE CFG_L1_INIT_RAM CFG_L2_CACHE CFG_LEGACY_BOOTCMD_ENV -CONFIG_LOWPOWER_ADDR +CFG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY CONFIG_LPC32XX_NAND_MLC_NAND_TA From patchwork Sun Nov 20 13:31: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: 1706793 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=L3GaCPSJ; 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 4NFX2R5mfgz23mR for ; Mon, 21 Nov 2022 00:49:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1ACDE853A0; Sun, 20 Nov 2022 14:36:21 +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="L3GaCPSJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C81B8534C; Sun, 20 Nov 2022 14:35: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-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 A696D8529D for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x735.google.com with SMTP id 8so6518235qka.1 for ; Sun, 20 Nov 2022 05:34:59 -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=rkyjDrA8oes8vkDHIJMwXcqh4qJTxc6Jp3tLzOAjKoc=; b=L3GaCPSJUF3HGaLnB+IecDz3fyHZYplNadVPOyF3034fT8SsecgtCLiKW77FZlazYz lBQWEbyJoWl4PddFWUEFuMuQURHtSGaIoAXh76rrWeJIZQQLc9by9ytgoJ4cNa1C8uqX f1r5AeXgAhCaqasioTE2QUfwuEY9z3gJcwmCY= 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=rkyjDrA8oes8vkDHIJMwXcqh4qJTxc6Jp3tLzOAjKoc=; b=6grmQi6wq6nd+cJSfPb3OUcwcN+fP+C1JAXvWKfcSIWc5+usHTKr3CHFOpOFX9V2FT zvdt1APUGZaJa0qaINQhtR58TCpWEduxvnhupBjGyWWgOzS7/UCwzJwEK25Oo9Ko/OKp 0y5p78KpDBPDT9O4JA3BUgp6W6Om0le3OkpKlx14s14udQKyYbooRAAterhs/ae6BK4E qvR8Ul1MEYeO3ci6KuRWv1eko+sIJjByx+c/HanywjF4Z0Ury33Wvxgutpiy5uo40XSl 8S7IF0R1D0E8tqdQbBWOLvSd86YeiEWD8/7p8PVAB3DZjI52icup4sKx9sUgGHXnmSLW VSuQ== X-Gm-Message-State: ANoB5pmEGohR9hQyhxDcuSuWd+qtumV9dSdIkII02WvqpyCCAuy1UgZF 9z9oR0T8m/U0snUD+ugF2He8c/8/V8ucLA== X-Google-Smtp-Source: AA0mqf78Ptv4sEzolim6VV2/pfD02rziKYK+fQupS5VfZw6XYV3Qsup0D6YLANRgx089OOQlmIbYFA== X-Received: by 2002:a05:620a:1527:b0:6ec:ff06:8307 with SMTP id n7-20020a05620a152700b006ecff068307mr12513138qkk.683.1668951298357; Sun, 20 Nov 2022 05:34:58 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:57 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 092/241] global: Migrate CONFIG_LOWPOWER_FLAG to CFG Date: Sun, 20 Nov 2022 08:31:23 -0500 Message-Id: <20221120133352.3055600-93-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 --- arch/arm/mach-exynos/lowlevel_init.c | 4 ++-- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 02a79962af24..243b5c80c90e 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -73,7 +73,7 @@ static void low_power_start(void) reg_val = readl(EXYNOS5420_SPARE_BASE); if (reg_val != CPU_RST_FLAG_VAL) { - writel(0x0, CONFIG_LOWPOWER_FLAG); + writel(0x0, CFG_LOWPOWER_FLAG); branch_bx(0x0); } @@ -160,7 +160,7 @@ static void secondary_cores_configure(void) writel(0x0, (EXYNOS_RELOCATE_CODE_BASE + 0x1C)); /* set lowpower flag and address */ - writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG); + writel(CPU_RST_FLAG_VAL, CFG_LOWPOWER_FLAG); writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR); writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE); /* Store jump address for power down */ diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index d7db17b2dc92..b617c062881b 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -17,7 +17,7 @@ /* * Low Power settings */ -#define CONFIG_LOWPOWER_FLAG 0x02020028 +#define CFG_LOWPOWER_FLAG 0x02020028 #define CFG_LOWPOWER_ADDR 0x0202002C #endif /* __CONFIG_EXYNOS5420_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2d7a0202c22..99942bf36472 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -100,7 +100,7 @@ CFG_L1_INIT_RAM CFG_L2_CACHE CFG_LEGACY_BOOTCMD_ENV CFG_LOWPOWER_ADDR -CONFIG_LOWPOWER_FLAG +CFG_LOWPOWER_FLAG CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY CONFIG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH From patchwork Sun Nov 20 13:31: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: 1706791 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=aOjr72po; 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 4NFX233qWYz23mR for ; Mon, 21 Nov 2022 00:49:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9E408539C; Sun, 20 Nov 2022 14:36: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="aOjr72po"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 017B1852FF; Sun, 20 Nov 2022 14:35: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-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 9169D852F9 for ; Sun, 20 Nov 2022 14:34: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=trini@konsulko.com Received: by mail-qk1-x729.google.com with SMTP id d7so6499507qkk.3 for ; Sun, 20 Nov 2022 05:34:59 -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=ZhUF9Yo2CNN79arxGMUpUAl2nMto/RJQsLya7dq8X50=; b=aOjr72pomdCo3RG2FT/uxEO4y53s9rzHRsaDUU3POUxwGkosQWDxMcPHB4axuev49Q hnU8hCpOBQLVFBcNAnhrFhKoOGVOITsllDojmYBdQejOqe8SqnAQijiu/M7G84tRQW9d h7YTmCOnpGRD4TEwwDJdj0t+IbClRwg3bh/Qg= 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=ZhUF9Yo2CNN79arxGMUpUAl2nMto/RJQsLya7dq8X50=; b=nqxyhxRiBkko27r2pL1H5ahdl4BTCwmNhRw1Gp/WcebjlcvcDw2zCnfMW3uYW0zpYT luuPUoKsWYMf+miRf2PAhQ5I3RPF60L2AZAnq+SBCwBz5R6kT4i82XuTORUxSuj9P8Gx yIVkT8JEXXugYQgIjevnJ7bItW87VrXSY422ggWQtQqrDjsgphODq5jSpXH4RsXVtt7G Wao4trlBpk8/0kauVcvqTR9NziKk3TixJHlIJZyNlDVZeAexK6ghpjS4u4ImzQGpwcNz LzxHj/Eqk2OLCXo2tXJNh7znIrQw5ZqYPUtzm25NjMKluP0bewfCxWelTIhSLjnmZVrO vLcA== X-Gm-Message-State: ANoB5pmEcsrCrNpRSF8ugQ9WyxW4JFhCrQe8EfuEjOkwY6IdUPdrZcw0 Lqm5JdXpmuCg0YRfNBD+0/beGGdrdXn7tQ== X-Google-Smtp-Source: AA0mqf7CC+bCmdwMgn8Q9AY37XUHsTYTSmSrNdA/tYNoEJ+TsyFU7HKJBPhtyCI52/8gSbqKyMq3vQ== X-Received: by 2002:ae9:c116:0:b0:6fa:da78:6945 with SMTP id z22-20020ae9c116000000b006fada786945mr12329033qki.367.1668951299061; Sun, 20 Nov 2022 05:34:59 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 093/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG Date: Sun, 20 Nov 2022 08:31:24 -0500 Message-Id: <20221120133352.3055600-94-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index a884c65d18b8..dd3f35def0fa 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -142,7 +142,7 @@ static void lpc32xx_nand_init(void) writel( clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | + clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 010da1531ff9..a1ecd8ceef02 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -28,7 +28,7 @@ */ #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 -#define CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 +#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 #define CONFIG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 99942bf36472..b38db2586a4f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -101,7 +101,7 @@ CFG_L2_CACHE CFG_LEGACY_BOOTCMD_ENV CFG_LOWPOWER_ADDR CFG_LOWPOWER_FLAG -CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY +CFG_LPC32XX_NAND_MLC_BUSY_DELAY CONFIG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH CONFIG_LPC32XX_NAND_MLC_RD_LOW From patchwork Sun Nov 20 13:31: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: 1706788 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=OhDQ8KRP; 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 4NFX1R3b4lz23mR for ; Mon, 21 Nov 2022 00:48:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CA328539D; Sun, 20 Nov 2022 14:36: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="OhDQ8KRP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A51B85340; Sun, 20 Nov 2022 14:35: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-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 42499852F8 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qk1-x72d.google.com with SMTP id k2so6488815qkk.7 for ; Sun, 20 Nov 2022 05:35:00 -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=Vs9rywd6tvvWJNb0kHfqoAxfyYFq/fWxJzOUHEKjAcw=; b=OhDQ8KRPSr5M7SzRQfkc7K47BCoNIY2Ge1h2dtqLwAWu32XKZgeMftNLuG6fUL/HlV YBH9Q8Q8gpBzcQFlJWT3hyqrptStZE9EZ6hWDrOD7iVHp82Azj2mCSS1tB5ZWeuACavB cCr8460SpbmtSXxEhfBqNgosk5m2dj4fk2WQk= 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=Vs9rywd6tvvWJNb0kHfqoAxfyYFq/fWxJzOUHEKjAcw=; b=yDFwyaiIlEjgqN9hgrKmRmMt50F1vAVYE9wDbfa5aWojm7vWW+8wEYlslCcpaflxw2 uWt32OAU97jPsjMv3nCdkmEFWfhhC5r4b0ko8tepUeQN7wkP3EY9oyQToknwfSrrThl+ qdn/40PfWlA226ayCXEL78wycKhVn8JAwJb0ZRsGzuAxehicUbXmHKLAJ81ZE8+/InBa yBdsCMpxjbNl6djJ/VNiG+CAfZHu8/Um1jNy8ixZnHZOuYoomjbFZoZ33MTau0M3OhfO C9b1ljwvlDuKCXgxF9uBaqDcQ7cMDusfPyb621FsFpt7x6wdZR09/TfFPBBrMFzLHeS3 2rTw== X-Gm-Message-State: ANoB5pnYgwOelu8e116yPH6f9FKnIyGkjNj+hrr1lH6xLTjp9b0m4yBx 0W7IyRMuH9GxTFc/kGIcK8HfFReTfnVqRQ== X-Google-Smtp-Source: AA0mqf68kNnks9hk8eiseSCFC63k+WWtevavNRuZl4MTP9EfaCZaOO9eKM+c/ys0bXXqSm7lLr9RAQ== X-Received: by 2002:a37:4043:0:b0:6ee:b095:a047 with SMTP id n64-20020a374043000000b006eeb095a047mr12850055qka.524.1668951299670; Sun, 20 Nov 2022 05:34:59 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 094/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG Date: Sun, 20 Nov 2022 08:31:25 -0500 Message-Id: <20221120133352.3055600-95-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index dd3f35def0fa..cd3831b5ffeb 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -143,7 +143,7 @@ static void lpc32xx_nand_init(void) writel( clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | + clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index a1ecd8ceef02..d345382545e5 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -29,7 +29,7 @@ #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 -#define CONFIG_LPC32XX_NAND_MLC_NAND_TA 18181818 +#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b38db2586a4f..bb3b1443ed5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -102,7 +102,7 @@ CFG_LEGACY_BOOTCMD_ENV CFG_LOWPOWER_ADDR CFG_LOWPOWER_FLAG CFG_LPC32XX_NAND_MLC_BUSY_DELAY -CONFIG_LPC32XX_NAND_MLC_NAND_TA +CFG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH CONFIG_LPC32XX_NAND_MLC_RD_LOW CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY From patchwork Sun Nov 20 13:31: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: 1706789 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/Do1GP; 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 4NFX1f5hpMz23mR for ; Mon, 21 Nov 2022 00:49:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F6C185381; Sun, 20 Nov 2022 14:36: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="SJ/Do1GP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B2DF0852BB; Sun, 20 Nov 2022 14:35: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-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 2B48985291 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qk1-x72b.google.com with SMTP id v8so6486248qkg.12 for ; Sun, 20 Nov 2022 05:35:00 -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=1G+KFgVMlx7spEUpbVZtCuzwuCmGvcuKCQitPjsBLuE=; b=SJ/Do1GPbfWRDhCJYKLXDJzPWny/B3oJH0eNTejBOv1/kSvVj/ahQ8hpnTQzDe0z80 GnnSPCIybVtpz9Ega9M6Ep3YVtwYXNlSst0pCsZNChG/gjNXlLo+Y2Fzwj+x/xriV7vl QedZFSbWD+7U3rNHQCHifQ5yTV30HW16GPUmk= 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=1G+KFgVMlx7spEUpbVZtCuzwuCmGvcuKCQitPjsBLuE=; b=PvO1cFhqhpLrlhOzuWb5xQdLpTngMxFG5eQehft2W1grF8khE2igdgaAYJnrgH65dU AiV6d9KT1nO01Lv2CzzT/q5gpDMCHuRdTaOq9F3PAdVqqImjo9rUpRO47CXUoqfzjE/Q qXrdN7gp60WIdleSuA2GLJcA/f8wKPELjdGd0EGbj5P+8OUsQFEnZPkxyfeaBiIvVlVL Qj1myPZBxwtTrnRG8KgeIhVmXozacejliSf0Pr4AJxt2Hc1c0JbmySggX8jwXnF39Q6o SJErNxlhDO8vtYiso4ZgdGgE/2n3QztV7pMhp0lug7QilnB0wLEvmpwFDYVQ3fvkwpS9 dfLQ== X-Gm-Message-State: ANoB5pmrlV8nOBLnjlOvbzfWCIrYKG75G7+9MwrJyB6/NshXobYpIkBN pKbVPsmHPj3Z5Wi4v7G9yzsxS03vRCXfeA== X-Google-Smtp-Source: AA0mqf5OTOXRdpa6HBYCWWH/NPdq1XQa0TaV6O9ZkqwAhKCQdrsm5gp0JunE+GBhobBnykzjvyOtOg== X-Received: by 2002:a37:64c8:0:b0:6f9:6c61:ea58 with SMTP id y191-20020a3764c8000000b006f96c61ea58mr13134739qkb.518.1668951300419; Sun, 20 Nov 2022 05:35:00 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 095/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG Date: Sun, 20 Nov 2022 08:31:26 -0500 Message-Id: <20221120133352.3055600-96-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index cd3831b5ffeb..388be16e2e71 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -144,7 +144,7 @@ static void lpc32xx_nand_init(void) clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | + clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index d345382545e5..3959051a4ca6 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -30,7 +30,7 @@ #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 #define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 -#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000 +#define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bb3b1443ed5c..eda174693c08 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -103,7 +103,7 @@ CFG_LOWPOWER_ADDR CFG_LOWPOWER_FLAG CFG_LPC32XX_NAND_MLC_BUSY_DELAY CFG_LPC32XX_NAND_MLC_NAND_TA -CONFIG_LPC32XX_NAND_MLC_RD_HIGH +CFG_LPC32XX_NAND_MLC_RD_HIGH CONFIG_LPC32XX_NAND_MLC_RD_LOW CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY CONFIG_LPC32XX_NAND_MLC_WR_HIGH From patchwork Sun Nov 20 13:31: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: 1706798 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=Tnhdpez0; 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 4NFX3T5n9hz23lt for ; Mon, 21 Nov 2022 00:50:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D892853BE; Sun, 20 Nov 2022 14:36: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=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="Tnhdpez0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A2A4E85352; Sun, 20 Nov 2022 14:35: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-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 B254E852E7 for ; Sun, 20 Nov 2022 14:35:01 +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-x735.google.com with SMTP id i9so6486726qki.10 for ; Sun, 20 Nov 2022 05:35:01 -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=yHg/JvMoj6+UvRR0Ml7fQAI2tpDqsRbs9Dquvy2+uFI=; b=Tnhdpez0JJdDKdsX8kGkHqICPy84xxaS6n1ATWax7uhiFIevh9SdwGwpXMalJW83GD juYsuNJ7j/NDu8Sf5Z5mq5ETrom++WOt0Nn7/yylBgMkij8FZ5itAxKNPNvm2qj+SPu4 ROkaQFAp520KrSK1y0dpcxVK09wFWolxi6E2g= 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=yHg/JvMoj6+UvRR0Ml7fQAI2tpDqsRbs9Dquvy2+uFI=; b=BP17jl8Pt66dZs9l0hx3tUHmdCa9Y8/4eOOtcXbSiiRD92dEsFtfhtHS4XkDpGrxcq LuNhAUhhpFZBtJm6ddAMwAoyQb3wY0sSX+R1KlQI2VbEgUXt7p70YJKgIBZT3m8VBDo+ GR2IQFCA24wVLQOjUYMGyXQ7Jj3VjIJK0JZfRMPmta72kqqyJ+BW/IhBr1XogIlBwGFQ 1YjRfDfAZ53ghp7Nv+H0j9sEB/HEhta0hdt8uIMdId9uHAqvObSY2R0I9yjU0dR5FFkM 8LfWuBpcLvc4t00oNi2P9IE6UiwXEAcg84A2MJTENr+SKXIR6VD5Ls+v8pWBMA/yGkJV dPvQ== X-Gm-Message-State: ANoB5plodgcvQAd1Iz5xr+Vx7iIymhWPLvlMOU8zuS9fCmZzfIqdU+vK rdu1yYyZCmsbCqShCGMXeOoCY9apYWXMxw== X-Google-Smtp-Source: AA0mqf6IK3M4/LghjRtXKpxc79YPzsfaiV5OBXbiIOuTpisFPKZa1nJowY+P0prKjz+Ae0LiwOjRRQ== X-Received: by 2002:a37:8846:0:b0:6e5:3b93:2e55 with SMTP id k67-20020a378846000000b006e53b932e55mr697100qkd.752.1668951301186; Sun, 20 Nov 2022 05:35:01 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 096/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG Date: Sun, 20 Nov 2022 08:31:27 -0500 Message-Id: <20221120133352.3055600-97-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index 388be16e2e71..e75ed1f2ae9c 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -145,7 +145,7 @@ static void lpc32xx_nand_init(void) clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | + clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), &lpc32xx_nand_mlc_registers->time_reg); diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 3959051a4ca6..1a4617c5c02b 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -31,7 +31,7 @@ #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 #define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 -#define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 +#define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index eda174693c08..4c28d978ce8a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -104,7 +104,7 @@ CFG_LOWPOWER_FLAG CFG_LPC32XX_NAND_MLC_BUSY_DELAY CFG_LPC32XX_NAND_MLC_NAND_TA CFG_LPC32XX_NAND_MLC_RD_HIGH -CONFIG_LPC32XX_NAND_MLC_RD_LOW +CFG_LPC32XX_NAND_MLC_RD_LOW CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY CONFIG_LPC32XX_NAND_MLC_WR_HIGH CONFIG_LPC32XX_NAND_MLC_WR_LOW From patchwork Sun Nov 20 13:31: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: 1706792 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=D1jLFUHV; 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 4NFX2F4X3kz23mR for ; Mon, 21 Nov 2022 00:49:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 30FFD853A3; Sun, 20 Nov 2022 14:36:19 +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="D1jLFUHV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB7C38534B; Sun, 20 Nov 2022 14:35: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-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 423ED852FF for ; Sun, 20 Nov 2022 14:35: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-qk1-x72b.google.com with SMTP id i9so6486732qki.10 for ; Sun, 20 Nov 2022 05:35: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=OjyYYy0+UcOtJfSlJfrwl7AyNU4SWwgSTk+4eQPNbMQ=; b=D1jLFUHVBUcp3mxV27yN3BnyjFYxu9tkVAxiC+ch1d8jorwMxxmBbBHA6pIAVzIoKJ pDO92CDq39E09jdQQ9WiI6ofHZTmEUU9x4AI67ZwQuVLUfB/rbhX9gC/0KVRGl7yRznF R9v8nOBkwZoq4rq5w+sAGXEASSWSm7EMcO7sA= 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=OjyYYy0+UcOtJfSlJfrwl7AyNU4SWwgSTk+4eQPNbMQ=; b=MJl2+W/LDZ8mkrzHrh9iiZ2Cwj2GtFfb/fCvtZsD0JIyCmEt67SArCKI/kDkKYg7B7 UtqIMB4CFWHv8V0OVwJwUMy8434SwkdzJhfwh6vwDY656cSP3nRSUVUcTLVJckZ7jkeh nWNKAaA06/14TL8HW8hQLYJ8x1gsrNbFffBT66TTqWhBVqfzhfGetWWTx2j780NM4bDh l2r50Roq/F6PBj09Ru0HY8gjKx4dpWjjgs9kG9pRknwuMlpYacjey3U3ZMi8/Ylf7RU5 +McEsWnEIZk5Q5X2yao/IeYeGofGpcmrVrmTdKP/toXC69JQOilhX/VUcXKK8n3cWJ63 ybMw== X-Gm-Message-State: ANoB5pmChdqjT73srEz+eNoMoNayZ6nyUF3lk2BBRlaEyspApdNNkOGs MNqoT7doFtsnRvSsAkg0O/PY1W1+m/0f4Q== X-Google-Smtp-Source: AA0mqf5BVVsZIEDahrgp48L3WH4LcyDX3725bAKDPPHKY10s5Brac0TfE5KTdUeOLEJJ9ArHnG5IDA== X-Received: by 2002:a37:ac05:0:b0:6fb:4ef0:3f38 with SMTP id e5-20020a37ac05000000b006fb4ef03f38mr12948164qkm.439.1668951301815; Sun, 20 Nov 2022 05:35:01 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 097/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG Date: Sun, 20 Nov 2022 08:31:28 -0500 Message-Id: <20221120133352.3055600-98-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index e75ed1f2ae9c..088fdb7981da 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -141,7 +141,7 @@ static void lpc32xx_nand_init(void) clk = get_hclk_clk_rate(); writel( - clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | + clkdiv(CFG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 1a4617c5c02b..34af515037fe 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -27,7 +27,7 @@ * NAND chip timings for FIXME: which one? */ -#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 +#define CFG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 #define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4c28d978ce8a..f0976db1a818 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -105,7 +105,7 @@ CFG_LPC32XX_NAND_MLC_BUSY_DELAY CFG_LPC32XX_NAND_MLC_NAND_TA CFG_LPC32XX_NAND_MLC_RD_HIGH CFG_LPC32XX_NAND_MLC_RD_LOW -CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY +CFG_LPC32XX_NAND_MLC_TCEA_DELAY CONFIG_LPC32XX_NAND_MLC_WR_HIGH CONFIG_LPC32XX_NAND_MLC_WR_LOW CONFIG_LPC32XX_NAND_SLC_RDR_CLKS From patchwork Sun Nov 20 13:31: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: 1706805 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=fI6PlUBU; 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 4NFX4z3BKCz23lt for ; Mon, 21 Nov 2022 00:52:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38BFB853D3; Sun, 20 Nov 2022 14:36: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="fI6PlUBU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C857285372; Sun, 20 Nov 2022 14:35:48 +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 11C4E852FC for ; Sun, 20 Nov 2022 14:35: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-qk1-x730.google.com with SMTP id x21so6534241qkj.0 for ; Sun, 20 Nov 2022 05:35: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=1d4Lbw6Sdqcmws0RX47Q8V4HyxMFIAAZJWjbpbkzwEE=; b=fI6PlUBUMQ8c3M16rSs+twlDt9nNnl8euRV9Sy5twnpppaHSdpIcgzl9YSJ0pSc1R5 46+SczE2DwSAFt6DIgZB+agQ4zw2QNoWRB5y31i4kHQCVL3zolgGE9LTG/FFLp7ZxRfT H9S+8whRtBT7KklymKBty+Bhqy5aeOfm0jFlA= 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=1d4Lbw6Sdqcmws0RX47Q8V4HyxMFIAAZJWjbpbkzwEE=; b=Kh8AT/LmSnRAHzjAO2BtQ04kvBNh8R8pJfffF4Y5iRQmHfGhsDqP8rJV8lF8ir/nUv dgvufi/+WK6A9jJKvlo8F8pkiTo1Ap40Iqw/ZQQ2N64wN9ZO1OhxY+AWnr9i+DFQmnbN p8VN/NTvIxHlEyhmQst9pLPkYl77oXRKAc4StPgTwdtDAD32+oyAoyReHi5sAQP8hFGy WAutRzqksEkhhy4BevNomiPn+xjHiKsVWLoAanG602pmYYtmFNcyOLGRdqQP+XC4Q4KX v08owco0Newbp908Ed/LZz9oqoTogYscz8QANWYBNGLVmGF+2fvGlx4fVsY+qReqAg4Z Vhpg== X-Gm-Message-State: ANoB5plh1mpK6/eSGkWL0upYLnrBGM+iZn9WtKoPhEwOXroB2kq0DWjP Cjb8CaTAmTiHh+3YM6LjeP0yIycdcp/82g== X-Google-Smtp-Source: AA0mqf5HlklVJ2aZU8AzSmMebLS4dXzfKwUVI1OGd3R0veoZmZG+uanKXcIkxkN+pEei21NEyBLQ6g== X-Received: by 2002:a05:620a:a1d:b0:6fa:3477:d62f with SMTP id i29-20020a05620a0a1d00b006fa3477d62fmr12764179qka.279.1668951302389; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 098/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG Date: Sun, 20 Nov 2022 08:31:29 -0500 Message-Id: <20221120133352.3055600-99-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index 088fdb7981da..31a9a22ba31f 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -146,7 +146,7 @@ static void lpc32xx_nand_init(void) clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | + clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), &lpc32xx_nand_mlc_registers->time_reg); } diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 34af515037fe..c67a0bb6e1a8 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -32,7 +32,7 @@ #define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545 -#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 +#define CFG_LPC32XX_NAND_MLC_WR_HIGH 40000000 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333 /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f0976db1a818..607056ade394 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -106,7 +106,7 @@ CFG_LPC32XX_NAND_MLC_NAND_TA CFG_LPC32XX_NAND_MLC_RD_HIGH CFG_LPC32XX_NAND_MLC_RD_LOW CFG_LPC32XX_NAND_MLC_TCEA_DELAY -CONFIG_LPC32XX_NAND_MLC_WR_HIGH +CFG_LPC32XX_NAND_MLC_WR_HIGH CONFIG_LPC32XX_NAND_MLC_WR_LOW CONFIG_LPC32XX_NAND_SLC_RDR_CLKS CONFIG_LPC32XX_NAND_SLC_RHOLD From patchwork Sun Nov 20 13:31: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: 1706799 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=qaLHRRLr; 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 4NFX3h5X04z23lt for ; Mon, 21 Nov 2022 00:50:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 572A8853AF; Sun, 20 Nov 2022 14:36: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="qaLHRRLr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2D4E985360; Sun, 20 Nov 2022 14:35: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-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 B051C852BF for ; Sun, 20 Nov 2022 14:35: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-qt1-x835.google.com with SMTP id s4so5904813qtx.6 for ; Sun, 20 Nov 2022 05:35: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=kCHViDqWwuR4ugH6DU0wrpL8vKAOKAiXEAU/PdEbpI8=; b=qaLHRRLr1E0nDiy/dNm5Mdv71apEI1toAX6oiqI/+ZYCozBc0Mptvy65hjbQyoSmo6 AT/CjfkAfpMZBML79oweM7ZAp+VjuTsuQsyMjknr/x7n1LgsA3GKvLwk0Xup5R4TFBNJ MRwVWVKAcxG3qUQDRQTHiVY7XHy3zUvVrTCWE= 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=kCHViDqWwuR4ugH6DU0wrpL8vKAOKAiXEAU/PdEbpI8=; b=OEX7/snj1En1Tx+ydvnrurIq/AbQKxaTEgikrZ26o/wb1yRSY3EuUY2N4FL6c7X5+j zZ2hmHqC84e1eJslDUuXQy7fpJBrdmTlJogwDdGoPo8pr+e32kQvLIblJEJi4FoAFVtS W+51wX5gRf1jb7OjSkAACqmqp6NFVRq3p7ZdzbaIDc6o8GIIKGhaJf3z8mpggSYWt6tn 3pSzAT99AoYnO4vMoLHx3+3WxuUv3nDmoM9ynFT5WDKcHDGWWhk7uFXfU+/mlL4lcyEx 29irkqkz/6f3ELg0mcQva9RyxqxvFoU0N7VegV+Ds6hYNp5Q7Dcx8f9qq8LPHXfS4mjs KMvQ== X-Gm-Message-State: ANoB5plERioSZ4oqzeFjJuOTNf7pMce+uWoE+cqy0R7+xamYv96AN1+I aoD+wf8PXccHNPLa5DlxhE6rSTnliXXHCA== X-Google-Smtp-Source: AA0mqf6t2v/nZSjhwrTSa88QWVrMBD9pJ6auoogTLYR1s8X9obhXNLYuE6Wc7K+plsu3VrCL3Xei1Q== X-Received: by 2002:ac8:74d2:0:b0:3a5:26e0:ffc3 with SMTP id j18-20020ac874d2000000b003a526e0ffc3mr14089872qtr.391.1668951303116; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 099/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG Date: Sun, 20 Nov 2022 08:31:30 -0500 Message-Id: <20221120133352.3055600-100-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index 31a9a22ba31f..285411776096 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -147,7 +147,7 @@ static void lpc32xx_nand_init(void) clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), + clkdiv(CFG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), &lpc32xx_nand_mlc_registers->time_reg); } diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index c67a0bb6e1a8..f1a7853a80e6 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -33,7 +33,7 @@ #define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545 #define CFG_LPC32XX_NAND_MLC_WR_HIGH 40000000 -#define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333 +#define CFG_LPC32XX_NAND_MLC_WR_LOW 83333333 /* * NAND diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 607056ade394..6eed044d853c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -107,7 +107,7 @@ CFG_LPC32XX_NAND_MLC_RD_HIGH CFG_LPC32XX_NAND_MLC_RD_LOW CFG_LPC32XX_NAND_MLC_TCEA_DELAY CFG_LPC32XX_NAND_MLC_WR_HIGH -CONFIG_LPC32XX_NAND_MLC_WR_LOW +CFG_LPC32XX_NAND_MLC_WR_LOW CONFIG_LPC32XX_NAND_SLC_RDR_CLKS CONFIG_LPC32XX_NAND_SLC_RHOLD CONFIG_LPC32XX_NAND_SLC_RSETUP From patchwork Sun Nov 20 13:31: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: 1706794 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=FdTfjpfU; 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 4NFX2f5zmCz23mR for ; Mon, 21 Nov 2022 00:50:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9F73853A8; Sun, 20 Nov 2022 14:36: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="FdTfjpfU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5BABF8534F; Sun, 20 Nov 2022 14:35:36 +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 59587852E3 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qk1-x72f.google.com with SMTP id z17so6489445qki.11 for ; Sun, 20 Nov 2022 05:35: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=1bsxjDXGez1P83jSV3ptGAZRiSrg/Yf/KJ/EeVtXDzk=; b=FdTfjpfUUwkTca4uPFz+cCN8xTU47bQIjC6jc5ZzIp2WzaVDI5QGme40GNYS8R4yvT S7CA+f8W2RRqG07inDQYzAunFZ+W9is2BL0PDv8R5HNbcvZHIxy/ITMnsTdtvSaRuoCX sPx2x8ScZnN460iH2J1zveCRZ8kGA7Eywtz4Q= 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=1bsxjDXGez1P83jSV3ptGAZRiSrg/Yf/KJ/EeVtXDzk=; b=3NBrHJ7JIN8DXOOZw3ffeCpmZU5Qh+FyEa0Rl1/dpIjTVNZeO9QOiCmnYu6FbAio4X yjlwf7P+ZdkZvwdltB7+NpujLFYGJeAwi/DQyfa9f7DfqO3e1CSu13iC9+clx3BTGrzl JdbKhq1zBa83XbdOyfpdMl+Kg4X4A1KOQK4pO0gOm6hGtIUd3x6l0hNS1qIEeBH0dDaq anPBzGHfOxZEB70J6sCNiDBAc/pH0su0AtplMGmwjPKZbcpJC9cVVHiX1/AOkzdIBBkB Nl+ieR/Bh5YfG6s9h+SPXT5IIHnywFqEp/6BHhSVMK/U5MwZ60ufNa/t/gB0/KsC5qpI MpEA== X-Gm-Message-State: ANoB5pkd+/Kjs4FUuwPaGlLN3an02Q8v8Nx9PUOUj5M9REgH1mA5/cem XOhOvVA4Qj+/uj84K/Rry60Qcy01Q8XG3A== X-Google-Smtp-Source: AA0mqf6H6lGDt3x71m/ETjBOE7LVLd98UHm9zw+qe8piDa+5gFGL/r00QE8ROthphg84n0Q52Urgiw== X-Received: by 2002:a05:620a:530c:b0:6fa:6e0c:ab79 with SMTP id oo12-20020a05620a530c00b006fa6e0cab79mr13149028qkn.74.1668951303843; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:03 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 100/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG Date: Sun, 20 Nov 2022 08:31:31 -0500 Message-Id: <20221120133352.3055600-101-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 f4f1b22f5e21..0f12201aa0e3 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -130,7 +130,7 @@ static void lpc32xx_nand_init(void) TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | - TAC_R_RDY(CONFIG_LPC32XX_NAND_SLC_RDR_CLKS) | + TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) | TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP), diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index ab10101f20a9..e17896841355 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -45,7 +45,7 @@ #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 -#define CONFIG_LPC32XX_NAND_SLC_RDR_CLKS 14 +#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CONFIG_LPC32XX_NAND_SLC_RHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6eed044d853c..8c567e45590c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -108,7 +108,7 @@ CFG_LPC32XX_NAND_MLC_RD_LOW CFG_LPC32XX_NAND_MLC_TCEA_DELAY CFG_LPC32XX_NAND_MLC_WR_HIGH CFG_LPC32XX_NAND_MLC_WR_LOW -CONFIG_LPC32XX_NAND_SLC_RDR_CLKS +CFG_LPC32XX_NAND_SLC_RDR_CLKS CONFIG_LPC32XX_NAND_SLC_RHOLD CONFIG_LPC32XX_NAND_SLC_RSETUP CONFIG_LPC32XX_NAND_SLC_RWIDTH From patchwork Sun Nov 20 13:31: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: 1706795 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=lr+LIjBR; 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 4NFX2t23Jsz23lt for ; Mon, 21 Nov 2022 00:50:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9C09853AC; Sun, 20 Nov 2022 14:36: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="lr+LIjBR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 65C3E852EF; Sun, 20 Nov 2022 14:35:36 +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-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (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 B75D7852FE for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qt1-x82b.google.com with SMTP id jr19so5903082qtb.7 for ; Sun, 20 Nov 2022 05:35: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=wx9NByubJVKFI6CnBVv1dw9CiuAep3v4SJfJGv+yKVM=; b=lr+LIjBR/Mo8dHDVIP1gNB+P7KU0hnMPC5s4Xq08VNj1K1PGwCsSw3xunW9JK82mFH JHSQMMYqy6BAU9WxlnQ2FLEyccHWyeQNzFZLoyXo3PLtAZ/aalA3BZDfjgjonCoCYCtf YWylJOWllv3cSs8dnXP54YxGRkY23m1Mnvh+I= 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=wx9NByubJVKFI6CnBVv1dw9CiuAep3v4SJfJGv+yKVM=; b=axy0mFV0Cjay1wD2778XYq4dgbqmug5gGBqMq/Rj5W5V+cQtqRhyhJMFtgUYBwF8x3 U3X7EKlf9ccOGfy+0jVPwpXtmdpSfP5nRy55PmrOGfix2lAyYpfIKIfwC/WzDKgPZ8Ot kS2F+kM+bLso/8uUO18l3sL/M+WloxZJleFeszyQzY6H+1XuPm0it4k4StUzRN+XSf+z +9+vnCPkAmmbAbsHwI5t73q+IdqxuGp5aRlM0DnciBXZiWV6OAsn6DXXC5szwUuWpa3n DyhEa5gAe7DVL2Q0ktW2kM82mdgPevW1qlhGasxzIvSAgsF1+AIwKgyUxmQmS4BGZnkS VdIg== X-Gm-Message-State: ANoB5plXwMjpVis3a2X/Sf1ZsoI9p1FwI39Bkn/udoLJshKzhumUlcHd gx4BNw1eEez7ED6MpYQ1S/pw99HuXT7DAg== X-Google-Smtp-Source: AA0mqf5V6hPAJDZR1Xc5tNSMnU7PU7xKzq6KWuzKyBDLMJZPDM6trzjcF5tsNNzHL7sOSjLKB+Zj4g== X-Received: by 2002:ac8:66d6:0:b0:3a5:f871:572c with SMTP id m22-20020ac866d6000000b003a5f871572cmr14163446qtp.230.1668951304460; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 101/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG Date: Sun, 20 Nov 2022 08:31:32 -0500 Message-Id: <20221120133352.3055600-102-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 0f12201aa0e3..1fdc80989fab 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -132,7 +132,7 @@ static void lpc32xx_nand_init(void) TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | - TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) | + TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP), &lpc32xx_nand_slc_regs->tac); } diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index e17896841355..0b815ded7322 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -47,7 +47,7 @@ #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 -#define CONFIG_LPC32XX_NAND_SLC_RHOLD 200000000 +#define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000 /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8c567e45590c..7ced36635799 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -109,7 +109,7 @@ CFG_LPC32XX_NAND_MLC_TCEA_DELAY CFG_LPC32XX_NAND_MLC_WR_HIGH CFG_LPC32XX_NAND_MLC_WR_LOW CFG_LPC32XX_NAND_SLC_RDR_CLKS -CONFIG_LPC32XX_NAND_SLC_RHOLD +CFG_LPC32XX_NAND_SLC_RHOLD CONFIG_LPC32XX_NAND_SLC_RSETUP CONFIG_LPC32XX_NAND_SLC_RWIDTH CONFIG_LPC32XX_NAND_SLC_WDR_CLKS From patchwork Sun Nov 20 13:31: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: 1706796 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=iTcR3mnr; 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 4NFX346THjz23lt for ; Mon, 21 Nov 2022 00:50:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE682853B1; Sun, 20 Nov 2022 14:36: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="iTcR3mnr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 508648534F; Sun, 20 Nov 2022 14:35: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-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 BFC4285300 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qt1-x833.google.com with SMTP id e15so5911489qts.1 for ; Sun, 20 Nov 2022 05:35: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=ye9tl0dMv8d25DbTbdc73/IeGQVKNROvM4yTWrwnliA=; b=iTcR3mnrLud0sr8mFgS7ibEs+2/B9Ymb6F3ukun+RFmJP1IFa2hkVrYsjN54wm8nZ8 fT+zpPnRv/UQf6/CIYeckUni8ywWk9kXOonKS0Ft3K3VWuL1YaeB8WJOLxx5d5e6MHZz +qPpHgAIFrVpZWV3jkJSfoagEy6FlKzlk0HoE= 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=ye9tl0dMv8d25DbTbdc73/IeGQVKNROvM4yTWrwnliA=; b=8R7uCD96wailUMSdRvGNnk9yJ2X6mZfzFLrrzyFoU4p2XPBYM4h1snuMw4fnWYEDd8 NEZWftY3kk4M4ic7AFDXsXysnfXRjtrPnSrpt2Vd2VZ1XwfyH99+FsNkGe4LSym2+WyW fih7LAuO4WQE/L33dZT/dNDTo3LQ+VRg9WLE1maa16n1K5s9LvA5QzMbmOMrjYWdulJo G4O6ds7ee+V8dLrB7NuBWYxFNvGh+7p/hfMilMdUZZ6UoRl3O6jR4ku7WIO/XtIv9ZKo yVHal4h6Sfl7koiqGyu23PW6+SLICuva2TrzK3zEsABgwtfQRJs9QvOdjvMB1rrb4x4Y vyTw== X-Gm-Message-State: ANoB5pnddIQ1s7V6MF1VXzu4H7GAFCmb4Yde6JOwhzFHCo5fDkoAG9df qKUEazUXKa2aku6L24N2N4nYcO94rYSEqg== X-Google-Smtp-Source: AA0mqf7AEvCFJgXeNyy45Dc0bT7CEJHzX/47skSSDOD9QmWMYEnMseMLp9sHaW0mbVQ/T2db0MzZOg== X-Received: by 2002:ac8:5506:0:b0:3a2:9e2f:2ead with SMTP id j6-20020ac85506000000b003a29e2f2eadmr13788756qtq.555.1668951305210; Sun, 20 Nov 2022 05:35:05 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 102/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG Date: Sun, 20 Nov 2022 08:31:33 -0500 Message-Id: <20221120133352.3055600-103-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 1fdc80989fab..71e8286d1c8f 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -133,7 +133,7 @@ static void lpc32xx_nand_init(void) TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | - TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP), + TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP), &lpc32xx_nand_slc_regs->tac); } diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 0b815ded7322..72cf031e05da 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -48,7 +48,7 @@ #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 -#define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000 +#define CFG_LPC32XX_NAND_SLC_RSETUP 50000000 /* * USB diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced36635799..fc20b83d66d0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -110,7 +110,7 @@ CFG_LPC32XX_NAND_MLC_WR_HIGH CFG_LPC32XX_NAND_MLC_WR_LOW CFG_LPC32XX_NAND_SLC_RDR_CLKS CFG_LPC32XX_NAND_SLC_RHOLD -CONFIG_LPC32XX_NAND_SLC_RSETUP +CFG_LPC32XX_NAND_SLC_RSETUP CONFIG_LPC32XX_NAND_SLC_RWIDTH CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD From patchwork Sun Nov 20 13:31: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: 1706801 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=ocb0oyjd; 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 4NFX47016gz23lt for ; Mon, 21 Nov 2022 00:51:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1423285215; Sun, 20 Nov 2022 14:36: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="ocb0oyjd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E0788536A; Sun, 20 Nov 2022 14:35: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-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 6FBF985303 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qk1-x735.google.com with SMTP id i9so6486792qki.10 for ; Sun, 20 Nov 2022 05:35: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=jjOU5V1YsO6hGZkP7SW1jiVCn9fuq7j5z+siZW71Y4g=; b=ocb0oyjdiltFa/eFU4zZ+hb2DH1FHpKfKeQLQealwfCxuboKijOb6Bobz5IP+AWtVl yZhdhgyEwgMWqrGrofm24qSawXQphL0OJfVOv/0Zf53G+jw/nSHSMA47yUqGARxSCAo4 LnuVVNrdzaHSI7DM+wmf49BQtlicKucmVBEVI= 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=jjOU5V1YsO6hGZkP7SW1jiVCn9fuq7j5z+siZW71Y4g=; b=IkfT6IDjnQ+ekKQPWds331KF55syXBdMoOYmr86vMOQUdir+flUb0ZmSziA3JnhJTF TGA6Q71swl9gNs9ge27kh2RSXnuNJa3fHiAFGXuoSnHIsNReQCPqldmCIfL7qS2S9mq8 DkacdUUbUl/ZmiJW8NHP5bsl5di8Jy3K+SnjdCRQO44T8mgkg98rjc9afc8qF0N0CBWE skK7smzV8TUPsqqny671blsUPPJvcGQRTEe0zv+uitJm4SlR6MUtV+DGkd9SzsXImJkv Zwy/VFn72l92Q/Syz8G3cWGMRyi+g4b+56VZITcVugqW3QZmBPT6ltyl6Cje5yPGQrvb fuWA== X-Gm-Message-State: ANoB5pnfiQ88L6dH9UGc52W9G4xtsPY6p92Gnd6jsUdYqO4UHB5D7Ntd okaQMxrmD4Ym8cCuWxyx6f7NUO/F4e3aiw== X-Google-Smtp-Source: AA0mqf7eSq9IwVDS/u0jX2uoFymimdq6biuZX5bOO5Jx+/6VShEpL/siXahvPXZx6pt7d/vOiEUEmw== X-Received: by 2002:a37:9ad7:0:b0:6ee:aeae:6891 with SMTP id c206-20020a379ad7000000b006eeaeae6891mr12772606qke.717.1668951305902; Sun, 20 Nov 2022 05:35:05 -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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:05 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 103/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG Date: Sun, 20 Nov 2022 08:31:34 -0500 Message-Id: <20221120133352.3055600-104-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 71e8286d1c8f..fb1fb2d7dccf 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -131,7 +131,7 @@ static void lpc32xx_nand_init(void) TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | - TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | + TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP), &lpc32xx_nand_slc_regs->tac); diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 72cf031e05da..5ba8c1bb20e2 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -46,7 +46,7 @@ #define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 -#define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 +#define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 #define CFG_LPC32XX_NAND_SLC_RSETUP 50000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fc20b83d66d0..fc42b693e3e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -111,7 +111,7 @@ CFG_LPC32XX_NAND_MLC_WR_LOW CFG_LPC32XX_NAND_SLC_RDR_CLKS CFG_LPC32XX_NAND_SLC_RHOLD CFG_LPC32XX_NAND_SLC_RSETUP -CONFIG_LPC32XX_NAND_SLC_RWIDTH +CFG_LPC32XX_NAND_SLC_RWIDTH CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP From patchwork Sun Nov 20 13:31: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: 1706803 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=X0Nsce6k; 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 4NFX4Z52jbz23lt for ; Mon, 21 Nov 2022 00:51:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8A9D853CF; Sun, 20 Nov 2022 14:36: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="X0Nsce6k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6ED8C8536A; Sun, 20 Nov 2022 14:35: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-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 B9CE4852F6 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qt1-x829.google.com with SMTP id c15so5898876qtw.8 for ; Sun, 20 Nov 2022 05:35:07 -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=fcVwD7GRbwqV3RJPJjefj5O10Evzs8hdJM5lY73khDA=; b=X0Nsce6kncBstOQJLz12i0Dl47zTh7bSzu8CgWuD7sPCfC4im/ZEXwJXTUPSzjxUDJ XWuMYEtkSAG0AFAyBWDQ5xIX/sRQeAJ0SfrLZ7t9Q1YzIvAFJcAurEG68p0/8bvbsbkj aDDjJctH6Qk2i3UUMXhHj/cacQFka2EI3J1es= 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=fcVwD7GRbwqV3RJPJjefj5O10Evzs8hdJM5lY73khDA=; b=7Sf3Sw/AbTGOHY+W808J6wB53ifs9BkL839/XhPsdEoE7p+EdUoRzzSPYyEXULNdr7 THiyAibCgd8h/fG33vhcgUerUK4gDa0pkxciIyEZNXE0SbQjvyosIPppmS1p/UI2C41D Bq8O+mFMqDMDiP/Koq+uMngHG11hItB4DeiFzV/idP6AFEbFzyTV9mq8GzXOqtUOdXJF fwmHrDCvXgmpOzdSPOXZqWaDRFiXhRpY8lf7T1KUV13RJT+YMVedcXPHuMRGjDmRderH TKfdHqYwGzajq8YSzI5js3GmqvVKNIYQtmfOuZUZw8kbJg713PgtsvUFwmhjo23Ll1Vo kxfg== X-Gm-Message-State: ANoB5pnZ1S7Nls8E/KXoz5Cr+0q/ssa5MQRK+qBbdpAHiCRxl+nB5hQC MsKNKdrFppiV0keZIaIZdZB8P9AbYs+6ng== X-Google-Smtp-Source: AA0mqf6cchDoE46kFwC9NDBTBiCOKW09akd/TJQrYOcvkGsUpsFt5d/p20UTSSh1Kt/ymcH63PNWpg== X-Received: by 2002:a05:622a:5a8d:b0:35b:62a:6532 with SMTP id fz13-20020a05622a5a8d00b0035b062a6532mr3767623qtb.156.1668951306453; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 104/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG Date: Sun, 20 Nov 2022 08:31:35 -0500 Message-Id: <20221120133352.3055600-105-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 fb1fb2d7dccf..7de5c840ed9b 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void) &lpc32xx_nand_slc_regs->icr); /* Configure NAND flash timings */ - writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) | + writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 5ba8c1bb20e2..dc16ed84c52c 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -41,7 +41,7 @@ /* * NAND chip timings */ -#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS 14 +#define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fc42b693e3e1..4f5de41ab95d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -112,7 +112,7 @@ CFG_LPC32XX_NAND_SLC_RDR_CLKS CFG_LPC32XX_NAND_SLC_RHOLD CFG_LPC32XX_NAND_SLC_RSETUP CFG_LPC32XX_NAND_SLC_RWIDTH -CONFIG_LPC32XX_NAND_SLC_WDR_CLKS +CFG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH From patchwork Sun Nov 20 13:31: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: 1706802 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=e1OJIJ1J; 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 4NFX4L2lc3z23lt for ; Mon, 21 Nov 2022 00:51:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA877853CB; Sun, 20 Nov 2022 14:36: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="e1OJIJ1J"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6331C8536C; Sun, 20 Nov 2022 14:35: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-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 B9E1D85306 for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qk1-x72b.google.com with SMTP id v8so6486347qkg.12 for ; Sun, 20 Nov 2022 05:35:07 -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=HUzvlF/Btg0ego0V/FqepRCLz9Dzb/nDafgpV4effgc=; b=e1OJIJ1Jo/nKjPAikTy2rLb98o3SRUyHZPt5+KNi22YzspVwxOEns/Tz+DTD0uZTmn 3P962P+621WADhmpdV0CKaQevA519hCxEa1C/0yHPqChfcVUXk6jU0EfGuPullt5fBwT jOJfeGYewOJEfjY5KHhIk0CRaDjuwHw8i7kmI= 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=HUzvlF/Btg0ego0V/FqepRCLz9Dzb/nDafgpV4effgc=; b=HfQZhUywFv+H1+NmCUAu4+LqbvNDQhX3fIaiterKbEy69Jl6PNwqZUn4QDbwnJysvh 7QyALxT0xx3SkTILoeNxljnvvxKY5RlJxRpjco+ZQ3PSIH//UeNWavlYnYIrD3GBecnU QRCOqEtg0jK9DuRNjXuAd/wWYiBB+pyLEB0GhNdZ+hrNhD+5R+/c35AjIV21TahQhI0m xFwyS5F7vJcmqs3QNd3TBhH7/QgwUFYPf2hxw791WJ9AvLyrgIPICYKCXmWzMl3CKoor WgE/id9c3BzXXH1EfBUupB3TEms2G/L7x/Og+NlEDQbjRV9hJc4/C1HYFjb6gcQ3NIw+ 7bzA== X-Gm-Message-State: ANoB5pkgbZBjZOW+FoJzWjhLGTuB4KBclDYKSCEOpmsSeOk41gOmd5gV poGQ4JrxMAFSppwDXoIBWc1HHFNO1lR58Q== X-Google-Smtp-Source: AA0mqf61hbjrYCMRvj4v/ZRt6VxyIwkAD98FgUQK3/MhMoK5+z993RXzXfiXuJvhCibCp0jEETOIIQ== X-Received: by 2002:a05:620a:3706:b0:6e2:5472:345e with SMTP id de6-20020a05620a370600b006e25472345emr13005704qkb.391.1668951307150; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 105/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG Date: Sun, 20 Nov 2022 08:31:36 -0500 Message-Id: <20221120133352.3055600-106-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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 7de5c840ed9b..dee8fd24b94b 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -128,7 +128,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_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | + TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index dc16ed84c52c..24312c848e2d 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -43,7 +43,7 @@ */ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 -#define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 +#define CFG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4f5de41ab95d..9609ea606fd3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -113,7 +113,7 @@ CFG_LPC32XX_NAND_SLC_RHOLD CFG_LPC32XX_NAND_SLC_RSETUP CFG_LPC32XX_NAND_SLC_RWIDTH CFG_LPC32XX_NAND_SLC_WDR_CLKS -CONFIG_LPC32XX_NAND_SLC_WHOLD +CFG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH CONFIG_MACB_SEARCH_PHY From patchwork Sun Nov 20 13:31: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: 1706800 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=TK6ffWgc; 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 4NFX3v3zjgz23lt for ; Mon, 21 Nov 2022 00:51:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2919F853B5; Sun, 20 Nov 2022 14:36: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="TK6ffWgc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5A6485344; Sun, 20 Nov 2022 14:35: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-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 2EDE08530C for ; Sun, 20 Nov 2022 14:35: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=trini@konsulko.com Received: by mail-qt1-x832.google.com with SMTP id h21so5913159qtu.2 for ; Sun, 20 Nov 2022 05:35:09 -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=TK6ffWgcwoHKoOVvXHFRjKAx2/DHoP5a7By8Jn/PkOO2jTsAi86kYNE5q8tJjTcRgZ CiJH5kJvkG3sBaJo5EmLZT2Mq0KBYOMR2gdtRHfhDxanBR2IZ0ekPvwwvPqvPx6dCx9D YI100+Vt4992F1+dThpbRjJBOkl3nWbMpwBxs= 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=agfSA8pEp8yyFEjLf96Nxr2WmXRsGmOq9l87wBKIGHnwGVTg41OsRVvq4lhJpmc8Gt XymBUOklgf3254x95MAVODi45bqrdY//gF5sCi9LFzNkM34rX2uDe4XhUGQqHhNkg/vm 0rFcqDjQ64IjTXB0Jchq3kcHi/QUk3RUrNF1AwNkb1Mb3eP61iY9JNyJrUHt9Gv4WJf0 BwkJ7J7Rp2SAhdQvJCKaB/QKFTabCaSq4BSEDZWfswDjAh+rMsks4HSMmkylm9MplD8F 6K3Z1yLUn6P7iHbiCxhFJbPgWj0P3jCkMQ85sDQ4PevCuGnW/018KdXgpYXdoaRMAG5J sdOg== X-Gm-Message-State: ANoB5plSfzC63DJzDJe3eb4pZw47XiGvMpbLN3EDgrQbgFFTxC2rFKpk X8IDn1Dg2WfnYe2/guHQFq3TyMvcbvST3w== X-Google-Smtp-Source: AA0mqf7/eNnDBzOtrrfm0/Sh9gNjPADEQfrl7Gd3d5gZ8Tm92srxhTftmXmVjIhhq4096Z8xqER0/g== X-Received: by 2002:a05:622a:4c08:b0:3a5:1bd9:fc1 with SMTP id ey8-20020a05622a4c0800b003a51bd90fc1mr14005713qtb.315.1668951307914; Sun, 20 Nov 2022 05:35: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.35.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:35:07 -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:31:37 -0500 Message-Id: <20221120133352.3055600-107-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <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