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 A18E0C4167D for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA7B28541B; Sun, 20 Nov 2022 15:09: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="IanEOtpG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11423852FB; Sun, 20 Nov 2022 15:09:23 +0100 (CET) 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 79443852F7 for ; Sun, 20 Nov 2022 15:09: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-x833.google.com with SMTP id cg5so5910975qtb.12 for ; Sun, 20 Nov 2022 06:09: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=lgUyCEhRU1lf7pCr3plbm+SPN0JSovN6TvvcaldGCSE=; b=IanEOtpGATw78ERTCAMUdG+QUFYSihWlA2FoAO2BtoKjSV19kb3t8Uw8DpoyUJS+2c rkpsOt2xtnmuujscDDKzQZX84dwhs+zpYllqgAdO6VvOQ+1Zt+2nC2b5vp12jJ1B6TEi WskO27TnSVFsIzrMaG+YrET5fqC3pd1RhLjm8= 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=lgUyCEhRU1lf7pCr3plbm+SPN0JSovN6TvvcaldGCSE=; b=10XdiF5IhN9f1bVEiFR8pgJOtTilPOOs8EsaVLtjnTvvtlc5qCsU/CyMrbpKlGKK/V D/lJpGP5WmC12bfr5Z8dqUCfEu9FjyoomBGuMFalq0Q/2iHzTNcKetbo7ehJRAr1TqNU uek2vhwJOlec7hPtP+CVtmeL5/UnO+bfTTWYVi4RfCn0Av22y9OWgwgrFFd4GfTJFhMt mQcfLy7+mimO8UbpJkfr71aKqAxqcuWZt4CTde7YyunrSt2N6adZHfK2XrJxmKIOVvYt IRpKH/37avYA6fU+DFeVe9thUFbQ9cnPUwFP4SNAWJCjkQzn+fBckTdIXI5Yn6Bqb4xV 10YQ== X-Gm-Message-State: ANoB5pkPb1t0O3MzNTRfyK9CfzPCVAqlM1HH9cqkJJYmjhfzqcGs7lNF cnhxZUVwXLGvkpDs/MxBvtCNX9WhKbDeHA== X-Google-Smtp-Source: AA0mqf6OJUk58OaXQzN2u4O4h6Vhrd2q/uiUnJ5bwoYR2Dedrt7CAVkXuvlatdRDG6EYMkAQyrQp0A== X-Received: by 2002:a05:622a:4886:b0:35b:af0c:6c9 with SMTP id fc6-20020a05622a488600b0035baf0c06c9mr4942456qtb.71.1668953343228; Sun, 20 Nov 2022 06:09: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 bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.09.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 162/241] global: Migrate CONFIG_RAMDISK_ADDR to CFG Date: Sun, 20 Nov 2022 09:07:52 -0500 Message-Id: <20221120140829.3057894-53-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-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 --- cmd/qfw.c | 4 ++-- doc/usage/cmd/qfw.rst | 2 +- include/configs/x86-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/qfw.c b/cmd/qfw.c index 95ddc4b79ec7..0c49c6074e16 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag, env = env_get("ramdiskaddr"); initrd_addr = env ? (void *)hextoul(env, NULL) : -#ifdef CONFIG_RAMDISK_ADDR - (void *)CONFIG_RAMDISK_ADDR; +#ifdef CFG_RAMDISK_ADDR + (void *)CFG_RAMDISK_ADDR; #else NULL; #endif diff --git a/doc/usage/cmd/qfw.rst b/doc/usage/cmd/qfw.rst index b3704b92d6d9..cc0e27c27790 100644 --- a/doc/usage/cmd/qfw.rst +++ b/doc/usage/cmd/qfw.rst @@ -31,7 +31,7 @@ kernel_addr initrd_addr address to which the file specified by the -initrd parameter of QEMU shall be loaded. Defaults to environment variable *ramdiskaddr* and further to - the value of *CONFIG_RAMDISK_ADDR*. + the value of *CFG_RAMDISK_ADDR*. Examples -------- diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index df75deedf583..e8bd2e507041 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -43,7 +43,7 @@ /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CFG_HOSTNAME "x86" -#define CONFIG_RAMDISK_ADDR 0x4000000 +#define CFG_RAMDISK_ADDR 0x4000000 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) #define CFG_OTHBOOTARGS "othbootargs=\0" #else diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index df6a95c2572b..e706fba5e8fd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -171,7 +171,7 @@ CFG_PSRAM_SCFG CFG_QBMAN_CLK_DIV CFG_RAMBOOT_SPIFLASH CFG_RAMBOOT_TEXT_BASE -CONFIG_RAMDISK_ADDR +CFG_RAMDISK_ADDR CONFIG_RD_LVL CONFIG_RESET_VECTOR_ADDRESS CONFIG_ROCKCHIP_SDHCI_MAX_FREQ -- 2.25.1