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 D0D97C433FE for ; Sun, 20 Nov 2022 13:45:02 +0000 (UTC) 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) 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 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 --- 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 -- 2.25.1