From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C295C433FE for ; Sun, 20 Nov 2022 13:34:14 +0000 (UTC) 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) 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 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.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 -- 2.25.1