From patchwork Fri Sep 10 06:19:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristian Amlie X-Patchwork-Id: 1526376 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=northern.tech header.i=@northern.tech header.a=rsa-sha256 header.s=google header.b=RajE4DCd; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H5Qhb3r2Gz9sW8 for ; Fri, 10 Sep 2021 16:19:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 37D39812B6; Fri, 10 Sep 2021 08:19:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=northern.tech Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=northern.tech header.i=@northern.tech header.b="RajE4DCd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50E63835BC; Fri, 10 Sep 2021 08:19:42 +0200 (CEST) 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-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) (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 296F683261 for ; Fri, 10 Sep 2021 08:19:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=northern.tech Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kristian.amlie@northern.tech Received: by mail-lf1-x129.google.com with SMTP id k4so1884601lfj.7 for ; Thu, 09 Sep 2021 23:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=northern.tech; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F+xTNbybckSXIxGThzxSqJ72wKZcDxpCH1oDprSCUqs=; b=RajE4DCdy0DD5X+oFbNr2yyKEj316DwH+YBDWbQxczk5wPtKjdhxkafhHPIa+H/nQh A7LCIq3u4LWNvktwi52QJq4H182WaZhJsbwGln49krV7CS1Um1h5CPJFAnYnkj76e//p nalyXtJhjdC44N5R/okh7hcWiRhtRr1A3NUUtkj/mtcugCsoDfGOu3ejHm7z5/L35AZP thZTN8FG9/9bjdaVup9q/8iRIWyCxKlYp+D9VKBYOe77wzlSk2PLce0oKxsgcFfrBUiW gNQjpjtM/6wVs0No+IopnHVzfrHb2yB+EmL9PTDDxxsoLIman0YhdhCTRXmzq96ulA41 kNKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F+xTNbybckSXIxGThzxSqJ72wKZcDxpCH1oDprSCUqs=; b=d+OqLA1mWIXJ1E3CpWwQq5qJyr45AJmERMIcw4a1yLNpn6yy4ElF3nucRvUGv6h4el u+u5iTmZithqUa6Cw4keAoJHrbf05NjIUh4HSIYLpDlG76j/8vdNOZolZ4KeL0kNrbTh JY6Bj49FuIYRiR3RUalgouyroSO94+pPC92xt1V4szSeT9iLyZB+WgrqE3PoCXwYAM+m c1XS07gvNn2FOFIGB9m705jEjhv9AhQN1qpIs0OuXVmVXjJ0EvevJjvlAorKAIigGcfU eWZEvpUyX3EvHi9bWq1/mFg1ZDzW/Oy8J3MKNAffaNqRFAUDxrYnIyzPlEFKiNP4JEx8 eI7Q== X-Gm-Message-State: AOAM531EI9Lhb+mf7TmTrSiuiV0kVclDBtOmjBjdv06/4gJFjFsqGFXZ t98IGD0L36oVhjD7qupHMkSqfQ== X-Google-Smtp-Source: ABdhPJzX5ny78P95VlmMadL32FtW3uPjwDEgGy6DkuN7jzLfTkbjSL7Rucxu+HXN5q/Hm8+3fTRQxw== X-Received: by 2002:a05:6512:3742:: with SMTP id a2mr2790013lfs.604.1631254777493; Thu, 09 Sep 2021 23:19:37 -0700 (PDT) Received: from kristian-Mender-T460s.mender.io (195-159-235-214.customer.powertech.no. [195.159.235.214]) by smtp.googlemail.com with ESMTPSA id u24sm446329ljg.64.2021.09.09.23.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 23:19:37 -0700 (PDT) From: Kristian Amlie To: Tom Rini Cc: u-boot@lists.denx.de, Liviu Dudau Subject: [PATCH 1/1] Avoid polluting CONFIG_ namespace with board specific define. Date: Fri, 10 Sep 2021 08:19:19 +0200 Message-Id: <20210910061919.522-2-kristian.amlie@northern.tech> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210910061919.522-1-kristian.amlie@northern.tech> References: <20210908135744.GD12964@bill-the-cat> <20210910061919.522-1-kristian.amlie@northern.tech> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Kristian Amlie Reviewed-by: Tom Rini --- include/configs/vexpress_ca9x4.h | 2 +- include/configs/vexpress_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 8157a5868d..ba3f9797a5 100644 --- a/include/configs/vexpress_ca9x4.h +++ b/include/configs/vexpress_ca9x4.h @@ -10,7 +10,7 @@ #ifndef __VEXPRESS_CA9X4_H #define __VEXPRESS_CA9X4_H -#define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP +#define VEXPRESS_ORIGINAL_MEMORY_MAP #include "vexpress_common.h" #endif /* VEXPRESS_CA9X4_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 99a5dd064a..f3f021f050 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -15,7 +15,7 @@ * Definitions copied from linux kernel: * arch/arm/mach-vexpress/include/mach/motherboard.h */ -#ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP +#ifdef VEXPRESS_ORIGINAL_MEMORY_MAP /* CS register bases for the original memory map. */ #define V2M_PA_CS0 0x40000000 #define V2M_PA_CS1 0x44000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d86f35856f..8afdee6499 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3441,7 +3441,6 @@ CONFIG_U_BOOT_HDR_SIZE CONFIG_VAL CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM -CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP CONFIG_VIDEO_BCM2835 CONFIG_VIDEO_BMP_LOGO CONFIG_VIDEO_DA8XX