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 139FAC4321E for ; Sun, 4 Dec 2022 15:08:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 662A88544D; Sun, 4 Dec 2022 16:06: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="j1tJPg4P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EC0985319; Sun, 4 Dec 2022 16:06:12 +0100 (CET) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 592EF85304 for ; Sun, 4 Dec 2022 16:06: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-ed1-x52a.google.com with SMTP id d14so7635237edj.11 for ; Sun, 04 Dec 2022 07:06: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=DoxFYtTuDfT9cEBUexN7WtaktMzj7XTn1maQsQedx4c=; b=j1tJPg4PcMSWMCK0me4XmOwZqEBw4Wpg6Tmd03jUBqVbaV2TvV8NLriI0TvbdEuV/3 TWkPzzAtdL3Fpc5+DBBGpIcBxwh8dCvwWvXm7HB0OKyTLgEswrIm1Yv4he59paPqbZ9Z v8a8v9tPI0ffa8VcpGjSw2+ho+2yNGsgWBxm4= 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=DoxFYtTuDfT9cEBUexN7WtaktMzj7XTn1maQsQedx4c=; b=CVJlICWupYiXvlfo3VsbpXhHqn0yRxjnmURyjZ3aGyqafbPIHFb2sOoO8AC57EAVPP npD4S8DTENCu/5oO+YSlSkmCvi3l9AtPgZUiSQoqfLlLIJSNMZmbK9SpVm9Of5M8j4mz niH5eKeoqJ+NphxbXBdhf1A/xIPTP+TSCuJ7caG9799klD8BzsCz/3PIjXRkahf1F3OD Y4pdYr3UW2l7O3/GVXXibTH2k1j42nk2IfXLAyEOkdyjOJTBCf7uSfOY8u3o5CORVdiJ ikuAKFM7CpWUg0jmNgTNwThbXyQao57Xst5RyhqBhmwJu1nTm9P2FnUYVVvH9WcyFuNl K8Ng== X-Gm-Message-State: ANoB5pn8JOrIIbIRvbMi1gXkHGcV+vKaVYnw6lQt0lZovm5myaUlc3LS 1bKQu2uQHdjyD8pRwPsKZF7aq9hvBRrdNYZa X-Google-Smtp-Source: AA0mqf7x4G62w1Uzh7brvbfdrDIJ3oGlVUwXEIJfW+lDzUpeKQfd7sWI8tzAV7spfkgMF7g9bxnZnQ== X-Received: by 2002:a05:6402:4507:b0:467:205b:723d with SMTP id ez7-20020a056402450700b00467205b723dmr12712195edb.69.1670166369855; Sun, 04 Dec 2022 07:06:09 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.06.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 012/149] global: Migrate CONFIG_BOARDDIR to CFG Date: Sun, 4 Dec 2022 10:03:37 -0500 Message-Id: <20221204150554.4165941-12-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-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 Perform a simple rename of CONFIG_BOARDDIR to CFG_BOARDDIR Signed-off-by: Tom Rini --- arch/sh/cpu/u-boot.lds | 2 +- doc/README.kwbimage | 2 +- scripts/Makefile.autoconf | 2 +- 3 files changed, 3 insertions(+), 3 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 \; \ -- 2.25.1