Message ID | 20221204151420.56851-3-trini@konsulko.com |
---|---|
State | Accepted |
Commit | a2c164cbb46c6400d93d08e634a1987bfce0e79f |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=OkHhv/6c; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQ9T55VQqz23np for <incoming@patchwork.ozlabs.org>; Mon, 5 Dec 2022 02:24:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D665585300; Sun, 4 Dec 2022 16:14:35 +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="OkHhv/6c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EF25D85306; Sun, 4 Dec 2022 16:14:30 +0100 (CET) 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-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 5E8E585306 for <u-boot@lists.denx.de>; Sun, 4 Dec 2022 16:14:26 +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-ej1-x62d.google.com with SMTP id ml11so22331742ejb.6 for <u-boot@lists.denx.de>; Sun, 04 Dec 2022 07:14:26 -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=LF5D4OdRD9pxcpmYx1mHFUKJsi42HDjX0ZWcb9LUaJU=; b=OkHhv/6cnppAtbqOx85py5uZJsi++xYVQmCJUsXH+HePCshyW79GwmdhykBB10hQy0 vYvhfj9YVfYmE2LiDesOuqFTx3h4I/B0pSfkzE803R4BmxoN1cX+jV5SkvfH+QLFegAj CEXz/8NDIXq3Sx1nOly8brPzDI4sHuuGUldu8= 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=LF5D4OdRD9pxcpmYx1mHFUKJsi42HDjX0ZWcb9LUaJU=; b=JvC2j1TWwwl7VfHchctW0przm9UaJw5YEAHG3ky7eazpS0JWBKDGRD4A0BUREQBmnS OJCYVjyFRnShSsC8gn9vBol4GdtZWAN76R3tfGdjeRAdVnvT08zoDvnlcCeHaFcXozQA TcIvBELmB9L5h091EnO58VzaaTktjp460o8kpgjHDynFhDKWz2z+6gGozHaqC7ppLO2/ 77r3KBdf0BJbm7eb8SfZkzq8PKXMANyZv1TAQ3BzhKROyG2VfftHelXp9XhVcCT9bsN3 M9NqXvTi3QuFO+yw4J1jVdSOJA2uxi7Uj2ZjmS9HrcxojOc48il0ZBWH6zs1uTlZ40SI IoJw== X-Gm-Message-State: ANoB5pnvaAp9+/UuJEFJr8yPazMkUAZOExC/Qj8/aAmeYvAYXatHovOz q5J7Puz1NI9h6pfe66NIFYVwa/t3E7+J9MLc X-Google-Smtp-Source: AA0mqf7qenHW+XyhD6l1qvONPwHRxBI1PTe81HcQ1gWgcEjfNFfiM1IQ/xYujuGomHmyAYuwlaZjTw== X-Received: by 2002:a17:906:4804:b0:7a8:3ecb:bd62 with SMTP id w4-20020a170906480400b007a83ecbbd62mr67296498ejq.721.1670166865768; Sun, 04 Dec 2022 07:14:25 -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 b21-20020aa7c915000000b00461816beef9sm5174405edt.14.2022.12.04.07.14.24 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:14:25 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PATCH 093/149] global: Migrate CONFIG_OTHBOOTARGS to CFG Date: Sun, 4 Dec 2022 10:13:24 -0500 Message-Id: <20221204151420.56851-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204151420.56851-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204151420.56851-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 65a1e63e00e6..5d461e8d0c64 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -27,9 +27,9 @@ /* Default environment */ #define CONFIG_RAMDISK_ADDR 0x4000000 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB) -#define CONFIG_OTHBOOTARGS "othbootargs=\0" +#define CFG_OTHBOOTARGS "othbootargs=\0" #else -#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" +#define CFG_OTHBOOTARGS "othbootargs=acpi=off\0" #endif #if defined(CONFIG_DISTRO_DEFAULTS) @@ -49,7 +49,7 @@ "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ - CONFIG_OTHBOOTARGS \ + CFG_OTHBOOTARGS \ "scriptaddr=0x7000000\0" \ "kernel_addr_r=0x1000000\0" \ "ramdisk_addr_r=0x4000000\0" \
Perform a simple rename of CONFIG_OTHBOOTARGS to CFG_OTHBOOTARGS Signed-off-by: Tom Rini <trini@konsulko.com> --- include/configs/x86-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)