From patchwork Mon Jan 30 15:15:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734193 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PT+ulf58; 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 4P5BsN6FFcz1yhq for ; Tue, 31 Jan 2023 02:28:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F4A7859CE; Mon, 30 Jan 2023 16:23:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="PT+ulf58"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 965FA859A2; Mon, 30 Jan 2023 16:18:37 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 247038583C for ; Mon, 30 Jan 2023 16:17:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id i17so5067096ils.11 for ; Mon, 30 Jan 2023 07:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=e+76jZxRTMvkgfOZJifznKg0bHD89S4meHa7xyqw1kk=; b=PT+ulf58QPvT2wQPZacJavnyaKD2PyRGHQAKxjNQTVXKLbFWP/iyrvMgLRIBIOalO2 dEy5pgV4j4D4dz9/YyvDTm93Wo7Mm0AqcKpRu/uf0beDPtBCi43g4KkBCywUiTZATjbA GypIpRqCWLWGWhkHbW0C4DGP0WtaWiw1//jHc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e+76jZxRTMvkgfOZJifznKg0bHD89S4meHa7xyqw1kk=; b=VfRzeOXoi09Q2k9x3ydBlBkuA98H9M903JTL1wwZSGSy2zQNWoRNW/32yBimvR75qt 47l0wIYTdJAjZ7hgSQ0G2yAhpW2Mwsa1+YPCYu0uwZyD0A+mgfZc+vDyxYjqKOc9oqCA FIn44Rru8JZVsoUp9fsBUSYzhbEstDN0Swb/8WJDt2bLSNj27PdIZFVu6iaAm9Dd254J vNP7OytKtEDk8g5KQ+pSy0obHm2L0fsMzm3/dWeM35h5E2A/OOSkKIqYo4j2f3IU12Tz j2LuRWysNfGGIXi6qqbg7WMDEansVxQowilZgdbJMmd9C3BvLsjjBI/hsD2uVRbzsxPZ Cejw== X-Gm-Message-State: AO0yUKUGfwsWRou8vJHOpiYtJV6GCAw74+z/pD5PLDAvM5AMRJLC/1l0 /XfDxt7ij1qIWJajoc+Z7+ylxkT6VfS1HjcO X-Google-Smtp-Source: AK7set+fjj+RX7QoVI7F/IvQGQ2PefiObxV73Q/Dv1V59aQzs6d3G3lyw2iIAzHvYaWxuqNkQuFzyQ== X-Received: by 2002:a05:6e02:1e06:b0:310:d05b:3a1 with SMTP id g6-20020a056e021e0600b00310d05b03a1mr10440420ila.20.1675091827003; Mon, 30 Jan 2023 07:17:07 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng Subject: [PATCH 101/171] Correct SPL uses of I8259_PIC Date: Mon, 30 Jan 2023 08:15:02 -0700 Message-Id: <20230130151612.212732-102-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog MIME-Version: 1.0 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 This converts 4 usages of this option to the non-SPL form, since there is no SPL_I8259_PIC defined in Kconfig Signed-off-by: Simon Glass --- arch/x86/lib/interrupts.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index ff52959ed28..33d6eb49d75 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -66,7 +66,7 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg) irq_handlers[irq].arg = arg; irq_handlers[irq].count = 0; - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) unmask_irq(irq); if (status) @@ -86,7 +86,7 @@ void irq_free_handler(int irq) status = disable_interrupts(); - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) mask_irq(irq); irq_handlers[irq].handler = NULL; @@ -108,13 +108,13 @@ void do_irq(int hw_irq) } if (irq_handlers[irq].handler) { - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) mask_irq(irq); irq_handlers[irq].handler(irq_handlers[irq].arg); irq_handlers[irq].count++; - if (CONFIG_IS_ENABLED(I8259_PIC)) { + if (IS_ENABLED(CONFIG_I8259_PIC)) { unmask_irq(irq); specific_eoi(irq); } From patchwork Mon Jan 30 15:15:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734189 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=fuLPbIHE; 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 4P5BrV6fYcz1yhq for ; Tue, 31 Jan 2023 02:27:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D7FFB85A02; Mon, 30 Jan 2023 16:23:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="fuLPbIHE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40E0485972; Mon, 30 Jan 2023 16:17:49 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 3AD848594D for ; Mon, 30 Jan 2023 16:17:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id g16so5236865ilr.1 for ; Mon, 30 Jan 2023 07:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Qp+e45Kyw/z3F9YzhrvJtj5DbsUecuHtW7jhl3wpqlc=; b=fuLPbIHEp9lu5VoNVLuH2YqhMwNjVYOILFgNPQD/OwCej81IP7Z2l0CY+wbkgfiNkY inE3HqC7sHZvtbrGQOIGOQDB8vNBh5CmcGo19UXvOGNhUAaWHHYHIuPNxbpvA5QPoBGG GCKrVl1FkeO4GrZJCCDBRqnWyx1KktIgHzZWk= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qp+e45Kyw/z3F9YzhrvJtj5DbsUecuHtW7jhl3wpqlc=; b=dgUeppGLUkO5x/ncgqnynqys15ikxWfcY9ybx0OLyG6MdEEdt/hK/hC7fwFx2JbVk1 Cnh29oXcePhz0ZMq34+019sIshqwGOVtIML+JBvoY7OnRIMhT7E3ucSskyQXj8SnCIpV Isq7HodB5pdEIgCvRcUbivti5uFbauP/i/A+WWKm16A3SIQuWMKp87ZfOUXz3fF06n58 EdqABM3GA+5vvrzt/TjwFgB4kEbw5ykHZiBh4rLWW/nWqmNhi95DGf6ajMIRWYNc02BF oHFw1m2BtsGnUe5AzrIsi9ZxazlUsaGznWYJRw/kXj8XQ32W9uEqwxe9LMUc6TaoOy99 j+xA== X-Gm-Message-State: AO0yUKV0W8799uawr2VT3NJWOgM54Ux1L4v+Lv04ydkm2jFBrQdOzFMl IxQvQRCQwa28u5heMo86/w1QWITbFOQ8rJYs X-Google-Smtp-Source: AK7set/p3TiZhArnL8vw/ApExn7M8XmcgW/7MraSjRmLXf1BC4/suVbxQYVKNZRqP1wvtmxVf5iSFA== X-Received: by 2002:a92:ca4f:0:b0:30e:ed6d:ef37 with SMTP id q15-20020a92ca4f000000b0030eed6def37mr7740158ilo.6.1675091828110; Mon, 30 Jan 2023 07:17:08 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , "NXP i.MX U-Boot Team" , Stefano Babic Subject: [PATCH 102/171] Correct SPL uses of IMX8M Date: Mon, 30 Jan 2023 08:15:03 -0700 Message-Id: <20230130151612.212732-103-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_IMX8M defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-imx/imx_bootaux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 1a3e538c4fa..433c1f80cee 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -15,7 +15,7 @@ #include /* Just to avoid build error */ -#if CONFIG_IS_ENABLED(IMX8M) +#if IS_ENABLED(CONFIG_IMX8M) #define SRC_M4C_NON_SCLR_RST_MASK BIT(0) #define SRC_M4_ENABLE_MASK BIT(0) #define SRC_M4_REG_OFFSET 0 @@ -128,7 +128,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) flush_dcache_all(); /* Enable M4 */ - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0, 0, 0, 0, NULL); } else { clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET, @@ -143,7 +143,7 @@ int arch_auxiliary_core_check_up(u32 core_id) struct arm_smccc_res res; unsigned int val; - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0, 0, 0, 0, &res); return res.a0; } From patchwork Mon Jan 30 15:15:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734255 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=N2/J+ddD; 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 4P5CSg0lRNz1yhq for ; Tue, 31 Jan 2023 02:55:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B55958597C; Mon, 30 Jan 2023 16:55:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="N2/J+ddD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23C918584A; Mon, 30 Jan 2023 16:17:54 +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,DKIMWL_WL_HIGH, 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-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 8A9508595C for ; Mon, 30 Jan 2023 16:17:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id w13so1140772ilv.3 for ; Mon, 30 Jan 2023 07:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BG6y1Xofc15BwKMMk0acb1XuQe3tDUL727uyc8219Qw=; b=N2/J+ddDyerz7Vi0CLmmW0DOIGudSciYv9IimHmfOjffm7Osgsaz0UXtueGTsSM/zq zSCSugORRWppBJPkxJzBiHDf12a6RoK6E7Jw+b7qiJiEkelWhbUINPmjWMbIeb7hymNR E5eR9STrLybIqc9Vcm6DzGfnKV6Ha9uQ2RpUk= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BG6y1Xofc15BwKMMk0acb1XuQe3tDUL727uyc8219Qw=; b=VWHWIdiRNpAM5qeEonXH0Z7VXqxHhWgG/8V2Gf5IRZgvVUnlkKkgXFyrFpUdC5ndrK 2wb7QvQ4p+GphxM+PyDTeFWtNXKgt+hK7DVEpnx+fd88Agok1ukDhrgtnqZixOqoYXj/ VAwjZOipvCkgqMfqLsvEVmV+wylTGqmJZ1QheiihwQoVwE2XdkFWvZimzc+g5drj8aZc RypOYrtgLRxqWcwfnsL5eTACnEjexIufkG/YHzivCQbqKA2S8WVGsFZpo2eIJUIRur4v oRzf//3jm5kBYA4qnQP4TUbHklOXHLdxQMpvxUFZ4L2nIkcflWXFw4PB28H6JuutyNt2 Z+Qw== X-Gm-Message-State: AO0yUKUiaiayxlgQxUSjdG3vy+cQHWlpAaKtKIx0uTJKBfIeCfTyXm+y +cdPkwaROixVk/5ggDtMTc9sh7xL9VEJlA1D X-Google-Smtp-Source: AK7set9BL63r6LEKrYCnFvuYpic997vXFPbS7lNK1pMECZXYt8w9onEgKTpCZekDc2M8AngxNQONuQ== X-Received: by 2002:a05:6e02:12e4:b0:310:e81a:f55c with SMTP id l4-20020a056e0212e400b00310e81af55cmr5456321iln.4.1675091828889; Mon, 30 Jan 2023 07:17:08 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Adam Ford Subject: [PATCH 103/171] Correct SPL use of IMX8MN_BEACON_2GB_LPDDR Date: Mon, 30 Jan 2023 08:15:04 -0700 Message-Id: <20230130151612.212732-104-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_IMX8MN_BEACON_2GB_LPDDR defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Adam Ford --- include/configs/imx8mn_beacon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index bb3dfe3fa0d..1880d0311e4 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -80,7 +80,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 -#if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR) +#if IS_ENABLED(CONFIG_IMX8MN_BEACON_2GB_LPDDR) #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ #else #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ From patchwork Mon Jan 30 15:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734190 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Y/h0dWNg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5Brk0qSYz1yhq for ; Tue, 31 Jan 2023 02:27:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 58C9B85A0E; Mon, 30 Jan 2023 16:23:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Y/h0dWNg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD0B985988; Mon, 30 Jan 2023 16:18:24 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 E449C85955 for ; Mon, 30 Jan 2023 16:17:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id g16so5236915ilr.1 for ; Mon, 30 Jan 2023 07:17:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gyI73WX9Y2Rj8P19Ll6gFtlsctkLlr+u/We3St5tK0c=; b=Y/h0dWNgqL0Wn/VEyDr36Ah4T087IS6KlA37ocnz9wh5F+1tDzeH5JfGO+qEkUdNsE r0sAUwzDXnsuu+dBfCK3qk4MsS9g9wabmJYAh2GcbSzfca/0fNkDF7GXLlgjuJHzfr1D kihZ6ujZp/v+8wYtrWZ/n/f6Jm9KRdNA1IS3A= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gyI73WX9Y2Rj8P19Ll6gFtlsctkLlr+u/We3St5tK0c=; b=ucZZseWqcjCQWb/EA/7JNCnfK/PeixcRwhX10QPMPjpOX2UnhwKH1hMjmiLCM4XGt9 KfJvWergA8IcXnNrDiYK2cTyJpTDbesGkV/VfYkrJAqQLnE118hcJNmQX3+wIrhhbPEX srTzvVtYLBLAACi6afywvP6IrlUzCtQJqIingsUyJLL7oftXZnGj/F86pB6IiIJiqAer TptsI5VqDfNxkpdVKL2w33RQvI1tRpV00s7JBrg/9g5rP6RE+7xLC5g1xs5F3vVp1JEO HgAJ/ZjyhNG8r90DtS4mZoTVkSTs12jMBVOQ1LqCU1UrF7ZyTgXVfDqY3Q/xEAw7kcdr m+CA== X-Gm-Message-State: AO0yUKUoR2Y3CdxfS8EvHAFN7sGoLi4LLQ2lOzmBcMA9Np6DxlTs2u99 NAjW1APSxuA0c3HKLAmI0BcBs8XqabwA48+r X-Google-Smtp-Source: AK7set//53RYp1rAOGB352D/K1rr/AFfqkq9/Mau81016789E1sovgY29D4Z5aw4mkPw8AmAmcFKJQ== X-Received: by 2002:a05:6e02:1b05:b0:311:e5:5d15 with SMTP id i5-20020a056e021b0500b0031100e55d15mr1510442ilv.10.1675091829876; Mon, 30 Jan 2023 07:17:09 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Adam Ford , Fabio Estevam , Heiko Schocher , Joe Hershberger , Marek Vasut , "NXP i.MX U-Boot Team" , Patrice Chotard , Ramon Fried , Stefano Babic Subject: [PATCH 104/171] Correct SPL uses of IMX_MODULE_FUSE Date: Mon, 30 Jan 2023 08:15:05 -0700 Message-Id: <20230130151612.212732-105-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 6 usages of this option to the non-SPL form, since there is no SPL_IMX_MODULE_FUSE defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/include/asm/mach-imx/module_fuse.h | 2 +- drivers/i2c/mxc_i2c.c | 4 ++-- drivers/net/fec_mxc.c | 2 +- drivers/usb/host/ehci-mx6.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h index a46fc3f1f8e..6c92cb40d6d 100644 --- a/arch/arm/include/asm/mach-imx/module_fuse.h +++ b/arch/arm/include/asm/mach-imx/module_fuse.h @@ -74,7 +74,7 @@ struct fuse_entry_desc { u32 status; }; -#if !CONFIG_IS_ENABLED(IMX_MODULE_FUSE) +#if !IS_ENABLED(CONFIG_IMX_MODULE_FUSE) static inline u32 check_module_fused(enum fuse_module_type module) { return 0; diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 9a1599dcd91..86b9fb57c83 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -744,7 +744,7 @@ void bus_i2c_init(int index, int speed, int unused, return; } - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (i2c_fused((ulong)mxc_i2c_buses[index].base)) { printf("SoC fuse indicates I2C@0x%lx is unavailable.\n", (ulong)mxc_i2c_buses[index].base); @@ -878,7 +878,7 @@ static int mxc_i2c_probe(struct udevice *bus) if (addr == FDT_ADDR_T_NONE) return -EINVAL; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (i2c_fused((ulong)addr)) { printf("SoC fuse indicates I2C@0x%lx is unavailable.\n", (ulong)addr); diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 006d27051eb..5cc35958c49 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1125,7 +1125,7 @@ static int fecmxc_probe(struct udevice *dev) uint32_t start; int ret; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (enet_fused((ulong)priv->eth)) { printf("SoC fuse indicates Ethernet@0x%lx is unavailable.\n", (ulong)priv->eth); return -ENODEV; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 0a12db614ff..91633f013a5 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -360,7 +360,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, if (index > 3) return -EINVAL; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (usb_fused((ulong)ehci)) { printf("SoC fuse indicates USB@0x%lx is unavailable.\n", (ulong)ehci); @@ -641,7 +641,7 @@ static int ehci_usb_probe(struct udevice *dev) struct ehci_hcor *hcor; int ret; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (usb_fused((ulong)ehci)) { printf("SoC fuse indicates USB@0x%lx is unavailable.\n", (ulong)ehci); From patchwork Mon Jan 30 15:15:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734245 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Wj+8WK05; 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 4P5C8X0YYqz1yhq for ; Tue, 31 Jan 2023 02:41:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DF5F85AB7; Mon, 30 Jan 2023 16:28:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Wj+8WK05"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48A87859C1; Mon, 30 Jan 2023 16:25:48 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 D88308595F for ; Mon, 30 Jan 2023 16:17:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id l7so3349874ilf.0 for ; Mon, 30 Jan 2023 07:17:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/x+W0UHDC1D976lscbfebG5HyCzjyobBZ4Uwlv85xc4=; b=Wj+8WK05Xr+YqKUgo9h27XYo5f8XIWX2mwr71F4ypQ2dNgMjGVfHB3vptnGUlEc3YU Gqlyf+BPJK14YnQjJTmo5gLEHKuOPiaRrtV2+LpkGIZT3b9XB0n7Mra2IJfUEOScaYBN DrpHYYDG6RUNuOs/PSWpK05MB+Xgn5IAoBlLo= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/x+W0UHDC1D976lscbfebG5HyCzjyobBZ4Uwlv85xc4=; b=oEUW4REfBrW6UB13PbyiZ9KV2WMrvs8dT9e6QpDpfGr+nohPg8fdYdIO2u7OReEPuT Gr0a0ghEYT2aZ+eqlt2DeaX1wd7nq5gus7tiR6VdzqqAzD2Ecfa9Jcs0bnLhcOgBM8LZ UfGaIz9ofY+jiXii8Ls+XGGxTUr3LxtVrgEDHh9XM0OaZasfRMe3xHmIGG5/8rAdZGWF Z1I8smi/Q6tw14itLj8IiYmE6smPybVkSAl+aV0sUWrZb0b8gv/TCfvIcOUAi7A/pODP PddYTskO9yvruzrJBUGZw0vH9u8+W+LFpMA25VpVSSJin4LZEkGwh2nMztKLMT/02tUO OJRw== X-Gm-Message-State: AO0yUKUxdyf8oVhQRVdWvWzxH+dIVW7TJ+f02fzCCx0mxhnoM1ob0KUN Wq1lpGl7t18F0KoW/Nrt2jbSUd00SLSWJLqk X-Google-Smtp-Source: AK7set8vklQ3EmlvZVfzDk7a7DANUO7aIRpjmN3WFUQxRl3hLQ8Ti3VvWI+vJqUX9wBIZnxzm6cDIA== X-Received: by 2002:a05:6e02:1b0e:b0:310:ba29:cd25 with SMTP id i14-20020a056e021b0e00b00310ba29cd25mr8761877ilv.0.1675091830921; Mon, 30 Jan 2023 07:17:10 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , Gaurav Jain , "NXP i.MX U-Boot Team" , Stefano Babic , Sven Schwermer , Ye Li Subject: [PATCH 105/171] Correct SPL uses of IMX_RDC Date: Mon, 30 Jan 2023 08:15:06 -0700 Message-Id: <20230130151612.212732-106-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_IMX_RDC defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-imx/mx7/soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 02af0d568f2..550e392550e 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -68,7 +68,7 @@ U_BOOT_DRVINFO(imx7_thermal) = { }; #endif -#if CONFIG_IS_ENABLED(IMX_RDC) +#if IS_ENABLED(CONFIG_IMX_RDC) /* * In current design, if any peripheral was assigned to both A7 and M4, * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter @@ -316,7 +316,7 @@ int arch_cpu_init(void) init_cpu_basic(); -#if CONFIG_IS_ENABLED(IMX_RDC) +#if IS_ENABLED(CONFIG_IMX_RDC) isolate_resource(); #endif From patchwork Mon Jan 30 15:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734250 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DhXUYx6P; 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 4P5CBx5vgcz1yhq for ; Tue, 31 Jan 2023 02:43:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 982E2859FE; Mon, 30 Jan 2023 16:37:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="DhXUYx6P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ADEF9859B7; Mon, 30 Jan 2023 16:35:28 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 58AA085969 for ; Mon, 30 Jan 2023 16:17:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id g16so5236963ilr.1 for ; Mon, 30 Jan 2023 07:17:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HuvkaBhwGgStjR3x+CLFpK/Ua1S2P2bgOCu+CuLg6q8=; b=DhXUYx6PFrVjgxkZx0UhIsi8mIk86iMm7bJpqw1P1CaPqessG5mCSWS1r/9ZOqleP5 r74wx8Mj++ZWKTfit8sCUGo3HO8cZALsk85MThDGc0v76fuSgjBDY/pXySCwW4YZCahw DxaM8Q5rQOJTaYlEjsAmXJzVfd8Qx73W/+8ns= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HuvkaBhwGgStjR3x+CLFpK/Ua1S2P2bgOCu+CuLg6q8=; b=AdEBYttseIZ4cvXxPyMcp8IyEEM1Wvmzf1T7blKLfj2bAhJsXU/Dx5iYsR6fnaZ2/n fL/2WVwuLyt5bLfLSRihluIMuwxL/lYINZR498f16pyFulDVFk832cVtgfoEdTyGjrrc tkHLoXU21daQDhUL3rhnAc9ngSUJDiMlBdw9dKJ7mvS5PZEuo0Vn4yxmWFkLOewbSxO+ VpHaC0BFapf7tAjvXJl+SZnAr1qSwyJPGvJgBKuk+0T9NTOwbyo6KnHaSnuU/FGpOqGn uJQaX1cWe70CNQXTPFw/66Q2Blk0jdbeyt5cxkOy5K57tj+Xo/ghEEtFq+sxUF7NdRRt 09lg== X-Gm-Message-State: AO0yUKVTuEpLH5+1Q0Jrla7CkoRLRFbaHyZx7KzC08rHobZyf3B6BQAW ONXaQIM2at0uiDSdq7vu57OwW8K79pYcGqG4 X-Google-Smtp-Source: AK7set+yXCT38yYqLSsKk5iem9iz3wHEhr/Hg+b36zHgZLT0oIQ+uWMMzalbooCQwOw5tX/9+n12Pg== X-Received: by 2002:a05:6e02:12c6:b0:310:fa45:ac8c with SMTP id i6-20020a056e0212c600b00310fa45ac8cmr2439502ilm.32.1675091832050; Mon, 30 Jan 2023 07:17:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alexey Brodkin , Angelo Dureghello , Ashok Reddy Soma , Bin Meng , Eugeniy Paltsev , Huan Wang , Leo , Michal Simek , Oleksandr Suvorov , Ovidiu Panait , =?utf-8?q?Pali_Roh=C3=A1r?= , Rick Chen , Stefan Roese , Wolfgang Denk , uboot-snps-arc@synopsys.com Subject: [PATCH 106/171] Correct SPL uses of LMB Date: Mon, 30 Jan 2023 08:15:07 -0700 Message-Id: <20230130151612.212732-107-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 9 usages of this option to the non-SPL form, since there is no SPL_LMB defined in Kconfig Signed-off-by: Simon Glass --- arch/arc/lib/bootm.c | 2 +- arch/arm/lib/bootm.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 2 +- arch/powerpc/lib/bootm.c | 2 +- arch/riscv/lib/bootm.c | 2 +- arch/sandbox/lib/bootm.c | 2 +- arch/x86/lib/bootm.c | 2 +- boot/image-board.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 07b2c1540d0..2dd003445f8 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -29,7 +29,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index e414ef82673..c56285738a2 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images) { char *commandline = env_get("bootargs"); - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { panic("FDT creation failed!"); diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index c1c9bdceb50..f18bed235d4 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -60,7 +60,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[], } set_clocks_in_mhz(kbd); - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) goto error; diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 4a5421497e5..930384f4015 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -73,7 +73,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index ef1d5af8908..7a305456346 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images) if (ret) return ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index f5f8b4c7333..276677a5e2f 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -64,7 +64,7 @@ static void announce_and_cleanup(int fake) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 28f4a746fb6..dc8b8e46cb4 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 04e475bdc24..873e2bc176f 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -78,7 +78,7 @@ static int boot_prep_linux(struct bootm_headers *images) size_t len; int ret; - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { puts("FDT creation failed! hanging..."); diff --git a/boot/image-board.c b/boot/image-board.c index e5d71a3d541..25b60ec30b3 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -927,7 +927,7 @@ int image_setup_linux(struct bootm_headers *images) int ret; /* This function cannot be called without lmb support */ - if (!CONFIG_IS_ENABLED(LMB)) + if (!IS_ENABLED(CONFIG_LMB)) return -EFAULT; if (CONFIG_IS_ENABLED(OF_LIBFDT)) boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); From patchwork Mon Jan 30 15:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734256 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=dXkq4R2q; 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 4P5CT61qjgz1yhq for ; Tue, 31 Jan 2023 02:55:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A00AE85633; Mon, 30 Jan 2023 16:55:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="dXkq4R2q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B85FA85808; Mon, 30 Jan 2023 16:55:21 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 12A6C844AE for ; Mon, 30 Jan 2023 16:17:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id u7so3697721ilg.4 for ; Mon, 30 Jan 2023 07:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H8DjhzBGvpivWCX9C7RZJIiQbMvzkYc3tQEWOAXx9Gk=; b=dXkq4R2qyqF3q7ui0aLS8QlFAritjDBpo4dI7pZxeFY1W+GKhIrG38pOBsamReli2T ZXG9GAt+U5pC1EAOHXpjnfN2EHAequu8n/lxzVrxs1hKvSI9tE8kfxmXUj9xZnVXjqw7 60WNuVcYk5cdQCfT+/AOde4q2ZwUE8a/FYMIU= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H8DjhzBGvpivWCX9C7RZJIiQbMvzkYc3tQEWOAXx9Gk=; b=F5YfmJU7TIHDkHB5mIGYvkP+8N0zFxWZIsTC61Io1rhkyOSvuA3I1WhPF1pdSvJ88J 105R+lryTmCu/xvNyP2owaO7wmCJatMmyMT2OkxvlKWnh6XGUNZjTsD29GGLRP9NTr3S XbTWtmjBk3v3/jJQZR+wLuPH2Cm/gdyqGtsdxp7yrUZ8ovVQZvXX05H77UimsAABL6xB eqIV9lrdj2QQnJVOImDYm+D3cB7VyFculAsKmFN93nzWBF8oWyFYGV5rFjBT4zTvRnJa FIqLiJYCWgYiKSEs9eVb3qtYXRtKt47Y6+tPZEIJW9lgRe0YaH6gs/xoPjnrxM6h+a1A y4AA== X-Gm-Message-State: AO0yUKXFcB6J8GJfHJ/pUU2ZUR4JSyRVTFsaNbTB+Q8sOJTbRR4lHRol 0ZLmGxzlOYX2u2MZOx4zlJ7JCMnAvAVwcovy X-Google-Smtp-Source: AK7set+Ni1D11VoX1oW5d73kn1MBC6Y4+CAPM+3DDSBsoLXIODO7t1UmJknzVNwluy88+DUrKYvVvg== X-Received: by 2002:a05:6e02:1a42:b0:310:aff3:4cf5 with SMTP id u2-20020a056e021a4200b00310aff34cf5mr13713905ilv.7.1675091832785; Mon, 30 Jan 2023 07:17:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 107/171] Correct SPL uses of MICROBLAZE Date: Mon, 30 Jan 2023 08:15:08 -0700 Message-Id: <20230130151612.212732-108-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_MICROBLAZE defined in Kconfig Signed-off-by: Simon Glass --- board/xilinx/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index aa9f3ef071c..bed15319934 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -412,14 +412,14 @@ int board_late_init_xilinx(void) struct xilinx_board_description *desc; phys_size_t bootm_size = gd->ram_top - gd->ram_base; - if (!CONFIG_IS_ENABLED(MICROBLAZE)) { + if (!IS_ENABLED(CONFIG_MICROBLAZE)) { ulong scriptaddr; scriptaddr = env_get_hex("scriptaddr", 0); ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); } - if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) + if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_MICROBLAZE)) bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M)); ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET); From patchwork Mon Jan 30 15:15:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734277 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ZPbNYtM2; 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 4P5DPb3BPbz23hS for ; Tue, 31 Jan 2023 03:37:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E98EF85803; Mon, 30 Jan 2023 17:37:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="ZPbNYtM2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A2AD085637; Mon, 30 Jan 2023 17:35:41 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 62D6A85920 for ; Mon, 30 Jan 2023 16:17:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id h18so2449702ilj.6 for ; Mon, 30 Jan 2023 07:17:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j/4OWEcmTa2IhFSvcsYrZCbygqGKMy38/uakoJxW5cE=; b=ZPbNYtM2iCatedVGvf4O3jnROAAX/XyWaC6wUHW0r/oYd+wMJeIkWtIyR0mhPORhXU MONuAFDG1ri/komrZWspajfISNmabUPfOy/IZl9P36I+Jp2tjgAR+mbBosoJPFR3/k6Z 59Y+hJTsknMk7nU/HN8oYW+41wEIeY5uHO7p8= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j/4OWEcmTa2IhFSvcsYrZCbygqGKMy38/uakoJxW5cE=; b=jK4XGUQYlLfxhjajec+4gSFk7rC7Xfe/Ll/8KxBGlUtvPVhzQH187OG33h1DaiOxeL 6xJMbpKCLvBJwWgAtmNAuhLn/GVrE1lhLWu21lBaWR0Vm0jGi7+Z0O2FjY3lXBbqmYVY Z9+Kdh6k8FpvDRM/fhLcRG31KRWt0Gmuu0zidlSsZDFGR1I8gUNlcoiT4m4Vr8lrIEXy 6XyO7CX2KQb2/6VFjelFCwHfPJKgycbobPXB+Geom1x9k0K96c4iHsxWAb985dIGrfcq z9w96ojeKgxH9FELJcTgQLYWF2Hs84jeRin4MFyUmC5HnBg5dTVahaWb1v9B3Vg1z/Ef b0LA== X-Gm-Message-State: AO0yUKXP1ruXq5J87oOInv1jiVjkhOZwy/em+fwfr5GGLmHwy/Y/8u7w bZq7w7lgoIXmqMrJBdsRRKOf/dugvRI04mQ6 X-Google-Smtp-Source: AK7set+JIk3UFXrrAndeJU9qBgJDAPlznN070f6LHtu+39eEeQMtkj0zggVu3THGdMc3yNUGjyvY4g== X-Received: by 2002:a05:6e02:194d:b0:310:a9e4:3713 with SMTP id x13-20020a056e02194d00b00310a9e43713mr15692908ilu.8.1675091833563; Mon, 30 Jan 2023 07:17:13 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Daniel Schwierzeck , Weijie Gao Subject: [PATCH 108/171] Correct SPL use of MIPS_CM Date: Mon, 30 Jan 2023 08:15:09 -0700 Message-Id: <20230130151612.212732-109-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_MIPS_CM defined in Kconfig Signed-off-by: Simon Glass --- arch/mips/include/asm/cm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h index 5cc8c09621d..c695ffc71f5 100644 --- a/arch/mips/include/asm/cm.h +++ b/arch/mips/include/asm/cm.h @@ -108,7 +108,7 @@ #include #include -#if CONFIG_IS_ENABLED(MIPS_CM) +#if IS_ENABLED(CONFIG_MIPS_CM) static inline void *mips_cm_base(void) { return (void *)CKSEG1ADDR(CONFIG_MIPS_CM_BASE); From patchwork Mon Jan 30 15:15:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734247 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=V18CQMOE; 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 4P5C8x1xqZz1yhq for ; Tue, 31 Jan 2023 02:41:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 14BEB85ACF; Mon, 30 Jan 2023 16:28:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="V18CQMOE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 976CC85A4F; Mon, 30 Jan 2023 16:25:59 +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,DKIMWL_WL_HIGH, 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-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (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 3276D8596B for ; Mon, 30 Jan 2023 16:17:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id l7so3349964ilf.0 for ; Mon, 30 Jan 2023 07:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CIcvlLhEqsTrFJ5HGqCOBIoIuOhytfnZi6BlQKydGZY=; b=V18CQMOEvLJAW+4kN9sMx062K4OljrYLHVDiDdgwW7dablQUKSGRc8+IGvCRyw+UNS 0+RnoaMbbn9xY5DUmUEp7XUss9GiDNv89/oiF1murxipkasKS9OLjumHZy3eHuvanyEs /SuPWUzxVvxc4UfGWJaEikf5l1xG29zR0X7dM= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CIcvlLhEqsTrFJ5HGqCOBIoIuOhytfnZi6BlQKydGZY=; b=2n6u+4x4D7u88NChVVLqRLOjzTl7VOkE+ZH+Ok59ejHQfGyYV1MVW5/i+4CGV3lPHO S/LKJv8n/W/c+v+FjEpf9Eg2e2oYjVyHsN8d1cr3GfglMQfaRep6IEM7fn/ipAjVOAND D0c2RFooWdCCfKSdeg25THARcxG6dR/iShdMxzsMSBiV2JVaI/FUvq2cnpxLzbH67FAL kN4S6jfMLtELE2miRUiTYU5JtbpwgWfybRw0WexlVan2UuBGKg2D/GUIS48YgD9n6guh 3TH9IF5mzCGhg5eJnywwBmkBmOMjjkaZtR/ga3lZpyk3lofE1GSVKLNEwECXkVQerN/H xY+w== X-Gm-Message-State: AFqh2kpiaeUJmOBVA1sD/P26ZJ6emTCAx9YI6k5VWMxWIIcm4D+V2eim 43VUXOZE9+CGWa8FHmgT/xDU9oFdL8z/K0nn X-Google-Smtp-Source: AMrXdXv77wH0Ie94PSh1ETrXWgGHP6A57+DJc3WwVFYpAKYBaF0zz1E4Fh4CiYu6D1y6Ug3GnKCOQA== X-Received: by 2002:a92:cb82:0:b0:30c:2b07:547c with SMTP id z2-20020a92cb82000000b0030c2b07547cmr31770509ilo.26.1675091834319; Mon, 30 Jan 2023 07:17:14 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Peng Fan Subject: [PATCH 109/171] Correct SPL use of MMC_QUIRKS Date: Mon, 30 Jan 2023 08:15:10 -0700 Message-Id: <20230130151612.212732-110-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_MMC_QUIRKS defined in Kconfig Signed-off-by: Simon Glass --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 210703ea46b..fd4aa946e2a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -247,7 +247,7 @@ static int mmc_send_cmd_retry(struct mmc *mmc, struct mmc_cmd *cmd, static int mmc_send_cmd_quirks(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data, u32 quirk, uint retries) { - if (CONFIG_IS_ENABLED(MMC_QUIRKS) && mmc->quirks & quirk) + if (IS_ENABLED(CONFIG_MMC_QUIRKS) && mmc->quirks & quirk) return mmc_send_cmd_retry(mmc, cmd, data, retries); else return mmc_send_cmd(mmc, cmd, data); From patchwork Mon Jan 30 15:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734258 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=OtkzUUE4; 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 4P5CTZ5FGlz1yhq for ; Tue, 31 Jan 2023 02:56:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3557785797; Mon, 30 Jan 2023 16:56:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="OtkzUUE4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A98B85903; Mon, 30 Jan 2023 16:55:22 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 9127D85803 for ; Mon, 30 Jan 2023 16:17:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id i6so1360838ilq.8 for ; Mon, 30 Jan 2023 07:17:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WlO2KkYnnjsIY6HNjeRix6fzog7uIiSVVPtJ169vcXI=; b=OtkzUUE4bhSoDbsiBLMnFsqRGGDUs0niosS9m8QC5HmbI8TOj49aUmMUdv9CzeBT5J rQQldOF0JH+U/cir3noaBl8QOHLtKoRB1BZKGp4XjX5xdfL6T/qOwkHXSaiwfYKXYaaI 2AA1KYGywCv2nVwaoVTHGE+aM29y35wxWYaVI= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WlO2KkYnnjsIY6HNjeRix6fzog7uIiSVVPtJ169vcXI=; b=zvRTMxmcuLfPIwYuIMGI1Hy+kGBOnXeQHdV5Sv3cRL/KhQ/GQOjzkUjx0QRvLll2k0 ogPjhpWLnZxo7lsqeszuLrEpkmypUoVOlw4LOIX8bpNwkr/QearH9wa0GBpi/DvhJR3n VzuonVIMpPhQTiS+MBg0lk9VKvTVFgSgsK4U6Q7aFQjXjL+DBZhYIthmYUEJLrPPZBcd GZYE/AiCU0/7zn9HSZ5Ek1miEDjltaJ/86RJy905mPy/DnEhfwVwELDiCyxcrA0vnYSJ YdKcGdU1qnUgBlTNn3Wu6ckrbpAuqTQFsP8OfAWRsr4V64gl/uV674Ma+J/4D91Cjyve zz1A== X-Gm-Message-State: AO0yUKVBKpryxfsRHkZGfWljVGfyJ7/lIdleQfgN1ZO42fBVZo4DkCdc uzICe5BOfcS3rRqx2gStJaMFwQEEEjt//BkY X-Google-Smtp-Source: AK7set/dvnzAr0IadVkIn+UHUN04cllZPDwQAIkL2RubgOYPBzb6wNrfx7nBWltZLsVRDi1xNkX7rw== X-Received: by 2002:a05:6e02:d94:b0:310:c2d5:dfd5 with SMTP id i20-20020a056e020d9400b00310c2d5dfd5mr7852436ilj.17.1675091835147; Mon, 30 Jan 2023 07:17:15 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 110/171] Correct SPL uses of MTD Date: Mon, 30 Jan 2023 08:15:11 -0700 Message-Id: <20230130151612.212732-111-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_MTD defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 2 +- board/st/common/stm32mp_dfu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 4b75397b1cc..9c4ba407ba0 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1748,7 +1748,7 @@ static void stm32prog_end_phase(struct stm32prog_data *data, u64 offset) } } - if (CONFIG_IS_ENABLED(MTD) && + if (IS_ENABLED(CONFIG_MTD) && data->cur_part->bin_nb > 1) { if (stm32prog_copy_fsbl(data->cur_part)) { stm32prog_err("%s (0x%x): copy of fsbl failed", diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index 19e9c3b2402..079ba15ddb1 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -123,7 +123,7 @@ void set_dfu_alt_info(char *interface, char *devstr) board_get_alt_info_mmc(dev, buf); } - if (CONFIG_IS_ENABLED(MTD)) { + if (IS_ENABLED(CONFIG_MTD)) { /* probe all MTD devices */ mtd_probe_devices(); From patchwork Mon Jan 30 15:15:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734259 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=AsK0blmU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5CTp56QGz1yhq for ; Tue, 31 Jan 2023 02:56:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 506AD8597C; Mon, 30 Jan 2023 16:56:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="AsK0blmU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52F14859A3; Mon, 30 Jan 2023 16:55:28 +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,DKIMWL_WL_HIGH, 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-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 EF42585977 for ; Mon, 30 Jan 2023 16:17:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id h18so2449771ilj.6 for ; Mon, 30 Jan 2023 07:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o2RmXH+vB8vErWzXwXcFbWdt4VwWo00AtMvFQvB/r6I=; b=AsK0blmUJN+mcicb7mXVRnfy0ReZgz+X6KZuH+SvcSLyaOlGzZWKbJ72/3AKSzu5qS S8NwnTYrq+IdIfEpyZ9sW4lt4WAlGGSK7ZN3jc+z1XRPLBJ6pVXamx+b1G7BwyPvCO4n kLXvzktD3VhpnBD4Eww5R0Ivq5arWbzzCUm1Q= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o2RmXH+vB8vErWzXwXcFbWdt4VwWo00AtMvFQvB/r6I=; b=YnFIrvP5uMlWJGS81Zw88bRinUc0qnj7b7CdD4fkQ6T6IZ11B3BhnJLYT3JAsk6ojG BdpA+4Xkl6fqUHWRMcNrEdAot/otbA/+xNYtb9VRfkHGgpd0nKNkYTPN3E7RTGWrzFqP tAnvdW9U0SsOoQYhvtWuVZAI2eWX0qbOzlyAUcWeCpx1c1OoJcoSn4VXz+htKerZWdbi uxhUtjoilRH4q8RfvAmPixB6vC6Jfd/O3ty6nsVSAGZ540lvpfNpB20WWKfoBtN6t1MN iXMKrbFaZa3WqAWmjNBj96gWDZQwKbCznFbIa6dPbMhoN9F6OkhXbe02HuG0VonKF0xX LIWQ== X-Gm-Message-State: AO0yUKVgsbRaQg1oPsofrPvgO/JI8ITkufUEMDE+Xggy+3AF94jCEs3q GZMgQgWi9ZkwRrNR59fLGNgfNDdzvffjUV7A X-Google-Smtp-Source: AK7set/XJum7WsvQUgWwV+sIu6RiTUE4EK/8G32e3BBDtZUNOxNLkoGaM12eE7fYhkBG0napW7cOxg== X-Received: by 2002:a92:7a0d:0:b0:310:ecec:40cd with SMTP id v13-20020a927a0d000000b00310ecec40cdmr3308120ilc.14.1675091836135; Mon, 30 Jan 2023 07:17:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andrew Scull , Balamanikandan Gunasundar , Paul Barker , Sughosh Ganu , Ye Li Subject: [PATCH 111/171] Correct SPL uses of MULTIPLEXER Date: Mon, 30 Jan 2023 08:15:12 -0700 Message-Id: <20230130151612.212732-112-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_MULTIPLEXER defined in Kconfig Signed-off-by: Simon Glass --- drivers/Makefile | 2 +- drivers/mux/Makefile | 2 +- include/mux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 15d19d0c8a3..20497aa2ac9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)INPUT) += input/ obj-$(CONFIG_$(SPL_TPL_)LED) += led/ obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/ obj-y += mtd/ -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/ +obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_$(SPL_TPL_)ETH) += net/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile index 78ebf04c7a9..d4e24789d33 100644 --- a/drivers/mux/Makefile +++ b/drivers/mux/Makefile @@ -3,5 +3,5 @@ # (C) Copyright 2019 # Jean-Jacques Hiblot -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux-uclass.o +obj-$(CONFIG_MULTIPLEXER) += mux-uclass.o obj-$(CONFIG_$(SPL_)MUX_MMIO) += mmio.o diff --git a/include/mux.h b/include/mux.h index 9f809912742..c92d887591e 100644 --- a/include/mux.h +++ b/include/mux.h @@ -23,7 +23,7 @@ struct udevice; struct mux_control; -#if CONFIG_IS_ENABLED(MULTIPLEXER) +#if IS_ENABLED(CONFIG_MULTIPLEXER) /** * mux_control_states() - Query the number of multiplexer states. * @mux: The mux-control to query. From patchwork Mon Jan 30 15:15:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734240 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=I6Awrhjm; 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 4P5C6b56CNz23hS for ; Tue, 31 Jan 2023 02:39:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D3B3585AA3; Mon, 30 Jan 2023 16:27:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="I6Awrhjm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 315DA857F7; Mon, 30 Jan 2023 16:25:40 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (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 3BC6185971 for ; Mon, 30 Jan 2023 16:17:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id d10so5207467ilc.12 for ; Mon, 30 Jan 2023 07:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xV9U0arjBIERdheETx+XAjsyPhZH7vrKSwaXco2pnlQ=; b=I6Awrhjm2t/vtciEbYjgFAYX1Cul1BwWFhwKTFN8oFa82ZOjhZMpljaPi6rCWzYRj+ Ey+tfJpcV9uxa8hOpDVQQRRyJQ6IjoqgN+69x2Apkp1WA7PHjkrB3+FtuzKkEpbX13bj vy2MZJn0eDQE4w+NCJbwFV9bY78rls3EOt+3Y= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xV9U0arjBIERdheETx+XAjsyPhZH7vrKSwaXco2pnlQ=; b=fzMP3zUKBmbdfa6yq+7C0WXjIAlFsSHrkIi/EnlwF55rC3qmzmJTs5KCxbJSk416SL puPk57iBRi0fr0a9q8DTv5f7O+/wJn+qbGZEn96Vv7qopebMS5iR1gZFDIrOx40OZtnr MgVIbTzp09dqlFvTf7TtLZchdwm3TydajMuAhdYCw2bOJRrJo0q4n3wSBZ6BYWiwdkk1 hbIJuWjasbFNezBPfw+EhrnqikcAR0i92D1BG7BZrG3IobpYbNTuxPqvfc6QyAIx69fm ydDTt5TyhtZG3C8Yd/sKuo5eR6XuhFKWyG/tzDbF5UN3lV+qYypJzCpcYxIX7tMqNwWs mRtw== X-Gm-Message-State: AO0yUKXTFHqMDq9RsgLWEhOKp0m9ggGgXQB2jqfhQgqCC7fCvzmbazsM D8SclYsvuhHCOpz6Umk+KeobHYrndsSECWuZ X-Google-Smtp-Source: AK7set8rYAIvIJ0dTJgX8DJED4pE07GcrfWZg2RnhOlet4WzuKwHymwTvFgRRlYypOkWin4p7tqNkQ== X-Received: by 2002:a05:6e02:1c25:b0:310:a5a4:73cb with SMTP id m5-20020a056e021c2500b00310a5a473cbmr16599112ilh.29.1675091837153; Mon, 30 Jan 2023 07:17:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Dzmitry Sankouski , Heinrich Schuchardt , Ovidiu Panait , Rasmus Villemoes , Stefan Roese , Sughosh Ganu Subject: [PATCH 112/171] Correct SPL uses of NEEDS_MANUAL_RELOC Date: Mon, 30 Jan 2023 08:15:13 -0700 Message-Id: <20230130151612.212732-113-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_NEEDS_MANUAL_RELOC defined in Kconfig Signed-off-by: Simon Glass --- common/board_r.c | 4 ++-- common/event.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 552b9899323..cbc140e6d8b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) + if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER @@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = { */ #endif initr_reloc_global_data, -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) event_manual_reloc, #endif #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) diff --git a/common/event.c b/common/event.c index c312556490e..164c95f8f52 100644 --- a/common/event.c +++ b/common/event.c @@ -155,7 +155,7 @@ void event_show_spy_list(void) } } -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) int event_manual_reloc(void) { struct evspy_info *spy, *end; From patchwork Mon Jan 30 15:15:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734262 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=RvLZ8x00; 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 4P5CVS4r4sz1yhq for ; Tue, 31 Jan 2023 02:57:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB72A859F5; Mon, 30 Jan 2023 16:56:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="RvLZ8x00"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AD09B859A3; Mon, 30 Jan 2023 16:55:47 +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,DKIMWL_WL_HIGH, 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-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 C6C998597E for ; Mon, 30 Jan 2023 16:17:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd32.google.com with SMTP id r6so2056547ioj.5 for ; Mon, 30 Jan 2023 07:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zg01voo4ohs4J9tO7hvTDnB4/icRdfMD5SbukSV+eO8=; b=RvLZ8x00XfsIs9Y6fAUZa27h21L/ZzNBu+jBM8RsoqRK6NFZrqG7teIok+hU6IMaGb 1G0B7cZZcv0n3UMDbCavc154PNvuWRwCE0u4f8Ulxw81IwIysF1yKeVxhaMGLTvvDGeb HwhSnAnqULRJ57ceBbuOAmZoK2coWOVCbUZqA= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zg01voo4ohs4J9tO7hvTDnB4/icRdfMD5SbukSV+eO8=; b=CiM52zcr27WmoGTk85GbIhu/MM35Vx0nzeF7TyzL+1oQ4ZTVvcR5yg/0BHFruBdLpl 86ZQpzS+X7zjirsxhtqjUHg2KYYMfe+Hgu1x663M6X4UGf6zPaXoUOaJ+Szfq4OsKP3j 5mEy6i/hYtxnNJKvcEuOKkHfwWuD9KFEjnMP2dhJCNDnqA8/I4btfgjzDa9duzfUQzFf NquFvYT8rJaCFyipXlK+bPvOrEB4x+BTZThWBaD3Y4hzX3h6F2Nfh4sBnKmhkHWkzE9q kf77Cx45i3vjpiMEn+2ZEi6BIsItgxLXT6gnSZxYBckG8yXJp+HuaWRqGYdf1wlOXAaW iBsg== X-Gm-Message-State: AO0yUKUzz1b3WG1WpfaL1kG2Jp/heTbYJeZX8yj+iJPF2olufZqoCpN+ R64/AJY9hc6tF7BK71vi2ekQak1MAaSnCWEl X-Google-Smtp-Source: AK7set+2brv1xMMx77DEgihlBA460kXIFijB7gV2Le4ZXzRJqdqU6psfuYnNLuWBCFa/Ib9a4T8yvA== X-Received: by 2002:a05:6602:1310:b0:71e:d970:9ca4 with SMTP id h16-20020a056602131000b0071ed9709ca4mr1277850iov.18.1675091837935; Mon, 30 Jan 2023 07:17:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Ramon Fried Subject: [PATCH 113/171] Correct SPL use of NETDEVICES Date: Mon, 30 Jan 2023 08:15:14 -0700 Message-Id: <20230130151612.212732-114-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_NETDEVICES defined in Kconfig Signed-off-by: Simon Glass --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index cae041988db..8b1a4ae2ef8 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -1078,7 +1078,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ dhcp_packet_process_options(bp); if (CONFIG_IS_ENABLED(EFI_LOADER) && - CONFIG_IS_ENABLED(NETDEVICES)) + IS_ENABLED(CONFIG_NETDEVICES)) efi_net_set_dhcp_ack(pkt, len); #if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) From patchwork Mon Jan 30 15:15:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734191 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=lrBLJNsM; 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 4P5Brx2YgPz1yhq for ; Tue, 31 Jan 2023 02:28:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E601D85A15; Mon, 30 Jan 2023 16:23:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="lrBLJNsM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B60738593F; Mon, 30 Jan 2023 16:18:35 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 EE94C85984 for ; Mon, 30 Jan 2023 16:17:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id i17so5067425ils.11 for ; Mon, 30 Jan 2023 07:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S0cJw+b+KnErPm1DwaLq68TgmjMOdogCRm8D0ft6hJU=; b=lrBLJNsM/YtXQl3klvMz+LanvQnKabd07/a36FLoaF2IzBUGM7ZdOm3oeUkydHtOnz mFRPlLkOiXM10QK5eM/3wf6xo/4LJb1nfNsTH/0y4+i59a1qQXKDNzbxqwSqefjMdyJT sggEmaZ0a+C7bc4TJMkuQb11aZ22aDThiPUkI= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S0cJw+b+KnErPm1DwaLq68TgmjMOdogCRm8D0ft6hJU=; b=H5DK2FBFop+6YMRM6bNNYadewvw3Za84L7wPmN7U99zPomeF3dxVgIKgA1kH5ktPAp UpQqasOvkwr14lg2VDm6MlWUsdCzM+KFjZK1DBljPh2jZymBbKAHPlKUTX4OX9frWUAs 1wYJePSIkiYDCTE+BBSaU8BvtS5zTwpsOExxrN9Dah0Rt2dcx0QcLRoqe1PubkrGksnt NSPTauhwtlNTZOq7pbRWoKOQZnzjRIcivFeddPpvgwpLJqGRNDkyFH5Bu+BX/DAfJJdK kuodQgWlbO7QUGlBcedYqsXcSDQ8MFo9cNFNy7fOqM3Dk43OGQreQHFvH5ReA7hiYh+7 QWNA== X-Gm-Message-State: AO0yUKWizZc5WgAxLHXfRzhNZJYY+AMQBPx9aUE0OQVR/U35kslYBY3v ULpQ7oLxfHycGNU4dIfYQH0K1NUfnt/4ZDUq X-Google-Smtp-Source: AK7set90Y4WgMioRBt2e6MgedadJaCpLQi8R6Hf/h9wyb4E1uS7Pj+CwET7OAptTeSHs5Qze5k1Buw== X-Received: by 2002:a92:c546:0:b0:310:c16d:9611 with SMTP id a6-20020a92c546000000b00310c16d9611mr12042079ilj.25.1675091838764; Mon, 30 Jan 2023 07:17:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:18 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Lukasz Majewski , Sean Anderson Subject: [PATCH 114/171] Correct SPL uses of NXP_FSPI Date: Mon, 30 Jan 2023 08:15:15 -0700 Message-Id: <20230130151612.212732-115-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_NXP_FSPI defined in Kconfig Signed-off-by: Simon Glass --- drivers/clk/imx/clk-imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index b5c253e4966..663b9a1bc7e 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -86,7 +86,7 @@ static const char *imx8mm_wdog_sels[] = {"clock-osc-24m", "sys_pll1_133m", "sys_ static const char *imx8mm_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", "audio_pll2_clk", "sys_pll1_100m", }; -#if CONFIG_IS_ENABLED(NXP_FSPI) +#if IS_ENABLED(CONFIG_NXP_FSPI) static const char *imx8mm_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", }; #endif @@ -355,7 +355,7 @@ static int imx8mm_clk_probe(struct udevice *dev) imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0)); #endif -#if CONFIG_IS_ENABLED(NXP_FSPI) +#if IS_ENABLED(CONFIG_NXP_FSPI) clk_dm(IMX8MM_CLK_QSPI, imx8m_clk_composite("qspi", imx8mm_qspi_sels, base + 0xab80)); clk_dm(IMX8MM_CLK_QSPI_ROOT, From patchwork Mon Jan 30 15:15:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734194 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=WJ2zDLZ4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5Bsc2Dpyz1yhq for ; Tue, 31 Jan 2023 02:28:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2EF2985A1F; Mon, 30 Jan 2023 16:23:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="WJ2zDLZ4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE6B18593F; Mon, 30 Jan 2023 16:18:41 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 0E9D685982 for ; Mon, 30 Jan 2023 16:18:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id m15so594854ilh.9 for ; Mon, 30 Jan 2023 07:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lgyM2LWVxUrRjSjak2F+lpSefuI5HicDjN620opJCYg=; b=WJ2zDLZ40TPCclvXR/sIw2JNuWCQ/XcOPjVZy6lgjlws1+CquXzC8AInEC9ho+zLzc G9NUsVBYlylPLn/LJ4dLMJO6l33gspZCtiDClvfYl+ToF6fwM3DNLKUSOThf6o175W9u 69A1ww9iJmErJh9VzMhAko57c0i15gSjrySJM= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lgyM2LWVxUrRjSjak2F+lpSefuI5HicDjN620opJCYg=; b=FBAUBAjMSqz+v8MOvSXA7DZyeMQhAZFGXAAx4SqDzFa5Gh9cSYgzupsQ4eTQMfNHLs 0VzbVq8D4/1M3eOWwqUloeRAuylZYAhxieupECz33JL5rZMhOdMyBXWWlyBVtGJoi4HQ bpok6Q64TX0qItNnpH+sf7h3oQmTWLxygLKVBowI6IFmw9amI23cmqYopCXrIIHLbK37 L4AirQnVwlJzVEkWPoauMm2s4n9nDB1puCA6+W3fuIwZD6LAd9irJCUnnyOA9OrzlRxP Aapp6GQsu4KPzmVU6+bfHx9eFAa8F6Jwl4/qvH2LwI9bUS6wMKxjyws7ZghNpFhXukWw yb/Q== X-Gm-Message-State: AFqh2koRxrzND2atrRc75vkMyiiiyzxHcccFWdV87G3lle7ripR6p3A6 Uv9l4ghzT+wz7OC2inTbs0jBFqtnYodRQyOu X-Google-Smtp-Source: AMrXdXsR6eDuiDMK7FVvIOfE3DBPYtMwqsj0PfAH7YjH2uvoT88vQHppkYChYADttuKg/PVX7nEECw== X-Received: by 2002:a92:ad11:0:b0:30f:3b5d:69f with SMTP id w17-20020a92ad11000000b0030f3b5d069fmr29304013ilh.23.1675091839622; Mon, 30 Jan 2023 07:17:19 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aaron Williams , Daniel Schwierzeck Subject: [PATCH 115/171] Correct SPL use of OCTEON_SERIAL_BOOTCMD Date: Mon, 30 Jan 2023 08:15:16 -0700 Message-Id: <20230130151612.212732-116-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_OCTEON_SERIAL_BOOTCMD defined in Kconfig Signed-off-by: Simon Glass --- arch/mips/mach-octeon/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 1bdc6cd7290..5adf4ba32c8 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -451,7 +451,7 @@ int arch_misc_init(void) if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE)) init_pcie_console(); - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_BOOTCMD)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD)) init_bootcmd_console(); return 0; From patchwork Mon Jan 30 15:15:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734236 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Otl9AwtU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C5F0pQdz23hS for ; Tue, 31 Jan 2023 02:38:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B129185A9D; Mon, 30 Jan 2023 16:27:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Otl9AwtU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7523E85996; Mon, 30 Jan 2023 16:25:27 +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,DKIMWL_WL_HIGH, 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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 A6AF185972 for ; Mon, 30 Jan 2023 16:18:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id l15so1397476ilj.5 for ; Mon, 30 Jan 2023 07:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LchWEAS792D4TztjhCcyyyvWD41slNBQ64vP3iIL3kE=; b=Otl9AwtUui/kYPpwfd86VVikYSgdiJMUsWGzAP6dIn7cpOXc+QSOKGwM0oIJNeq7d8 Bq14TYxdNlBpzGXwV2ydMoYUsp9fSyJiiryv10Cm9s079p8bd5kfvYlbJmXfqRaSDg90 JgNFtAglCCqfo0T9Oexfc01v2K1VmJK31zfCs= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LchWEAS792D4TztjhCcyyyvWD41slNBQ64vP3iIL3kE=; b=odgxmhNDqVuMHjDBqM34JzvTIdX3dL7i/buyuT1GhVfW8yjqQb2TisQ8mH0CktyFae r1ngJbWcYezsB9gaHHz3BbnKhqeTdH5cMQHVU8JtUBGz5eVZLUszOtOEwu6mdA7OqJKR P+ut+FmgI7n+BuKXVF7G4rL14TVhfxp1qFKpW3dUd7RuSBVDBEPG3AYSDoq+eEdzhhHx po1xEnAkCMTl510GV1kfX8QU6eG/fLRYBtyDQ3IL5bBWVkgV0QPHGMzrHw5G2X5gjKJw xBzH4xRw4UOnvmbAbisTPkJuTFSmN3pq5wMu4BYUvDi4F7sGey4urnFbWoHcvySVq88Q DEzw== X-Gm-Message-State: AO0yUKWEVNusCBFF3yGM5MOeETeG4cE/08og6qjWya+PmDPJtDg56UGk yT6HEs5rctFLTWzE2ZWtPtXvM2i0iT1iUR52 X-Google-Smtp-Source: AK7set9tkHCSH/ccXajeP5FQ3iXJxX/Zhq4PGOeE6YNNoIdsWFeYvUHi1Oa3BYfOmjsUv5c3PeWLfg== X-Received: by 2002:a05:6e02:190d:b0:310:c833:b325 with SMTP id w13-20020a056e02190d00b00310c833b325mr11433049ilu.6.1675091840380; Mon, 30 Jan 2023 07:17:20 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aaron Williams , Daniel Schwierzeck Subject: [PATCH 116/171] Correct SPL use of OCTEON_SERIAL_PCIE_CONSOLE Date: Mon, 30 Jan 2023 08:15:17 -0700 Message-Id: <20230130151612.212732-117-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_OCTEON_SERIAL_PCIE_CONSOLE defined in Kconfig Signed-off-by: Simon Glass --- arch/mips/mach-octeon/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 5adf4ba32c8..c7744e84706 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -448,7 +448,7 @@ int arch_misc_init(void) if (ret) return ret; - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_PCIE_CONSOLE)) init_pcie_console(); if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD)) From patchwork Mon Jan 30 15:15:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734241 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=BKmIWcrt; 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 4P5C6n6wjKz23hS for ; Tue, 31 Jan 2023 02:40:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 953E985A09; Mon, 30 Jan 2023 16:27:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="BKmIWcrt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C951F8598B; Mon, 30 Jan 2023 16:25:41 +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,DKIMWL_WL_HIGH, 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-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 3E73C858B3 for ; Mon, 30 Jan 2023 16:18:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id u8so5209236ilq.13 for ; Mon, 30 Jan 2023 07:18:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z/IwUmZMx+qXLDO/RqduUJEJT/meJHy0wuZyKAIm274=; b=BKmIWcrtBvxnyR3z3TfcgPc9P4Rhq2YyyNaU8nm/wROop3FEIeT3DPo0fHdmCpCNVs MdWOraW9FYnlYxBnS7GJU5j40Wj6X2HkOOi4L8m0SMBXUqZZTOCXo33r8Oky9DmbWqHo Oz0XiWLWDhJBmTudX1OVKBu5+KhshXg0O8ffE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z/IwUmZMx+qXLDO/RqduUJEJT/meJHy0wuZyKAIm274=; b=1tfOhxwbCikwOP5VSa/dKqsP0IuPOkrFIOscQ6HnNTIhuapNHSof5XP3pN6D6mT2vz r1UY0dPf4N/wRL01nhK1oRCiRk1GWNRyDA4tJ7kAP4Nisevjul5yGNFzDjht2PFdQ5vd j1qoNeJneLJhmq07ED/5RUSr7KiozLaLNl3+2iFeEnfMjc1T0gzUmptsruPNT7+cbcrQ wvK7KQs/ZyS71VdbUBTXDD4fu8K9Fe+8JCjV9Me54R/eHaUAKNytiOKQ/rlKhsRo4WHV e6VQEN/po66N58CpcT6UNwcVvHHaYtQqsweniZUIXuLkLjLyVq5jsAyHZHU9WpBKAioM soiQ== X-Gm-Message-State: AO0yUKXy4PuRveIh2t3A/OBhWjB5YUwx/qVUxQNtyd2Jz3gpawUmh9cv Cyw5nRwJBiy5MoSulECUX4qmpUJVKreG3qf+ X-Google-Smtp-Source: AK7set+PxCzeuVyW++1vPGpc2yVy02cQHtTnb5PjKxsnwkOKzK+e76N94kRguVP598fzTvMba0ZXqQ== X-Received: by 2002:a05:6e02:1524:b0:310:af48:ab2 with SMTP id i4-20020a056e02152400b00310af480ab2mr14515100ilu.23.1675091841128; Mon, 30 Jan 2023 07:17:21 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Matthias Brugger , Peter Robinson Subject: [PATCH 117/171] Correct SPL uses of OF_BOARD Date: Mon, 30 Jan 2023 08:15:18 -0700 Message-Id: <20230130151612.212732-118-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_OF_BOARD defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Matthias Brugger --- drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 44a310f83de..e949cb70900 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -153,7 +153,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .priv_auto = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, .probe = bcm283x_pinctl_probe, -#if CONFIG_IS_ENABLED(OF_BOARD) +#if IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 12cbcb9858c..7585f790d22 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -197,7 +197,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .plat_auto = sizeof(struct bcm283x_mu_serial_plat), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto = sizeof(struct bcm283x_mu_priv), diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 7d172cdac0a..09a9868a38f 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -94,7 +94,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .probe = bcm283x_pl011_serial_probe, .plat_auto = sizeof(struct pl01x_serial_plat), .ops = &bcm283x_pl011_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto = sizeof(struct pl01x_priv), From patchwork Mon Jan 30 15:15:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734192 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=IG7EhqfX; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5Bs91Qfmz1yhq for ; Tue, 31 Jan 2023 02:28:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1AA5585A13; Mon, 30 Jan 2023 16:23:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="IG7EhqfX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 43483859A4; Mon, 30 Jan 2023 16:18:38 +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,DKIMWL_WL_HIGH, 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-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 395EE859A0 for ; Mon, 30 Jan 2023 16:18:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd30.google.com with SMTP id o1so762923ioo.10 for ; Mon, 30 Jan 2023 07:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/d7CEcvrY0CWyNNYrlESVPb9APS5UZgmEnu3KmHM8ks=; b=IG7EhqfX1xx0uWGvzkdkf/GCiiW20rYApfM2nO1fxG0hYkT4cV4l1T068UhzaVnmd+ K5eI+4PQeriRPG3gUno/7lSMXi2vMGCsgM0JMdynnXXHrrc+3pPwTD9B5h+ZTUyKrVgL ocCOPDkDtdt76xDq8BMaMPOktLmiJPpu4DYcw= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/d7CEcvrY0CWyNNYrlESVPb9APS5UZgmEnu3KmHM8ks=; b=TbwtqY+Lq10IVXSx+b1d7xY5D2SHKDNBHp5OiJY9zRz/Rmo6kKd1WExbnNNOjv67CJ JEWfYQdmRqF8EeKzR+biMMta1o6FWtE6sL3t+LaRWHTIHVRTDcbWM2YcvSzokoA4CggU l3MD4zCc+SXamVicbKY7mrpN08nbfOIwmJFPAN8B82CdZiheyLvEZCWiU+USJdy2bajJ gCfJuuxvw9RSPBPbx5xI2XtBFFEuLixpWjr9VBiBeyJQzcLtYZ4cN2Hzc0EYWFTcZEFr bXX+YNE9LElq5QOlRXhlOMnL+t9uqXXLwklu0hzgYz6+hMcqdUI8F5p/scZc2/yQ23Wj T2sg== X-Gm-Message-State: AFqh2kpVtIBsJGxOIX6BtyGrlGlb0HihZLbkk0ol1J+QiNDoGMP5HQ9I bsAEpsCtZKd0ema9LSR8Q0uP78ASsT3lEpcf X-Google-Smtp-Source: AMrXdXuoEcDNvl+kRf/jx+qlHe18Nalzne1mzciLdh+6Mfkruu3fp0OVG8IqaRmF4VGpBdtgWuxxXQ== X-Received: by 2002:a5d:9f0c:0:b0:6e2:d23a:6296 with SMTP id q12-20020a5d9f0c000000b006e2d23a6296mr32740981iot.20.1675091842086; Mon, 30 Jan 2023 07:17:22 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , AKASHI Takahiro , Dzmitry Sankouski , Heinrich Schuchardt , Marek Vasut , Ovidiu Panait , Rasmus Villemoes , Stefan Roese , Sughosh Ganu Subject: [PATCH 118/171] Correct SPL use of OF_EMBED Date: Mon, 30 Jan 2023 08:15:19 -0700 Message-Id: <20230130151612.212732-119-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_OF_EMBED defined in Kconfig Signed-off-by: Simon Glass --- common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index cbc140e6d8b..2cd66eac803 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) + if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER From patchwork Mon Jan 30 15:15:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734195 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=hT2AEcb8; 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 4P5Bt24jh9z1yhq for ; Tue, 31 Jan 2023 02:28:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5BE65859EF; Mon, 30 Jan 2023 16:23:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="hT2AEcb8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7EA7A859B0; Mon, 30 Jan 2023 16:18:52 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 2224E859A3 for ; Mon, 30 Jan 2023 16:18:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id i6so1361023ilq.8 for ; Mon, 30 Jan 2023 07:18:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9VLCZrRbYwk9SxsaSLW94UsYyh18bVT6qyQ7aeE0l2A=; b=hT2AEcb8jqRphSxWBLc1ROYEuXWF3jyJGF8//FWnbYbJVqQXoZxiR/OHHnPAut+wid whzIYQpdSqFPe706n23uuKX7ICLeJPADGUo0vENreKrI4xBzVCnEENyCWj0419LFwYr/ 5gFQnhow0QUbhY1jnZL0htzjbO8ScxBgXnJkE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9VLCZrRbYwk9SxsaSLW94UsYyh18bVT6qyQ7aeE0l2A=; b=ZlBFp5uwomcUuS+dGgsh7/1p/Y9f85Xut3JnWV18HIn4al/8spDCA2DKMcSqKHXOhw HRL+6hB56ze7CtP+rpdopY0Key6A5YAwr03+gJKd8Q744+0wKIY/LQlNFWVPTAd6/Aqc wHnF6YglJgliHnefEPgWVlmHpzFt1aXoI1dAfgteL5kJ+RzcH+tqP5D1Zz7QdB88n8qo egLrVvLDoKCDQjvNopid2o7yS4z62VmjXKAr7+ODav2MD6q6ufzhCB6zzIyC+2u2D3TI CbH9LpjxGR5dYi+DIKkUgRmyEeFfRYz2QFvo6fkYh+OQnABAUKQeAmkbUMZwDIaGVYKD Friw== X-Gm-Message-State: AO0yUKVW62qIEb6EcpURiloqqwCQh8c7OKPNtYaECyJSpXbyyx3gfO0V IxiO8yJarzUysIlGjZuu45+FubnMmkc3OA0N X-Google-Smtp-Source: AK7set8pB/DupsEkXle/a08L7NlTRCfaBQl1PC0cdoSxYsF6YgidadYYxLLPQFuzi630Nff25wqCyA== X-Received: by 2002:a05:6e02:19ce:b0:310:a8c9:e0bd with SMTP id r14-20020a056e0219ce00b00310a8c9e0bdmr17178880ill.26.1675091842873; Mon, 30 Jan 2023 07:17:22 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Anatolij Gustschin , Michal Suchanek Subject: [PATCH 119/171] Correct SPL use of PANEL Date: Mon, 30 Jan 2023 08:15:20 -0700 Message-Id: <20230130151612.212732-120-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_PANEL defined in Kconfig Signed-off-by: Simon Glass --- drivers/video/imx/mxc_ipuv3_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 8b01a1be112..7e60385bcfa 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -615,7 +615,7 @@ static int ipuv3_video_probe(struct udevice *dev) if (ret < 0) return ret; #endif - if (CONFIG_IS_ENABLED(PANEL)) { + if (IS_ENABLED(CONFIG_PANEL)) { struct udevice *panel_dev; ret = uclass_get_device(UCLASS_PANEL, 0, &panel_dev); From patchwork Mon Jan 30 15:15:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734196 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=A2bspzUi; 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 4P5BtL3pNtz1yhq for ; Tue, 31 Jan 2023 02:29:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 062A885A35; Mon, 30 Jan 2023 16:24:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="A2bspzUi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2F1288593F; Mon, 30 Jan 2023 16:18:58 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 A5F108593F for ; Mon, 30 Jan 2023 16:18:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id w13so1141114ilv.3 for ; Mon, 30 Jan 2023 07:18:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Um+fwnrBko6NjuA5fr7IhynC83unYnvtNMxiuNSFOKA=; b=A2bspzUiBh+P4yL3uByv2puaidzoB/KHOGfWfPtIj1XLMOXOzRprpvwbexpSPBPjg9 J8vOPTlTBeAjrkLNTdNSL3CMxYCg03btB9NJvzum596y82uUQHI5KTUnHLILsByMLHXM fi/75hv56wt0MZ7fwuH1rslf7ZUGJ40BpvpUI= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Um+fwnrBko6NjuA5fr7IhynC83unYnvtNMxiuNSFOKA=; b=Z+9K/7va3ImLrxd3kjRd9I9Rjk+Cu4eWyINo7gomWTtUZ4aEXEUA+/YWde+d1cIXQK Vp+qqajcyy47L7/v/wF7jpPYiWKZpARvzeSJaf2drswGro7an71OYP/L/jjwZ7buqdX/ 0TkRFo0nlrP7ITnbrQSU4P65NHd6gEhsnGpEu3tS00mriDS0T2OpVW2FR7vbBWAu17yf TGUq0PPd6ZXzv/SE7jDLj8ixcUElAiOj4H8SVqM6OiHYtpTD+JCWfjRj/MlvxYKnpFDi XhK8LbTvP6IBddTEtvEvinN2+VBN1EA9usyqUl0FVmrHhorwY+cO/XpHgpmrugxxFVMv QdYA== X-Gm-Message-State: AO0yUKUadMHs+uFziBkG0CfyffJUgDqL2SYqRFp0V2WgXgUmQB5ACUNj i3dkTByfAYLCsyfK1C6t1ymJ7WbRr4VxHhBe X-Google-Smtp-Source: AK7set++9H0zdhR7gQpszXL/oIUckPupAavX4O1+Jw5g4i6mYbl2v1eSeKrhfu8G76ED+7/okNvNCA== X-Received: by 2002:a05:6e02:19ce:b0:310:a8c9:e0bd with SMTP id r14-20020a056e0219ce00b00310a8c9e0bdmr17178913ill.26.1675091843672; Mon, 30 Jan 2023 07:17:23 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:23 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Philippe Reynes Subject: [PATCH 120/171] Correct SPL use of PARTITION_TYPE_GUID Date: Mon, 30 Jan 2023 08:15:21 -0700 Message-Id: <20230130151612.212732-121-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_PARTITION_TYPE_GUID defined in Kconfig Signed-off-by: Simon Glass --- disk/part_efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index 18f7e584050..80a44dc9f07 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -242,7 +242,7 @@ void part_print_efi(struct blk_desc *dev_desc) print_efiname(&gpt_pte[i])); printf("\tattrs:\t0x%016llx\n", gpt_pte[i].attributes.raw); uuid = (unsigned char *)gpt_pte[i].partition_type_guid.b; - if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID)) + if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) printf("\ttype:\t%pUl\n\t\t(%pUs)\n", uuid, uuid); else printf("\ttype:\t%pUl\n", uuid); From patchwork Mon Jan 30 15:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734260 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=j7mLTiCr; 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 4P5CV243Yrz1yhq for ; Tue, 31 Jan 2023 02:56:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 274F4859AD; Mon, 30 Jan 2023 16:56:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="j7mLTiCr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F2CCB8594D; Mon, 30 Jan 2023 16:55:46 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 588D4859AA for ; Mon, 30 Jan 2023 16:18:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id w13so1141445ilv.3 for ; Mon, 30 Jan 2023 07:18:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o81FpmoKC03JvotUJbVcPJz8q+GRHcs+NVuBLRzOtKQ=; b=j7mLTiCr6qHnku2eyA6awOs2dmnyy1Td2osi+uvb7RrJ7/a2i0/PSftWJpTmA/5eJe +JHuN2CG+7XrkwIA5u0f+sjvrxvBz1YF3+hcyQIKJRogQM/Abs7WRSgto40ONvwXeGbm SIzph+9tjc27XmwsHbxGIUXFTm4KPzPivTRg0= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o81FpmoKC03JvotUJbVcPJz8q+GRHcs+NVuBLRzOtKQ=; b=qoHVLWuefQQJAGC3KT4rZNY/+UJQAJb1qrL6Qdy7ITMsnrDvHWb33xN1nly5WqylF0 NQfAtnVR7NLWlXxh4MM/0OvYCx0ggTPDiI+nqmf+22YUb1hDycsZdxioCTknkWJwMQOH Jv57/BZUpFWP9gEGPJYviP6xAfHQOPdJLnMCYDvzaEExmbYoYfu3uUUTR/ZGJEGeEYG6 6Rm9FQzp48CtClKrTCOnCW4PGgrq74gm+rKqhrMFG95o1/xyss/qrz6mEA85eG3oPDqe iSewfT10mRv4so/1M2JgqNJrD5ljbI73ovoFW+Z2N/qjdSwII34eStkGfm/a0h0ytxVs PyCg== X-Gm-Message-State: AO0yUKWGBCl3x2VeSEKGjKJ11ssDTE23oN6Dzgc0yvg+ZnjZxcomAL+9 meiNkkfWe+A9lrDk9KqhPOZ1SBbecpOLkyvo X-Google-Smtp-Source: AK7set/lZNBAEjfMn2/eBRRtei85s7lOYBNILSKcKBj99FXOfkBpynFLlh9Lzhui/LS/ER2zufMAwQ== X-Received: by 2002:a05:6e02:1ca9:b0:310:c566:4692 with SMTP id x9-20020a056e021ca900b00310c5664692mr11215252ill.22.1675091857575; Mon, 30 Jan 2023 07:17:37 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:37 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andrew Scull , Bin Meng , Michal Suchanek , =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Pierre-Cl=C3=A9men?= =?utf-8?q?t_Tosi?= , Stefan Roese Subject: [PATCH 121/171] Correct SPL use of PCI_PNP Date: Mon, 30 Jan 2023 08:15:22 -0700 Message-Id: <20230130151612.212732-122-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_PCI_PNP defined in Kconfig Signed-off-by: Simon Glass --- drivers/pci/pci-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 9343cfc62a9..a0c19987ab1 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1140,7 +1140,7 @@ static int pci_uclass_post_probe(struct udevice *bus) if (ret) return log_msg_ret("bind", ret); - if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() && + if (IS_ENABLED(CONFIG_PCI_PNP) && ll_boot_init() && (!hose->skip_auto_config_until_reloc || (gd->flags & GD_FLG_RELOC))) { ret = pci_auto_config_devices(bus); From patchwork Mon Jan 30 15:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734275 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Ul5E2I4U; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5DND1WWhz23hS for ; Tue, 31 Jan 2023 03:36:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 14A9385920; Mon, 30 Jan 2023 17:36:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Ul5E2I4U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0EE980465; Mon, 30 Jan 2023 17:35:34 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 619838597A for ; Mon, 30 Jan 2023 16:17:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id g16so5237552ilr.1 for ; Mon, 30 Jan 2023 07:17:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qyGL2L3QJPQ78qLXPrkGajaBDmXxjm24YRHWvCvpXao=; b=Ul5E2I4UbT0Omokz7pr3STk1UJqeAiDvxbOy48UesVBS/1qORj9rtwH+GKPawPp6FP fe5wb0Udc/Py/ILuhb+lcYPEBGtZGWiqbRQtcebuh4p1AswDrG8l3kPIAYn1YS1od3Rx te7DIZtp+QBAi6Oixhod8QtC+Y1O3jVcwn/zE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qyGL2L3QJPQ78qLXPrkGajaBDmXxjm24YRHWvCvpXao=; b=YjyomJZsu0s8dQiUNeb0NoMtD6w3gPb/bFI+pbLvwp4NMis/ozR+1ycE+u9aKZlOZN 1+7gqvKk5Xr5XsEB6LXoXVDsE9DQoqUd99aqSpkl7p5TzWbVS+2lM8gPCkWEaGR+WGwI qjLJUHfltpF2jNCokEphpe8x/56TO+uJZ8jN0Zr2MvO0MS05sEEv+L53+9HULrV0XsXa FP+oZaHZq/TebftcWFHZhI2FcYJeSsaDefhDH/QZreP8nasVes1KIj2DGFDx2YjKiaOL oLPVADmvsw46QRrD9hCPrA8XxHwArRKVc5IcGY483BIzo21iiIIOvpjSY/NhRxxvqkeA HbEg== X-Gm-Message-State: AO0yUKUqbSal5ohJXbbpG+QeAmlvbOgUxEllTqVfVNvg5s4W8y2elpBP TsO2sYk+PzOiyJaYphNTnOu4FNTvuzyp2skx X-Google-Smtp-Source: AK7set86swOD4fiRECvW28Av8QF779dEqU+e7QGShJH0jAWtweNu5RfxuRV6GG+UyEM/u5nqMZE6Og== X-Received: by 2002:a05:6e02:152a:b0:310:c730:b427 with SMTP id i10-20020a056e02152a00b00310c730b427mr7303374ilu.18.1675091858323; Mon, 30 Jan 2023 07:17:38 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aleksandar Gerasimovski , Priyanka Jain Subject: [PATCH 122/171] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE Date: Mon, 30 Jan 2023 08:15:23 -0700 Message-Id: <20230130151612.212732-123-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_BOOTPACKAGE defined in Kconfig Signed-off-by: Simon Glass Signed-off-by: Simon Glass Reviewed-by: Aleksandar Gerasimovski --- board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada93ff..9cf5b71655c 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,9 +79,9 @@ int set_km_env(void) } #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif From patchwork Mon Jan 30 15:15:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734261 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=eHaKtC/p; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5CVF4JxGz1yhq for ; Tue, 31 Jan 2023 02:56:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B8653859C7; Mon, 30 Jan 2023 16:56:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="eHaKtC/p"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA47A8597E; Mon, 30 Jan 2023 16:55:47 +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,DKIMWL_WL_HIGH, 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-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 9392C859AC for ; Mon, 30 Jan 2023 16:18:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd32.google.com with SMTP id o1so763224ioo.10 for ; Mon, 30 Jan 2023 07:18:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LDO2ts27GflvsB+cAcdTpkrCF6odEeYaESLV0MlbHh0=; b=eHaKtC/p7hb7hOt84hp97Q39z44jfwAojxZTwSCNvKXpdZ/Hi+gSI5/IUpZZ1wIqCH ygHV6PAYrLZa0QZ2+nZag/Nqcn2ZO/icoz5JxC3/dvyCFtSy3gGSoZontMzv1ASgor5R xOE8aara+IqzXICMXlVlEY5AlU8r9quu56Gto= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LDO2ts27GflvsB+cAcdTpkrCF6odEeYaESLV0MlbHh0=; b=kkgPOfkOMSioi3AHYlg4iuHWnuEqUh5rtzUy3Z9OhHsjfPTipsMtTEJG1nYQB77RSc BrBiiUtSBkigfarfkYQtN3s0ziqMJ9qyM1oUfx9cTE5f89qCoHpCuz2ey/RxQF+Dlpej h9aZGqhVhM/2ROADBQjoZ5YPAhxBEogliZrq8rPnVV7fNdv+DJ/TRVOpAcQ1jw4z1+xF QQUunwCVsVOAfg2EVvsQUt2ZwczekRzXHB24WDuyQWE/FJalaqaJt71qZWMCla2tkbUk 5YPc3FsGnnBsapC40JEWBkDys30RsOZRMk8yJYclvxbmk5W5E1sOoVvdjtLnnvnNhYO5 7DDA== X-Gm-Message-State: AO0yUKUDghbUL3QxNYt/yXTD4dxWFp/GfLp6y7nGCw+DbuMBaISRyke9 2bpiy9Oe52zPO0HUUP1eThceN6pum7FduD4P X-Google-Smtp-Source: AK7set8RXMKrnpsSsNqo85w3gN+p1AShKNU7b+MoNFmu1SNKl3pZMMTlYPaU8RADj9xjvOh3apvogg== X-Received: by 2002:a6b:ed07:0:b0:71a:660d:e565 with SMTP id n7-20020a6bed07000000b0071a660de565mr3980316iog.13.1675091859078; Mon, 30 Jan 2023 07:17:39 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aleksandar Gerasimovski , Priyanka Jain Subject: [PATCH 123/171] Correct SPL uses of PG_WCOM_UBOOT_UPDATE Date: Mon, 30 Jan 2023 08:15:24 -0700 Message-Id: <20230130151612.212732-124-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_UPDATE defined in Kconfig Signed-off-by: Simon Glass Signed-off-by: Simon Glass Reviewed-by: Aleksandar Gerasimovski --- board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 9cf5b71655c..8c282f9952a 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -80,9 +80,9 @@ int set_km_env(void) #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) #if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ - !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ + !IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \ (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ - CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) + IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif void check_for_uboot_update(void) From patchwork Mon Jan 30 15:15:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734273 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=aRh24XQS; 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 4P5DMZ5jTwz23hS for ; Tue, 31 Jan 2023 03:36:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A44358597A; Mon, 30 Jan 2023 17:36:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="aRh24XQS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F4DF859AD; Mon, 30 Jan 2023 17:35:27 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 B4AAE8596F for ; Mon, 30 Jan 2023 16:17:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id i17so5067926ils.11 for ; Mon, 30 Jan 2023 07:17:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fDg15+f7wGQnH27f5rpFOjphQV1HmOvMF8S37zJ3Pkg=; b=aRh24XQSIovV6tJp0rIXa2pTnIocby/b7kGiB6MokM036gxgDmmkCxkENp4wd9+UdJ Zeip9z81myZ4FUl7QbqvY1JaQJMeDM+4YfWEfFbBB2cjKy8g630+UAudpK4/T6JP3D+S X9mB49WFq2EGX+E+2XaxjZF+17JV8GaUF2RpE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fDg15+f7wGQnH27f5rpFOjphQV1HmOvMF8S37zJ3Pkg=; b=IvGMgiqd8PywTqI2Jr00KSYPNK+lK7z7tH+JWsCsgWCgFkALQwvdJk7HMgUfW68ZOn k6x5c9frT+0Blrx5+Lt4vUyvgiaCSjIH9wAypJdgQKi2JkxDQAAPnXrnpjYv92z1nsUd DqRXXgOMqjur+eLOELhXsbtL/AizD30lfKiwGK25T5BfwtbUwWqtqICwv0l2nK47Ev84 8rpFRT40j6YzaP5A2xS60IbXGJVHweqWUvNXPqoImU6AZt42hMcDomi6s7dQKfS/Lraf 1NDJkTL6H6Pr2BcK4XqeDHIZ4bVVR/GnVqiEZawMIOnZBDtO8J504cXy8IhlouM33Nti z1cA== X-Gm-Message-State: AO0yUKVCXZwCPD9M/IbNkXSA9McKFraDakfFUdIbC4MUNMIOThx4UNZQ pMpbleI7bsAYZoZee4MfyVhIj741RWaYrIKn X-Google-Smtp-Source: AK7set/CXmnO8lUpqcEzNXXurn0A58Dck3krGEWUCxql5vTJ99/QQIrF7cHE+WKKd2oKFDYOPrF+/g== X-Received: by 2002:a05:6e02:1c28:b0:310:ff70:d7f9 with SMTP id m8-20020a056e021c2800b00310ff70d7f9mr1621041ilh.24.1675091859841; Mon, 30 Jan 2023 07:17:39 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:39 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aleksandar Gerasimovski , Priyanka Jain Subject: [PATCH 124/171] Correct SPL use of PG_WCOM_UBOOT_UPDATE_SUPPORTED Date: Mon, 30 Jan 2023 08:15:25 -0700 Message-Id: <20230130151612.212732-125-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_UPDATE_SUPPORTED defined in Kconfig Signed-off-by: Simon Glass Signed-off-by: Simon Glass Reviewed-by: Aleksandar Gerasimovski --- board/keymile/common/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 8c282f9952a..991022ac833 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -78,7 +78,7 @@ int set_km_env(void) return 0; } -#if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) +#if IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED) #if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \ (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ From patchwork Mon Jan 30 15:15:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734276 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=dDmuyJRR; 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 4P5DNs3X0gz23hS for ; Tue, 31 Jan 2023 03:37:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28363859CB; Mon, 30 Jan 2023 17:36:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="dDmuyJRR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0FD51855F5; Mon, 30 Jan 2023 17:35: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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 67A2A859A8 for ; Mon, 30 Jan 2023 16:18:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id h18so2450330ilj.6 for ; Mon, 30 Jan 2023 07:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LIkoHLeVIDnkzRwH1lxz0NPExfCyaNUNdadLrkP1lXk=; b=dDmuyJRRd0utgzE+AhyBA/gQZTpmlp6ilCELpBtWWH3KN3TWlDfEwADGbd1sctSvLU D2aa5lAyfw8FpZj9I7y22KDl330UiXETIzMk9oD6dRfPPWvM0OIor8yd34lQzbfOSthZ ehSONNSgxtO9ut00L5wPQOPGk8bCFfyubgkFg= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LIkoHLeVIDnkzRwH1lxz0NPExfCyaNUNdadLrkP1lXk=; b=h4UtfhI8JbTSZdCs6chV8mqF+P6PwGgBj1cn5RuaVsKWbmMqYQsJB3JBKyK0G8iruy bc09F+7LNN7ku5cW315lAjFUJ+8SRlPh4dTkkiBWw+WcE9kZjuO1ftvJSiquHw+5/KSR O32AfDy/xT5+F9LDpbOSrdNFNN50Rt8UuNZufM7AiUglWwe441ttJ+XIGCedz0kxr1O/ npfDn6852jRAoIQ5vTyk+e1MlgOkl7OcVu+jsjrWwQLCBqGD7/uNBQGqA/FG+rBmsN2T RIYystA9s91Zb/cb/sPK+Pz9dyVg2dfzjKF54BNuXC028Dab/CnP02R/Lr4JKaxk/aY5 PcnQ== X-Gm-Message-State: AO0yUKXQIp33vlYCA1qUbJsGU46q2E269Aix3S/YJT+nzVLFhNaC8TK1 Z4AEJNUXCGaJShZCAzDMxOEX9XwTyioX5ivG X-Google-Smtp-Source: AK7set8FIbNEnLzmRi4EXz2XIrcMjJmP0aX8Vn2a2C3SBqg8k23IRSZ6fEARKdFStBZB4X62dUixVA== X-Received: by 2002:a05:6e02:1bcc:b0:310:e816:8c8c with SMTP id x12-20020a056e021bcc00b00310e8168c8cmr5192324ilv.3.1675091860513; Mon, 30 Jan 2023 07:17:40 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 125/171] Correct SPL use of PHY_CADENCE_SIERRA Date: Mon, 30 Jan 2023 08:15:26 -0700 Message-Id: <20230130151612.212732-126-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_PHY_CADENCE_SIERRA defined in Kconfig Signed-off-by: Simon Glass --- drivers/phy/cadence/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/cadence/Makefile b/drivers/phy/cadence/Makefile index af63b32d9f5..c247feb8262 100644 --- a/drivers/phy/cadence/Makefile +++ b/drivers/phy/cadence/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_$(SPL_)PHY_CADENCE_SIERRA) += phy-cadence-sierra.o +obj-$(CONFIG_PHY_CADENCE_SIERRA) += phy-cadence-sierra.o obj-$(CONFIG_$(SPL_)PHY_CADENCE_TORRENT) += phy-cadence-torrent.o From patchwork Mon Jan 30 15:15:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734199 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=np+sGK5p; 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 4P5Bv26Dq9z1yhq for ; Tue, 31 Jan 2023 02:29:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27E5885A41; Mon, 30 Jan 2023 16:24:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="np+sGK5p"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50DA98592A; Mon, 30 Jan 2023 16:19:11 +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,DKIMWL_WL_HIGH, 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-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 1FA2E8575F for ; Mon, 30 Jan 2023 16:18:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id g16so5237622ilr.1 for ; Mon, 30 Jan 2023 07:18:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pufmdIQaQ3toJE+nKvUP3n2mglQjXaisoRIAy3nS27o=; b=np+sGK5pWREGkdQkpY/pEhB0t11JFvjwwc7VoDmX/oxYxCenqXROdW/UOHexwJP/sQ AIOF279coBi7ZxICeuS0NeSDF74DZgpLiZ3GJWRuyV7gPUfWKu7wvlo8HvNITcx0grAU im7CqtbefRaxNflZiv9RvQTJR7YYXg55ILSSw= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pufmdIQaQ3toJE+nKvUP3n2mglQjXaisoRIAy3nS27o=; b=ZvQjKSHsy16+h1Gq/QGuhWxdwj2X0tVetpI/HifSJnnIa8+Z0d2rTceWSH7/6+8Hxk TK4n6q93GbBw5UQpiu1WqA/Pafa8DyyRRa38A/oqUGQ5BkoCc4spTyzab4tRgq15lEvh YQwB4oeJKztdVzg6XZ95lJUgwfoAqdzEohcIqyo3RcTX7PfpV1ELsh4JqbhiqNLWZ4pt AAYcBbFzyDXb8EE9pWRTbON3IWRqxHagWjzfS8SLGRAZ0TdiqNhVlpGSj4ZEmi1Oeqhm Meh8fimS0iOr/7u3uRg+JZDlpRK7R/MdkSJDaxOVf3Flf8lICHbMm+8UzDt14Cex2ixy c06Q== X-Gm-Message-State: AFqh2kp2l1xl0dmF5z928rpEUxIX1ZfQQyIyf+u9GDTBZs7JHYMS1B1j 0KAURSsumTC0l9RWk/QzVvcF2uPlIDokTg6n X-Google-Smtp-Source: AMrXdXtlGyALuAsuDxovQQriXX+GZ99ieScUYC6H/ldWEWOib4+zgCUmivMaAqKZ3vT9AOQVJgEJ8w== X-Received: by 2002:a92:cdae:0:b0:30f:5355:9c2 with SMTP id g14-20020a92cdae000000b0030f535509c2mr32638918ild.14.1675091861223; Mon, 30 Jan 2023 07:17:41 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 126/171] Correct SPL use of PHY_CADENCE_TORRENT Date: Mon, 30 Jan 2023 08:15:27 -0700 Message-Id: <20230130151612.212732-127-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_PHY_CADENCE_TORRENT defined in Kconfig Signed-off-by: Simon Glass --- drivers/phy/cadence/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/cadence/Makefile b/drivers/phy/cadence/Makefile index c247feb8262..a1cb6868c9e 100644 --- a/drivers/phy/cadence/Makefile +++ b/drivers/phy/cadence/Makefile @@ -1,2 +1,2 @@ obj-$(CONFIG_PHY_CADENCE_SIERRA) += phy-cadence-sierra.o -obj-$(CONFIG_$(SPL_)PHY_CADENCE_TORRENT) += phy-cadence-torrent.o +obj-$(CONFIG_PHY_CADENCE_TORRENT) += phy-cadence-torrent.o From patchwork Mon Jan 30 15:15:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734202 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=L5gGWJ0M; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5Bw628Ksz23hg for ; Tue, 31 Jan 2023 02:30:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A695985A3B; Mon, 30 Jan 2023 16:24:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="L5gGWJ0M"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8226D85943; Mon, 30 Jan 2023 16:19:14 +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,DKIMWL_WL_HIGH, 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-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 4E93E85988 for ; Mon, 30 Jan 2023 16:18:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id m8so5217974ili.7 for ; Mon, 30 Jan 2023 07:18:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EQpsNAsuRNnPguoPBGnEKcFYT6WTFkEhzyP6tkwom08=; b=L5gGWJ0MmRj/I1XzpcTO293lwsVrDjJ/DTcrlfpdhmRB5W5h7vMZ4ezReQf7euthk3 bs7sXNF7UGIRiL08fQsv3jq/c7C603Wfzi/XWLWHldebGvhR1Yffd8IUjdptEQqFOGOJ zXpRZyNrOTLgXVBN8TvW0Uhq4+2JAOdpehKAc= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EQpsNAsuRNnPguoPBGnEKcFYT6WTFkEhzyP6tkwom08=; b=ductVdBU7F2KkErrb2iPgeQj8BcHjLehYRVyI3jkmMIyU/R1JGx7Tz15o+t+Owt/Nz 2kJqvWjAaGwYLHSL9AiR4RnBlGu8LOH2iUY/7u3538wutBjWTMwsYvxz7NtML9ngeUyd dWzjeLKyGMgQZJbaDp777eopKeNvMmEQrhhKoB5gK2E51klMJhuwMeXiSPHoSmO9GPcl Zaj6NK3O4LkO1M3voPFy8XZyUTXHGUfNzBNjFMJsxOhxOmhX8yHztAoUj0nqU9k65G4m LXoEND22QWC/PCLQEMB26/ciH/pd3wKzTrXTAH+UZfD1VQE02VmL38t4B+c4An19PC8D 5mJA== X-Gm-Message-State: AO0yUKX5bCL9uWDVPISgeaD3XYaNQ3i27s3BCam8hHJkyTxZ7Y0h9TQn 5xqyp8+MagiYDamuOj7fk+EmtrBzhlIhIJ/b X-Google-Smtp-Source: AK7set/bWYyRcS6xfgdHMEKV6CMEm+sqxTTyT86wK9hho5e+x+y2NxdxOvedfYbO27dH/QnpmZa4NA== X-Received: by 2002:a05:6e02:198c:b0:310:d384:df25 with SMTP id g12-20020a056e02198c00b00310d384df25mr9018955ilf.5.1675091862010; Mon, 30 Jan 2023 07:17:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Ramon Fried Subject: [PATCH 127/171] Correct SPL uses of PHY_FIXED Date: Mon, 30 Jan 2023 08:15:28 -0700 Message-Id: <20230130151612.212732-128-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_PHY_FIXED defined in Kconfig Signed-off-by: Simon Glass --- drivers/net/mvneta.c | 4 ++-- net/mdio-uclass.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d45..24933473fa0 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -815,7 +815,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp) mvreg_write(pp, MVNETA_SDMA_CONFIG, val); /* Enable PHY polling in hardware if not in fixed-link mode */ - if (!CONFIG_IS_ENABLED(PHY_FIXED) || + if (!IS_ENABLED(CONFIG_PHY_FIXED) || pp->phydev->phy_id != PHY_FIXED_ID) { mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr); @@ -1176,7 +1176,7 @@ static void mvneta_adjust_link(struct udevice *dev) * be added). Also, why is ADVERT_FC enabled if we don't enable * inband AN at all? */ - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && pp->phydev->phy_id == PHY_FIXED_ID) val = MVNETA_GMAC_IB_BYPASS_AN_EN | MVNETA_GMAC_SET_FC_EN | diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 4401492ca01..989ab3e4c96 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -171,7 +171,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev, struct phy_device *phy; ofnode phynode; - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) { phy = phy_connect(NULL, 0, ethdev, interface); goto out; From patchwork Mon Jan 30 15:15:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734197 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ks4tNvje; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5BtX5jYGz1yhq for ; Tue, 31 Jan 2023 02:29:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CCF6785A30; Mon, 30 Jan 2023 16:24:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="ks4tNvje"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B96F985939; Mon, 30 Jan 2023 16:19:10 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 269CD85943 for ; Mon, 30 Jan 2023 16:18:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id l7so3350593ilf.0 for ; Mon, 30 Jan 2023 07:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c3A4gSIciR95I6cpBgQNml7gcK1i4a+WTuMf1OdkreI=; b=ks4tNvjeSimRyqC0fkvc2veMEGmVVTFyhsyC3i8YMjMxcseg/oafXRurG72av7nkuw Crmvik/C0GDxnO1g2F3kjmmy4adlo2lskMvJcd/wxrLbHRsTP+v4vB6VFEdsebm4oM1Q BWkL6PJO6isOT6mT64OYclOhSw8OZlrcWZW9o= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c3A4gSIciR95I6cpBgQNml7gcK1i4a+WTuMf1OdkreI=; b=LFg5p5bYiJR1u/Wn1iz3rcXpA9I5PvMx+Jqnr69/JzAgEak4YLHA2CEAMx5ZTJk+sP b0UtoTZdUEP02Q53oZoy/RHOkseP141ETY4m2O6D+PmhLEny2WHRSd7pRMd07hg2nOis RL7dicn34mQlWHWiNEOin8M9EYoB5dUQH+PND2Pknqy84k6ZwbG3flQWfO7x2cjUFhgs D6SEO9tS7JqS/Y4J45ZMOL3Rrk2U//U2Q+USgWPQ/PIlOsaXXXF8HaWavfffS/oGR9Tb bfhheIpojcyGf65dkh6CYgerh+05Kq2tn86hPT8pIVMkadodGgxzsUw9HIB79Ob3woEf gvYw== X-Gm-Message-State: AO0yUKUlpa7VMRFH9xqsnhFMGZhcvUbJhbrg9WJiahcNxgrjTzCiKiTJ 0mv7kV5rE2LlRJbsXkjY1+xYmNKzqlcTRYvl X-Google-Smtp-Source: AK7set/FkgY6/PfvE4WO0c3CErqSEpTh6jHcNO4Uhpq9+RoBtXa0pXpcMm8RQAMzbRzzO4vPv46Mrg== X-Received: by 2002:a05:6e02:1b81:b0:310:a9be:931 with SMTP id h1-20020a056e021b8100b00310a9be0931mr17043042ili.10.1675091862770; Mon, 30 Jan 2023 07:17:42 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 128/171] Correct SPL uses of PMIC_STPMIC1 Date: Mon, 30 Jan 2023 08:15:29 -0700 Message-Id: <20230130151612.212732-129-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_PMIC_STPMIC1 defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 9c4ba407ba0..baa156acf9e 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1583,7 +1583,7 @@ int stm32prog_pmic_read(struct stm32prog_data *data, u32 offset, u8 *buffer, int result = 0, ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; @@ -1633,7 +1633,7 @@ int stm32prog_pmic_start(struct stm32prog_data *data) int ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; From patchwork Mon Jan 30 15:15:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734198 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JLev+P8q; 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 4P5Btp2Bydz1yhq for ; Tue, 31 Jan 2023 02:29:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DB6F85A3A; Mon, 30 Jan 2023 16:24:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="JLev+P8q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B4E7859BE; Mon, 30 Jan 2023 16:19:08 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 3B6FC859AB for ; Mon, 30 Jan 2023 16:18:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id k12so192885ilv.10 for ; Mon, 30 Jan 2023 07:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N3AnpAltiVGw0RNVEKEMyX4P312PHdujPGxEZm3KHQ0=; b=JLev+P8qDVCWXk7Gw6xm/+KxJVXVoxdMokHR0Zb/hUytDBdUjPUXKlA4eFn0ezIC54 qcDi2je5+WAAnwBiM+2D9X8NxU8c9UGtI7ImLXTgiuk2taE9DjRRWGZOjysEmY9WT18y 10i+tGTHt249++7AwkWaBHZigBAJOCrBzyHkc= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N3AnpAltiVGw0RNVEKEMyX4P312PHdujPGxEZm3KHQ0=; b=i1F5y+DWSDa0r9/X7xxP2GTPyPlWFb8YvA30LDqD95kynHA15rG8rnepRVl19giLaN cYPbTpJQIFPObZUF5JWRv41cLnE0LgckUkjd6WA3+Vb3+sXS0oXgOaHatYZu36DwDqwu M4bu82uZlwtJZCfEtiFlZEj0OfXJvwDJfLIIooy8Cb1vubwgfZ5wa2S51tUvW2CH9F22 k1pfWDZNuFfTTQNyIwsj9kXhz26b1zwtZVuO4+ucPd/2xYMF4kgKx8//NOQ60/qN9PLv BHnDAwTgZpEVmF5/8QOtNfl8559IdgkhhYNWOqF6DRbrcwbanY7oD35Qoh+9vm+cPanL +nEA== X-Gm-Message-State: AO0yUKXN3eKxIc2VxdgpiD6t2uXzunzlhW6ePoyyYMqqpGcrzwV8KvOx ZhrgEqNrwEjleT4CG8fayVrBI14kTr2YLesB X-Google-Smtp-Source: AK7set/9As8v9wRP2NxKAMQDa9dmZ8mwrlwIQFAGR7xVmDUM1Y2Dc9m5SJzlBxxHxEUVAew+Bu0TgA== X-Received: by 2002:a05:6e02:1889:b0:310:36d8:79a8 with SMTP id o9-20020a056e02188900b0031036d879a8mr7913559ilu.17.1675091863515; Mon, 30 Jan 2023 07:17:43 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng Subject: [PATCH 129/171] Correct SPL use of QFW_PIO Date: Mon, 30 Jan 2023 08:15:30 -0700 Message-Id: <20230130151612.212732-130-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_QFW_PIO defined in Kconfig Signed-off-by: Simon Glass --- arch/x86/cpu/qemu/qemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index e54082df7f9..4f28dc75b70 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -17,7 +17,7 @@ static bool i440fx; -#if CONFIG_IS_ENABLED(QFW_PIO) +#if IS_ENABLED(CONFIG_QFW_PIO) U_BOOT_DRVINFO(x86_qfw_pio) = { .name = "qfw_pio", }; From patchwork Mon Jan 30 15:15:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734200 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=STYwYiev; 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 4P5BvK0qdVz23hS for ; Tue, 31 Jan 2023 02:30:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 97966859FB; Mon, 30 Jan 2023 16:24:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="STYwYiev"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47E6E859B6; Mon, 30 Jan 2023 16:19:08 +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,DKIMWL_WL_HIGH, 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-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 33D8A85989 for ; Mon, 30 Jan 2023 16:18:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id u8so5209736ilq.13 for ; Mon, 30 Jan 2023 07:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qDhKU3aHgq6J5Xh8IoP8QW/XVyXL3Cpc4jFZlgcmW28=; b=STYwYiev6LfXND0WKm2jqPEF7dhlBtEnUsfwtfHDdlwTo1MwXrDMplFzJnI6hXZwCf qlSJhuKjByXZhVO+cLBQCF+RcxEmBDyepqZLO6I1N2ShGR/IpYpybpR8xnO2Af0FH40q 3nZ7P8cabHADJY486oZLS+kdPSY1dWBiw9pVA= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qDhKU3aHgq6J5Xh8IoP8QW/XVyXL3Cpc4jFZlgcmW28=; b=hRQlPwthE8+L0qOToQcp9Z63wnzUiCFLx58k9/Nyap1D/abU3FaID4KXybEZccM6f8 Ze6wkSv2UQPzHsBHNax8EGZZF5heIFyrDSHSsstqyzVyET2Oq9wtXmD5VEjQ6ol+qMKe NPMwgYfPSV01MGJf9jd4KnZ2r1TAB+DvWO8OpaUIdP+/3tFGnmt9lJsEQxgnXQn6YLQg MTqt36n4FyCHFXTNmsKK3U314NeM0gfXECSe2IkfsSwkuZcJkHUHE0Y/m/5NSP+d+xp5 euR9GtmMhpfkmW6iAsZmWAMkvwM0oJOq1qXV2wD6DFYi+zAoXq5qwHIlXGad8y2pqcdm DsNA== X-Gm-Message-State: AO0yUKW0L4/y6F2YLTKCpkYdmx07D+D3KwWJ4LCx+8BpK3cpTUh8mhtN Xp44j6piYyfq6NWaNSl4mp/VXJiDfJazl7oQ X-Google-Smtp-Source: AK7set/b1EBn3mKJqHw38IKopUhuVvLZIHN6+6TPBSdhJ/hPSoobo/PnCLGvVoNUgHONQWVGwjTiaQ== X-Received: by 2002:a92:ca48:0:b0:310:ea90:76fd with SMTP id q8-20020a92ca48000000b00310ea9076fdmr4937276ilo.32.1675091864261; Mon, 30 Jan 2023 07:17:44 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 130/171] Correct SPL use of REGEX Date: Mon, 30 Jan 2023 08:15:31 -0700 Message-Id: <20230130151612.212732-131-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_REGEX defined in Kconfig Signed-off-by: Simon Glass --- board/xilinx/common/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index bed15319934..d071ebfb9cc 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -481,7 +481,7 @@ int __maybe_unused board_fit_config_name_match(const char *name) debug("%s: Check %s, default %s\n", __func__, name, board_name); #if !defined(CONFIG_SPL_BUILD) - if (CONFIG_IS_ENABLED(REGEX)) { + if (IS_ENABLED(CONFIG_REGEX)) { struct slre slre; int ret; From patchwork Mon Jan 30 15:15:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734248 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=nw/JZYgC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C9n0lKPz1yhq for ; Tue, 31 Jan 2023 02:42:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC6B4859FB; Mon, 30 Jan 2023 16:37:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="nw/JZYgC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4633F8583C; Mon, 30 Jan 2023 16:19:12 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 9C9FF85984 for ; Mon, 30 Jan 2023 16:18:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id l15so1398012ilj.5 for ; Mon, 30 Jan 2023 07:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D7tJ9bhj4/R0Y2uR1NsiVrvuRAJ9+ak/VLuHvO4pdz4=; b=nw/JZYgCOUzrWd2D6OZE/3/wkj1LjUm/DgfI2dBHVmULcLZuNwbMcbSShBWSEdVcqR REGYU+lhfD9uL3udfjary8lZIP9NPSdLUYl7OpvaRGY9yy4wmkttjjOpfKwuEZ/LCGGQ F0LsIi1yYq7jj51YB8Bs1PX1stlJtu7/yyVPk= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D7tJ9bhj4/R0Y2uR1NsiVrvuRAJ9+ak/VLuHvO4pdz4=; b=hLqSJf23hTy1NC+EHv9Lxx/+GwHipzTPgvGNf4Y1Z76Lj1qdNXmyVlwbi4dbmHWfCI 5GUcCYsZ0ooVvkh5iovT/GlkPscEeheUFiAuz2L0xNh/NP/cEYEULXxtkP+GrRDq8rFV GU9UuZok0Mks3WZUEHMp8+Hz04Ffyyb1oz9qxmxCqMWd3C+4ejapmBE+GtmghzvIGckD fYsoMYTRH2+BNpOu1PZX5jhz8IcQUp4DEVTKbRyXsN1MPdJiabpb0GLWKqC0PaYzZYB4 2LMgXYRKd4l7FO9+DH0EHU56S60GDFSMgrZAOosKRsr9HcCppTVRYACZFmXuA0SwCWI5 b7xQ== X-Gm-Message-State: AO0yUKXEiWyO27YYE6y8X0m4THwW7y3V8CycQwjWPe8ZeqbZkf5/WsO1 knDzYJFl/1ssuROge7nZ1UNuYinu9A1+5IBY X-Google-Smtp-Source: AK7set99KoPmkJgbBgHuiiR/DEQDRIek7ckvoQNXEKnQ6bzf3/uO6ul/hhnGbVKqpbME7JwW8QgxBA== X-Received: by 2002:a05:6e02:1d8c:b0:310:a935:46ef with SMTP id h12-20020a056e021d8c00b00310a93546efmr19311374ila.3.1675091865040; Mon, 30 Jan 2023 07:17:45 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Peng Fan Subject: [PATCH 131/171] Correct SPL use of RENESAS_SDHI Date: Mon, 30 Jan 2023 08:15:32 -0700 Message-Id: <20230130151612.212732-132-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_RENESAS_SDHI defined in Kconfig Signed-off-by: Simon Glass --- drivers/mmc/tmio-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index 59d5a0e22e9..b1556bba5d9 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -139,7 +139,7 @@ struct tmio_sd_priv { #if CONFIG_IS_ENABLED(CLK) struct clk clk; #endif -#if CONFIG_IS_ENABLED(RENESAS_SDHI) +#if IS_ENABLED(CONFIG_RENESAS_SDHI) unsigned int smpcmp; u8 tap_set; u8 tap_num; From patchwork Mon Jan 30 15:15:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734201 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JvWXcdMb; 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 4P5Bvh5DSrz23hg for ; Tue, 31 Jan 2023 02:30:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB70085A34; Mon, 30 Jan 2023 16:24:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="JvWXcdMb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F0C22859CD; Mon, 30 Jan 2023 16:19:20 +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,DKIMWL_WL_HIGH, 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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 C39CB857FF for ; Mon, 30 Jan 2023 16:18:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id l7so3350644ilf.0 for ; Mon, 30 Jan 2023 07:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DZnrzWjU1BRqHPO1wV8MS0QtJxhcIvg19vJLfzCkeb8=; b=JvWXcdMbw6SSiUGNDlkELxSra9QH98VLUKCC/bGo1/0hyhh/Cpo2JgzEmwrerJffKz uJdSmRiEo+1Wwo3qpuThMJ7FD3VHKThKXLxi3S4g625JurI8NSXEQNvi8L0O4CW4+fWi GyuzE+0nKo/7+5Ym1lFMBg/ZBxpU+BvhfXs7E= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DZnrzWjU1BRqHPO1wV8MS0QtJxhcIvg19vJLfzCkeb8=; b=csLYDjQTxQWIjIakz2Di+MSLZOblLAlHckFLZp5B6gcz0DxgUQ5VWGmaK4B+Iyo2fi flUAKFcnWhlNXT7AvtWMgTmHXFG6eBgc6NatKCUvD5EZisXFM1PudVEQrNqK1WNvrjgu bX00dt1A22yUPxRpDXA5PI12uRXdCRM2ppBmSbqHBtYNB6Y3FzJCR6sqj7TwtQZsUVYj A1siidPy1hnmNvvrHWOBcm3cey9kKILojM3Da5fXTx95qISSU/1wUgQ41oz7FVU5OD39 iajdWc0qJMCxqqYdx7TvGpft6kN/xtH4YTKHPNIbHrJUiEjuNndDnBUNoN+h7b0mVkvD tmOg== X-Gm-Message-State: AO0yUKXvublntPNqWD1esxu+/lUYOUxd7L/E7L5ydJJCgN/RtpJEB2G8 EUB2CY9eMx7nJ6HGFdpj+D8vtBQAi+3C0gPT X-Google-Smtp-Source: AK7set+wozwQwwfGl/LipsFtdws6DXLdvCjO4nv3r6bZ3QktWnBxKIje731l6jfIOAwqfsb843hCLQ== X-Received: by 2002:a92:cd84:0:b0:30f:e743:d196 with SMTP id r4-20020a92cd84000000b0030fe743d196mr23598494ilb.2.1675091865763; Mon, 30 Jan 2023 07:17:45 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mathew McBride Subject: [PATCH 132/171] Correct SPL use of RESV_RAM Date: Mon, 30 Jan 2023 08:15:33 -0700 Message-Id: <20230130151612.212732-133-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_RESV_RAM defined in Kconfig Signed-off-by: Simon Glass --- board/traverse/ten64/ten64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 13aafb5de76..9e4c84ad2f4 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -211,7 +211,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) base[i] = gd->bd->bi_dram[i].start; size[i] = gd->bd->bi_dram[i].size; /* reduce size if reserved memory is within this bank */ - if (CONFIG_IS_ENABLED(RESV_RAM) && RESV_MEM_IN_BANK(i)) + if (IS_ENABLED(CONFIG_RESV_RAM) && RESV_MEM_IN_BANK(i)) size[i] = gd->arch.resv_ram - base[i]; } From patchwork Mon Jan 30 15:15:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734257 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Gppx+F7P; 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 4P5CTL2hBJz1yhq for ; Tue, 31 Jan 2023 02:56:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 81FDE8595C; Mon, 30 Jan 2023 16:55:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Gppx+F7P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D3FA48599F; Mon, 30 Jan 2023 16:55:24 +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,DKIMWL_WL_HIGH, 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-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0: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 E62E4859A3 for ; Mon, 30 Jan 2023 16:19:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id i6so1361537ilq.8 for ; Mon, 30 Jan 2023 07:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y6hsvwAeziUSfcWd3RQC1943JEssBVYvkpZOvbLBjcc=; b=Gppx+F7PCcMPJr4j8loZGLl35Hww6+GzgLaD54kRLU9lySBo4BIE9ZBxlqhRR+GTL8 Ynhc6icF/RU4I/vxyEU2meZCBR6GbQD/pSxO/8uu1LMCcNzNYypapyuJi86iH/r4GSds iYrePmsLY/xRUQ0+pRTE+yNT+EqPay/4Q4Mu4= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y6hsvwAeziUSfcWd3RQC1943JEssBVYvkpZOvbLBjcc=; b=jqjWu2092zAjBY5oZyTGoNJq/U9sqNQJiSlFQln3n1eDrIwpLuHrQjqmYraZWKG2aK BuXWV/QE8f14VlUMdt3+fI1SVDG6CUSM0Gxb+qFWGOZVRn3/pNybkD6m28lplIqmUtJo o+TzRde8WBG+pZWvlGA0YbC3byyoY0t+ixiM3d0Be//aArvPREjO2wFewlWTEmT0n4wl LiRW9ia6kVCmoC+sFpuH17Ul36vvrHYkGV+OcQVzHZEs9t+wbKwpWM3pbbC8y6sx5gsH lo4RUS5Jp5pZodyXC58HUA+eCjTsNAET0E0b0VMv+pUlLenyYefTeZtA/mkDYdZwI9l5 UQtg== X-Gm-Message-State: AO0yUKU6jvOoSPWV39ZGJ/z9yn34e6Lv7oTvGWljhB/MNWQmEoJ++ogD qgt8UFjREXDK5U0jfHvqdFiSOVwl6fYNQejE X-Google-Smtp-Source: AK7set8yV2mAyS3f+eOjRiGpwreHXHB9Tc8o8+8HavpONnl8bDTJKUCjBrBGCQL4PqXo15mfibNNgg== X-Received: by 2002:a05:6e02:1cad:b0:310:fdd5:c1ec with SMTP id x13-20020a056e021cad00b00310fdd5c1ecmr1656763ill.22.1675091866534; Mon, 30 Jan 2023 07:17:46 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich Subject: [PATCH 133/171] Correct SPL uses of ROCKCHIP_EFUSE Date: Mon, 30 Jan 2023 08:15:34 -0700 Message-Id: <20230130151612.212732-134-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_ROCKCHIP_EFUSE defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-rockchip/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 01aedadf2c6..437c7cf896a 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -60,12 +60,12 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) struct udevice *dev; int ret; /* retrieve the device */ -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_efuse), &dev); #elif CONFIG_IS_ENABLED(ROCKCHIP_OTP) From patchwork Mon Jan 30 15:15:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734206 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=bQGxktuj; 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 4P5BxH0mbXz23hg for ; Tue, 31 Jan 2023 02:31:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D06585972; Mon, 30 Jan 2023 16:25:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="bQGxktuj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2F890859A9; Mon, 30 Jan 2023 16:19:27 +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,DKIMWL_WL_HIGH, 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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 E9071859A7 for ; Mon, 30 Jan 2023 16:19:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id g16so5237739ilr.1 for ; Mon, 30 Jan 2023 07:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rLReZRs57K/xSUW+VLjZfcopFx/6zAxd23zIX+o3By4=; b=bQGxktujzZaSI3qzePQhie42dYk9QxZQ/f0eK7GShA+kicH7/HHhSGqsaRo81BKu6d LOD6sGhE4PZ22vGWCPTp5gwhqSK7HsO7wBIz857geNvDksHFPS/0Ivg8AJm/0BBf6xkB M2ETDT6sEvxOTyx9N1ipeV0rg4YICirOdA3Us= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rLReZRs57K/xSUW+VLjZfcopFx/6zAxd23zIX+o3By4=; b=jRhgwKuD8h3cQ7Vq3NqnPcz2U7PF+cJ8cazg8QkSZADFyOJl/NB6jArB101e7IRs1q DOhqUVmg+VEP9KEogiDXWYeWAdHegHArjiAP/bEMp2fwNfWV0WaJbM/toNG6iAuDdpIK PPG34gn8b5fbueo6TZXVzK9IuXDjQ7UbrsY3UH3JktQ3n2psgrqS+yBHfDnPyUDpEZNO +I8m1pSPyiDX2cviRlgGdZcIi+VH4be/xvffuHqAkQmcrwue3fGiT/9tLMEfMdvmJ/8p WxUvWdC68c0LqYPC1deW8kY+AMCT4gGsczxjdRoXFYuSNxESbMSWG9zFdGFzP7M8PEOf Kygg== X-Gm-Message-State: AFqh2krS8IRpxVymymzL/k96hQCsAO6PyPTEfKbH1ZkJk+T7jrCvfTM9 DtoPOBPNpiJpIHfxGqtEd/J3IhAwo9NSTZb3 X-Google-Smtp-Source: AMrXdXtC5CzPtrW6Q+zLPlrqgx1aUfpxDhLE2uL/4uoJYkXwloYsMqxhT1DYkkJI9DKVDQ27XnOyvA== X-Received: by 2002:a05:6e02:1ca9:b0:30f:36c4:8c6b with SMTP id x9-20020a056e021ca900b0030f36c48c6bmr37480348ill.6.1675091867286; Mon, 30 Jan 2023 07:17:47 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich Subject: [PATCH 134/171] Correct SPL uses of ROCKCHIP_OTP Date: Mon, 30 Jan 2023 08:15:35 -0700 Message-Id: <20230130151612.212732-135-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_ROCKCHIP_OTP defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-rockchip/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 437c7cf896a..b350f18f114 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -60,7 +60,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || IS_ENABLED(CONFIG_ROCKCHIP_OTP) struct udevice *dev; int ret; @@ -68,7 +68,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, #if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_efuse), &dev); -#elif CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#elif IS_ENABLED(CONFIG_ROCKCHIP_OTP) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_otp), &dev); #endif From patchwork Mon Jan 30 15:15:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734205 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=atPuJGB+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5Bx36fGhz23hg for ; Tue, 31 Jan 2023 02:31:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3805385679; Mon, 30 Jan 2023 16:25:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="atPuJGB+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5212B859A9; Mon, 30 Jan 2023 16:19:21 +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,DKIMWL_WL_HIGH, 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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 D56B2859B4 for ; Mon, 30 Jan 2023 16:19:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id i6so1361568ilq.8 for ; Mon, 30 Jan 2023 07:19:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+uc7OJkI99iQXX0+ZhkQXIr9gM/hGlMD+er4USpuz9E=; b=atPuJGB+mtFaa0Y0mkduIkubbPY+X0f6KTVNEvOerXIDG/ZP1VDTpH8QE8OqZa8ZKb bZ1kQ4KPVOgvlTTBxOpBWHIIeaIrp7E2ozTl2iohaOFxZWeUss8hrHudK/G2poULa91n jhPB6s8PB1AV1STzNMXAkp2TMZnNLavGv3wXg= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+uc7OJkI99iQXX0+ZhkQXIr9gM/hGlMD+er4USpuz9E=; b=GJF5twMB+FqMe8F1rhlTUDJA0bApzGBew5cqbs4p2eeHguCO7Uqr/gppzYwKs8wHZq Bi1trAkbSmVjE5yVjR5t3TCg91w9xidCjYwCZwcoOXrV1E9zgZRSyJl5HYSLeikr5zv1 eq4j8bJpkxGfw5NwmMV2KHEcNQdWR+W4GvnxhMlGhZM9+M2qR38BI23j1PTmwgDNADIJ I/soqY+Shwtlfu3+9SrZGxzqtnB3OCE851+GOi9i+8zJPZmvo4sI8vmiC5PiJshO3eQa 9KWdos2vsDUnA5IVzPIZNupiaifLVmt3MyaGl9p/OJN5IgCKpd6kZRZJQ/paUW54G+PH 87jQ== X-Gm-Message-State: AO0yUKX58K46meS5juNTncuOCwI5CJef44U47a0nGwwpcNtOBAlarR8I 0oeDS3YPNY+BByf6Tok/DM5PeiUljHsPFTTd X-Google-Smtp-Source: AK7set8UT1OH1ANf4fVNaI1OcG0czhfngM0QxQzQ2bjt/oT3yVqvx91+ZR4pC5eB3KJ+h8xs0UfnRg== X-Received: by 2002:a92:c249:0:b0:310:b90e:9caf with SMTP id k9-20020a92c249000000b00310b90e9cafmr12432874ilo.2.1675091868333; Mon, 30 Jan 2023 07:17:48 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 135/171] Correct SPL use of SANDBOX Date: Mon, 30 Jan 2023 08:15:36 -0700 Message-Id: <20230130151612.212732-136-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SANDBOX defined in Kconfig Signed-off-by: Simon Glass --- drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index bc9c17bce84..d80281fd3dd 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -541,7 +541,7 @@ static int single_probe(struct udevice *dev) INIT_LIST_HEAD(&priv->gpiofuncs); size = pdata->offset + pdata->width / BITS_PER_BYTE; - #if (CONFIG_IS_ENABLED(SANDBOX)) + #if (IS_ENABLED(CONFIG_SANDBOX)) priv->sandbox_regs = devm_kzalloc(dev, size * sizeof(*priv->sandbox_regs), GFP_KERNEL); From patchwork Mon Jan 30 15:15:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734246 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=dEK/b4Yu; 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 4P5C8k1kP5z1yhq for ; Tue, 31 Jan 2023 02:41:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1BA3C85AAF; Mon, 30 Jan 2023 16:28:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="dEK/b4Yu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BF3988598A; Mon, 30 Jan 2023 16:25:49 +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,DKIMWL_WL_HIGH, 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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 D912E859B7 for ; Mon, 30 Jan 2023 16:19:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id z2so4649401ilq.2 for ; Mon, 30 Jan 2023 07:19:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gzgj75C4WHmYDqySykvj/a1+Oc494n9ixcf3PopgDZA=; b=dEK/b4YuJQPc1stY+DHQ0nOxCJkbeWTxeBeCcnlBL+yGExKSQSC4vVA+0mzZDyNLMn bv2WW2GNfUhhFHhujORjG6Qg12grAST9V2VD+VzMZTqI6JtRcO6VzwJb6lbhZwSj+N6g O4nQOPOj+3qTMAaYdwMGuiAy7/GFAAMApodcE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gzgj75C4WHmYDqySykvj/a1+Oc494n9ixcf3PopgDZA=; b=NahNxoSbfuv4yK7QGSsQ7HeR2C1e0ib1UfHjun7IxVc6CIzjsIXTfduz4lcoUb/D88 LrvAySRxi54ZT9vD/5cptVIOyFKr+D79Ugnia/EAes+11sEE3sPeuoG92M+VOlmm4HFm EtJcXDqMEhM9RnLAjYjdpl1Cm4usZ900yWi9qVu4/GNf8UPo73p0S/12qSwgQYVhwCI5 xrWosQoghQ3/tay8o3UrsBQmveetT+rh5NQgl8F5sTGkxU2CdGCfrmyxDjqmylQbckTN TQkFfSZaz03//1O6r17ikl6T/9bMmxIQTfEsX6KzbXhDUonlNmQS6Ec0TNorlQwXSLOI e1IQ== X-Gm-Message-State: AO0yUKVXylwi+dnLsPJ9En9jKyuHnySDJCfCzo5goBc3UPWxspO0mnEd xmIrY8Zd3QPB1tMGPpEvP0ToDj7rajOzE00S X-Google-Smtp-Source: AK7set8Pe9pmVFhsakoJBpZFE5YoCAqhq66hZjgyT1mYI8vKfCtJoLxEUUTwmut7WEHWxOJcWrc/qw== X-Received: by 2002:a05:6e02:1a42:b0:310:f7e4:a935 with SMTP id u2-20020a056e021a4200b00310f7e4a935mr2801185ilv.22.1675091869137; Mon, 30 Jan 2023 07:17:49 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Lukasz Majewski , Peng Fan , Sean Anderson Subject: [PATCH 136/171] Correct SPL uses of SANDBOX_CLK_CCF Date: Mon, 30 Jan 2023 08:15:37 -0700 Message-Id: <20230130151612.212732-137-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 12 usages of this option to the non-SPL form, since there is no SPL_SANDBOX_CLK_CCF defined in Kconfig Signed-off-by: Simon Glass --- drivers/clk/clk-divider.c | 4 ++-- drivers/clk/clk-gate.c | 6 +++--- drivers/clk/clk-mux.c | 8 ++++---- include/linux/clk-provider.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 7e8e62feeee..6ab137a72be 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -81,7 +81,7 @@ static ulong clk_divider_recalc_rate(struct clk *clk) unsigned long parent_rate = clk_get_parent_rate(clk); unsigned int val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = divider->io_divider_val; #else val = readl(divider->reg); @@ -210,7 +210,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, div->width = width; div->flags = clk_divider_flags; div->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) div->io_divider_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index aa40daf3d79..a8775c77dc2 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -62,7 +62,7 @@ static void clk_gate_endisable(struct clk *clk, int enable) if (set) reg |= BIT(gate->bit_idx); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -96,7 +96,7 @@ int clk_gate_is_enabled(struct clk *clk) struct clk_gate *gate = to_clk_gate(clk); u32 reg; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -142,7 +142,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name, gate->reg = reg; gate->bit_idx = bit_idx; gate->flags = clk_gate_flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) gate->io_gate_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index b49946fbcd5..184d426d0b3 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -90,7 +90,7 @@ u8 clk_mux_get_parent(struct clk *clk) struct clk_mux *mux = to_clk_mux(clk); u32 val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = mux->io_mux_val; #else val = readl(mux->reg); @@ -137,7 +137,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) if (mux->flags & CLK_MUX_HIWORD_MASK) { reg = mux->mask << (mux->shift + 16); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = mux->io_mux_val; #else reg = readl(mux->reg); @@ -146,7 +146,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) } val = val << mux->shift; reg |= val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = reg; #else writel(reg, mux->reg); @@ -194,7 +194,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name, mux->mask = mask; mux->flags = clk_mux_flags; mux->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = *(u32 *)reg; #endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 2d04882d053..b8acacd49ee 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -65,7 +65,7 @@ struct clk_mux { */ const char * const *parent_names; u8 num_parents; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_mux_val; #endif @@ -93,7 +93,7 @@ struct clk_gate { void __iomem *reg; u8 bit_idx; u8 flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_gate_val; #endif }; @@ -121,7 +121,7 @@ struct clk_divider { u8 width; u8 flags; const struct clk_div_table *table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_divider_val; #endif }; From patchwork Mon Jan 30 15:15:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734243 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=d/s7HfKH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C7n3kbgz1yhq for ; Tue, 31 Jan 2023 02:40:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B951585AAC; Mon, 30 Jan 2023 16:27:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="d/s7HfKH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C139885978; Mon, 30 Jan 2023 16:25:47 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 D4113859BB for ; Mon, 30 Jan 2023 16:19:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2a.google.com with SMTP id l128so588713iof.2 for ; Mon, 30 Jan 2023 07:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U0iesaMotnT30YwjjpCkOfMStQAxKFhZFC0cN+SVJEw=; b=d/s7HfKHXDDSQOI8M1Mn7RJ09IazuEd5VmOPR8uSeq9Kh4uZlabxdCju/9FviOTmdB EZx0kuo5NLEvv1c8sWegYXXD7i8/IpOLkfBNMRqSYDGScISH+ZiVW/Dl8KbPz7Gk7zPZ 4+MmOcAkfXqVuyiv8jG4Lvf2GWPxRarOg+YnE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U0iesaMotnT30YwjjpCkOfMStQAxKFhZFC0cN+SVJEw=; b=SEmYe0oDsUUiEyUnlt/oLpwtfSmpbqdvGbAI/n4ATsaE2lqcqqxaM8rDbPemItu9Qc enUsqxisEQhtlokERUpmbJ/bXkquo7YrO2yq4iHx6NcLouXakLLGtEL5F1iI875i7Jiw cQNiZ1DHvfWZnN/wSZ/O0Kxww7BJ3Yt0qR09voQw6/+FVd4czzjTRNdlHQsCurkH8exI scYgTPl102u+HoI0TFO2SvptM7t4XRJ33CV06tMwFWPiFMs5aYeQ9zu//RBQsY0heGYD p6bYy01AjuNaqbG+QDL+OiKqz/qvH1ARbJJjWhJCxQxYQ+tEEh7nRRG9L5CdlyWQ8vhG qSJg== X-Gm-Message-State: AO0yUKWAmTAE2sIog7toFkEwap1X680AD846jVd0PoaIVjZ43NJpkpOB QHxrAmhKXNt10t6FUvz0QDX/HQ1zu5TIgzSs X-Google-Smtp-Source: AK7set9AcSI1/1MP+yrMLs64CpjwNAdNDqrLt/lY4lpz++WTqMOSmBvX1+jCNk032rSwQOQi+mia8g== X-Received: by 2002:a5e:8b03:0:b0:715:a675:d449 with SMTP id g3-20020a5e8b03000000b00715a675d449mr6437104iok.6.1675091870041; Mon, 30 Jan 2023 07:17:50 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Dzmitry Sankouski , Ilias Apalodimas , Marek Vasut , Ovidiu Panait , Rasmus Villemoes , Stefan Roese Subject: [PATCH 137/171] Correct SPL uses of SAVE_PREV_BL_FDT_ADDR Date: Mon, 30 Jan 2023 08:15:38 -0700 Message-Id: <20230130151612.212732-138-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_SAVE_PREV_BL_FDT_ADDR defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/lib/save_prev_bl_data.c | 2 +- common/board_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f4ee86a89c6..cd943eefe10 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -60,7 +60,7 @@ int save_prev_bl_data(void) return -ENODATA; } - if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) env_set_addr("prevbl_fdt_addr", (void *)reg0); if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR)) return 0; diff --git a/common/board_r.c b/common/board_r.c index 2cd66eac803..56c50f43baf 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -453,7 +453,7 @@ static int initr_env(void) (unsigned long)map_to_sysmem(gd->fdt_blob)); #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ - CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif From patchwork Mon Jan 30 15:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734244 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=lpWDf1Nc; 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 4P5C801nqvz1yhq for ; Tue, 31 Jan 2023 02:41:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1197585AC0; Mon, 30 Jan 2023 16:27:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="lpWDf1Nc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11AF8859EE; Mon, 30 Jan 2023 16:25:48 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 36546859C1 for ; Mon, 30 Jan 2023 16:19:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id h18so2450544ilj.6 for ; Mon, 30 Jan 2023 07:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KuASlOTpt21F7/eXfM4sLubsneFv/t4BVrwr4fZ7boY=; b=lpWDf1Ncp85OVkbu86V6ny9nBYpNmRgfEaef9hLww9q51ngI4Fb4vc+f8kW8TSzCLs jKbQtekVV/p9U3Y0hgh7GITrw0g2KcqsDlV6LOwG4min5oLxgMP98RvM0ibCk0eQcFiW L6yqNYUHB9X6T7ue6mWwUqOO74jwdNWyxaUF4= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KuASlOTpt21F7/eXfM4sLubsneFv/t4BVrwr4fZ7boY=; b=DE+vI/L1hhK5nzWrem4LdXh073x451ywhl/pvUXQD6BKyo5hb3Y56mm/iqWaDGgnqs 6k/ps71zr71AfMcXLCnF6fLlblBVzh6ItJw3PqkEQaI+XtacPIpdRQ4jCXZg7k/z0z1a FGhHw2W/hDHhFy7O98bsosROmIMlTAf2oe7tTsH+8ZS2u+pNdwiVpmM/25pHxCyFPAxR d4Xac1jVsqEZQlQ/e4ebtF7bCl/meFleXQzElpv2BKIgE6mODcC17OBrMEnnYhJtaq3B RQOBMOzG7bCtHvrHlLqcgzbiGqjJXtyktvOgpcrV1SKX2OMweY88+jpWfqFlJ4QZM0cD fCOw== X-Gm-Message-State: AO0yUKWjh5qUA8XVtZojJfKB1RnIQ09pwGMify/Q4XTVWwwnJgHp0TNj dhMNONi3+yGriwNS2bMNheROaoNo32qc1Cq4 X-Google-Smtp-Source: AK7set+aKOxxZjHpdCgo5ESaNZ8IOaCGJjk95IKx5RUCecxX53wveD+8nzMtSM/Oj1Znk6DJKaRUMQ== X-Received: by 2002:a05:6e02:1a0d:b0:311:7e6:f59 with SMTP id s13-20020a056e021a0d00b0031107e60f59mr274764ild.1.1675091870966; Mon, 30 Jan 2023 07:17:50 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , AKASHI Takahiro , Dzmitry Sankouski , Heinrich Schuchardt , Ilias Apalodimas , Marek Vasut , Ovidiu Panait , Rasmus Villemoes , Stefan Roese Subject: [PATCH 138/171] Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR Date: Mon, 30 Jan 2023 08:15:39 -0700 Message-Id: <20230130151612.212732-139-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_SAVE_PREV_BL_INITRAMFS_START_ADDR defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/lib/save_prev_bl_data.c | 2 +- common/board_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index cd943eefe10..f7b23faf0d6 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -62,7 +62,7 @@ int save_prev_bl_data(void) if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) env_set_addr("prevbl_fdt_addr", (void *)reg0); - if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR)) + if (!IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR)) return 0; node = fdt_path_offset(fdt_blob, "/chosen"); diff --git a/common/board_r.c b/common/board_r.c index 56c50f43baf..df88a9dd63b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -452,7 +452,7 @@ static int initr_env(void) env_set_hex("fdtcontroladdr", (unsigned long)map_to_sysmem(gd->fdt_blob)); - #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ + #if (IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif From patchwork Mon Jan 30 15:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734242 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JHVv6BsM; 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 4P5C7X3q3cz1yhq for ; Tue, 31 Jan 2023 02:40:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5506C859BF; Mon, 30 Jan 2023 16:27:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="JHVv6BsM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1524A8593F; Mon, 30 Jan 2023 16:25:46 +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,DKIMWL_WL_HIGH, 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-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 035AF859B2 for ; Mon, 30 Jan 2023 16:19:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2a.google.com with SMTP id r6so2057143ioj.5 for ; Mon, 30 Jan 2023 07:19:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nhXlWpt8HdeAI6+ysPaEwMi/gnQtMDLQzYjFSvT2Byo=; b=JHVv6BsM0zX7JBmIlwfkkMUthavReAGuilHxhEJ9OAGApTbDxklj4HFxMqsWfDjPei ZbuH+8XhxkxtDboQQG44h19C0gaI4Vf9KB4wUZ328X4Lni/DdrxMYb9vbVhw3a9HY8/H AFGOuSneJb/rIqcdIiC9yW4OQwEJ/DP99QUa4= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nhXlWpt8HdeAI6+ysPaEwMi/gnQtMDLQzYjFSvT2Byo=; b=znv4mNVuf6f6Luv5QUi8IPBv+mLDJ6PP/StkspQapjQ5OGa7o0oNkg3zINafOq8K9b ko0NQcG3Fhm+tBLpNTstG7JTrlu/a9b1kU5XRzbiZfjdhSSkMBLD9T5vBOcmFvzac0Ph K7ITLtsUkBHXvPmbMWsE1Rf1BZFy/sxui8jBGgXehhNA3Yzc1W4owJTCrASIurd42jUD DS5YDYUvriwVIfQjxFWkYNs+pU38sSUTDSbURtnPRzk1UXig1rw8Y+5qPfu07/urkVS8 uL35UYlhK6MUpKL080U4K8IHl3NW+H7vKYrYFn/kIWizfZqRD3la7nqiVOPn01m08QfN 1s1g== X-Gm-Message-State: AO0yUKUiZfMU1nnLmuuvnVOjhdYt/2r0TPeR7iESeFQctvw2PrfGa1pa eNJ//rtSvZG/TMSxpi3qBXWnK3Ejo81mz/Ch X-Google-Smtp-Source: AK7set9erocvav4+5MQZnuCRdSwbmeVSQElap9A23RAQbv2Qn9HZ8PlRnRaEF2XIuSysTTEtHdD5oA== X-Received: by 2002:a5d:9590:0:b0:715:bb52:f86f with SMTP id a16-20020a5d9590000000b00715bb52f86fmr5900260ioo.5.1675091871787; Mon, 30 Jan 2023 07:17:51 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michael Walle , Priyanka Jain Subject: [PATCH 139/171] Correct SPL uses of SEC_FIRMWARE_ARMV8_PSCI Date: Mon, 30 Jan 2023 08:15:40 -0700 Message-Id: <20230130151612.212732-140-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_SEC_FIRMWARE_ARMV8_PSCI defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 9bfe3815e51..afb2dd6c5b6 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -18,7 +18,7 @@ __weak int psci_update_dt(void *fdt) * number to support detecting PSCI dynamically and then switching * the SMP boot method between PSCI and spin-table. */ - if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) && + if (IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) && sec_firmware_support_psci_version() == PSCI_INVALID_VER) return 0; diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 29020bd1c6b..69e688f677f 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -64,7 +64,7 @@ int arch_fixup_fdt(void *blob) #endif #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \ - CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) + IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) ret = psci_update_dt(blob); if (ret) return ret; From patchwork Mon Jan 30 15:15:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734263 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=XbwxkgAK; 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 4P5CVg00b3z1yhq for ; Tue, 31 Jan 2023 02:57:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C143D859EF; Mon, 30 Jan 2023 16:56:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="XbwxkgAK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80AA8844AE; Mon, 30 Jan 2023 16:55:49 +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,DKIMWL_WL_HIGH, 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-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 A78BF859B9 for ; Mon, 30 Jan 2023 16:19:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id u7so3698541ilg.4 for ; Mon, 30 Jan 2023 07:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yAHmakSlhfMlLLvrNvnFAJs/nGH85uYpFbh9eQ69rLs=; b=XbwxkgAKkX7deqUVZ/d7JEwNEpQXwwLDEdXX9wkzlMghqZILSPR5x7PTnkaJY4W8ZH pB+ASBGKCoPgbgRjaFFKvcyxJkAasrhSX844ljdGfLk4tFwilb6xGg1h/7PRV7PMeUy2 yzh9fEQxyxsJ4g1cWq0cMsAeYj9JFLeHi883I= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yAHmakSlhfMlLLvrNvnFAJs/nGH85uYpFbh9eQ69rLs=; b=v8+pQkJ0gz9hbKRR+vReQPiKUIrR6qQnSUcZCOF3zsIgVCzlQhiGJTvzkN0gdthb8+ EIc4U+iid4XTHQKJ1a4HPpEtAODeONJe8c+dGiJo5dk8PpfzINr0drh3WpYzKLO02A6B ygX0pa446zTFb9vPT90MU821KTU0JF0+//fDH1vKPAoeV1j2K6sMr2zmR/stAx2ypd0+ rDwgUJ6r+SjT/A9tgjFyyiocre8ngakhWknhChxz6FdZ0RLKSY/0iP4tA52RhYuUMoxK jFKgHInUxJ7z++FqCkZE7nupa6ZdzMKMU8zX6RwHxi7LowF0vWmgL0TxfW56B5MxTmiO OiLg== X-Gm-Message-State: AO0yUKX3yJ5ByHLgc/bcIuHehUrsuXRaNy4folAi/C8eCN80BoQ6ftVQ 717AiT+jSrL51de0qScur0Gi+XCvk72qYDmZ X-Google-Smtp-Source: AK7set8bdnf54xzgh/R97dCmdV/HN+yM8+6UyreOgehkndAoKu85ZzDZXcul8tYhlvHUc+Kx7XEzpg== X-Received: by 2002:a05:6e02:1889:b0:310:36d8:79a8 with SMTP id o9-20020a056e02188900b0031036d879a8mr7914244ilu.17.1675091872771; Mon, 30 Jan 2023 07:17:52 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:52 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Anup Patel , Atish Patra , Palmer Dabbelt , Paul Walmsley Subject: [PATCH 140/171] Correct SPL uses of SIFIVE_OTP Date: Mon, 30 Jan 2023 08:15:41 -0700 Message-Id: <20230130151612.212732-141-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_SIFIVE_OTP defined in Kconfig Signed-off-by: Simon Glass --- board/sifive/unleashed/unleashed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index f8aad862c6d..b6ab06a08fb 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -27,7 +27,7 @@ #ifdef CONFIG_MISC_INIT_R -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) static u32 otp_read_serialnum(struct udevice *dev) { int ret; @@ -53,7 +53,7 @@ static u32 fu540_read_serialnum(void) { u32 serial = ERROR_READING_SERIAL_NUMBER; -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) struct udevice *dev; int ret; From patchwork Mon Jan 30 15:15:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734217 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=afGCe6Us; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bz917Yyz23hg for ; Tue, 31 Jan 2023 02:33:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E23E085941; Mon, 30 Jan 2023 16:26:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="afGCe6Us"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DB05C859BD; Mon, 30 Jan 2023 16:19:35 +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,DKIMWL_WL_HIGH, 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-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) (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 8C976859C0 for ; Mon, 30 Jan 2023 16:19:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12a.google.com with SMTP id k12so193095ilv.10 for ; Mon, 30 Jan 2023 07:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jZBK49jTgot+riIeCxSEZYudVzcD62n3q2uOTXaC1rU=; b=afGCe6UslmthQ5Y2hLPaM6zZK2xmp3KZJUoKsN6CbGiuzJ7VS0LxKiLib8wNND1cFm hQEOA4ZPcRbxKHtI9zo1Elq5/NhtoMLUMhyreigstKOMGWmZ5BdErkiE+JygaXyT0z3r s90ssuFdAdA4ftH9gX+K+7MGJAUL5dUqiK8S8= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jZBK49jTgot+riIeCxSEZYudVzcD62n3q2uOTXaC1rU=; b=QgZJG8o5VCIBgXBSip3j8RRMPullGOrWLGdX4esCNIvMQ7sMR4RZO563jHCn3yaVJL tEjmSUxkVT/E6tEO9T6KJRrlALxi4CPH4FPzSb3rdkapYD96i2ZwkZ/cTAwZUtcbGEDP Z+8DR1caIKKqTxsv9CvgM1CsTWtXplEAmPvcMI9lzJ3fjE8Mg/Uk+FBIsZ2/1UQ/M2WY h6W6gpAnQit3F5qRQiZRN35tMyEZnEHaYRiaLFpKcZ+mlH85hyX3bDxUJu33f3cJC+Ub hw/wp0/ndXBSX8pyx7NMt3qqttbdNabrE4o1QyBfu6rLaZgU1kKQh8loarCC7huHy8Tm CjVA== X-Gm-Message-State: AO0yUKVoqZ+7+t8jmXFvQWCpgbD6qmwhnHpqzsjPrLoLo8zvhhB+4mgZ yROEeeYVCK6OWtE/ajqXrsqXy3bs+N9J4shS X-Google-Smtp-Source: AK7set/rGrQksxpstEVlRjUmAbzR7Cnvbp0F60NxQDxiJWkV410k6i490ioYTY9WeCRIr2iuDKi3cw== X-Received: by 2002:a92:c268:0:b0:310:b713:3360 with SMTP id h8-20020a92c268000000b00310b7133360mr12191949ild.7.1675091873691; Mon, 30 Jan 2023 07:17:53 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michael Walle Subject: [PATCH 141/171] Correct SPL use of SL28CPLD Date: Mon, 30 Jan 2023 08:15:42 -0700 Message-Id: <20230130151612.212732-142-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SL28CPLD defined in Kconfig Signed-off-by: Simon Glass --- board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 4ad6b323476..257923685a5 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -109,7 +109,7 @@ static void print_cpld_version(void) int checkboard(void) { printf("EL: %d\n", current_el()); - if (CONFIG_IS_ENABLED(SL28CPLD)) + if (IS_ENABLED(CONFIG_SL28CPLD)) print_cpld_version(); return 0; From patchwork Mon Jan 30 15:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734253 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Ux0s4iHW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5CHb73Qvz23j6 for ; Tue, 31 Jan 2023 02:47:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1525F80F62; Mon, 30 Jan 2023 16:47:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Ux0s4iHW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47953859D8; Mon, 30 Jan 2023 16:25:39 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 2E1148593F for ; Mon, 30 Jan 2023 16:19:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id k12so193105ilv.10 for ; Mon, 30 Jan 2023 07:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U9mj/2XvAj/Vf/bs3Os5UpRWE32VJUGgkMMzyV+OqdA=; b=Ux0s4iHWmi39j822BA9o3xcQPqR5jFJOK/bN1wtAH6mUGPF34ovD5IP6SxJ7a+BVBC 75eYoDAbJ8wHm3ouei5ED9jQ21MqZGTqLwLZ2NHkP2OTqne26dZa0rVPoMKUFQrf+ET2 7yg2p1r2JUo9ncJeh8lxyE8thK+sMGZyJapPw= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U9mj/2XvAj/Vf/bs3Os5UpRWE32VJUGgkMMzyV+OqdA=; b=lJG5Rtlxk8EDtMmkikLmI12OuSsALky7XIu02VkelJIkFYwWkKLt/t7uf3Yu8+rusk yiQ8R4iOc1LdXm3AdIMML1NySkxF+cvGAri0bCTyHPcNU4fGYCbo+PX/hWRvmcAA4oxg 5CC2ZQlV+I8dHB1rV6OpkRErOprFtlCIiMwKYdmGd0XCo8c5u/ZB2MDU4tTDytzPh6eO X/zFy6CmNQ4ahk/SduSQwlcPYyYofjBrcwv+MNhSg8etgb7eBD/osaO/Wm4Ur+NkE+XP Z+xYuwgSm6VnCHLuozEsnSz8tsxgmGUtE76rNM3EfrIZr1yfLUyGLOnZCjfOE/ja3tqM GFSg== X-Gm-Message-State: AO0yUKVYQR/P1vA7MBE08MTyGdQ7ooyTMDm8NTKO97538NT1HqtCoD77 rGQigkRGf7Gbdhp5hc2K2B/zytXgXQ4pRJEb X-Google-Smtp-Source: AK7set9vKcJQTAC0GK1irNNJsnTf5QEsGubTcuz5kzFKTvn5YNgG2racSYk+di0za4JlJPUQ9lPG0A== X-Received: by 2002:a05:6e02:178e:b0:310:e24b:a5a6 with SMTP id y14-20020a056e02178e00b00310e24ba5a6mr6084692ilu.9.1675091874439; Mon, 30 Jan 2023 07:17:54 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:54 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michael Walle Subject: [PATCH 142/171] Correct SPL use of SL28_SPL_LOADS_OPTEE_BL32 Date: Mon, 30 Jan 2023 08:15:43 -0700 Message-Id: <20230130151612.212732-143-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SL28_SPL_LOADS_OPTEE_BL32 defined in Kconfig Signed-off-by: Simon Glass --- board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 257923685a5..e78a0d5dd3c 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -188,7 +188,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fixup_icid(blob); - if (CONFIG_IS_ENABLED(SL28_SPL_LOADS_OPTEE_BL32)) { + if (IS_ENABLED(CONFIG_SL28_SPL_LOADS_OPTEE_BL32)) { node = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz"); if (node) fdt_set_node_status(blob, node, FDT_STATUS_OKAY); From patchwork Mon Jan 30 15:15:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734203 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=IssRRX1t; 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 4P5BwZ1mrcz23hg for ; Tue, 31 Jan 2023 02:31:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D19AC85A4B; Mon, 30 Jan 2023 16:25:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="IssRRX1t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7AE0859BA; Mon, 30 Jan 2023 16:19:23 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 543B6859BD for ; Mon, 30 Jan 2023 16:19:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id m8so5218256ili.7 for ; Mon, 30 Jan 2023 07:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zteP5lgCFFXOxzxTGWcrG/+kgMSgvSUJ3seSbjRaR+U=; b=IssRRX1tkkqg0r0qAjQlxGtp7v+1L+ngukJa22bI+c6khDWD0l9y+pqA/fSLGFGFUs kiC9NM2yXYQkihh63lfsDRzapVCB1vPK122yTFPQN2NQ1TVBI7sDFyYruDAZKlXqH7XA Etxk7LwoRxejQUR898wVWQNgB2j7LfGVuFETE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zteP5lgCFFXOxzxTGWcrG/+kgMSgvSUJ3seSbjRaR+U=; b=mR9ErRRb/wlKSRno8tMeyM+Jt71f82ymEaXSuRRyswjBAAMG6vXYw9POgUH3h1PbD/ 5zS1V8iE+55z1LJSIC06y6dTb38EcDW/jIm1fnJZnieal707FxNWTmQ+wXEgN1FrP/iQ ua/uVXmSdX3dB/xVrb7IvXCmU0GWLpdSxCXvmJUaGji8vfLOh9d87yb5EvmG9GE+21/B UkehDQLycVJUOTyx7/VcO8tEkcdsORSe4jU5jJKbJZabRyoRuY9dbHCsdPOjAe+qROMN lXZGnjAqQuTnJ3m4UrtSiu4qPqjPbvpkTOlAxHul44jbaF4tIPBYIHoFLZp2m6ghIQtr 7QRg== X-Gm-Message-State: AO0yUKXbUXpOWRD13ryosggs5tnVkEZFeImKJj6lDb2fO2euHSmUCebQ OnDIHTUUfJRoos3L6ZZk1nIUUieDaA5CW6oz X-Google-Smtp-Source: AK7set87mlYreAE4jxuUHLfDdQg/Ne6viomtMGbN6OXA4Blhwm4sdPQwJvMDtEq4N6oVAApyvZvPEg== X-Received: by 2002:a05:6e02:1a4e:b0:310:f316:fc42 with SMTP id u14-20020a056e021a4e00b00310f316fc42mr3468945ilv.24.1675091875300; Mon, 30 Jan 2023 07:17:55 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki , Vignesh R Subject: [PATCH 143/171] Correct SPL use of SPI_FLASH_BAR Date: Mon, 30 Jan 2023 08:15:44 -0700 Message-Id: <20230130151612.212732-144-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SPI_FLASH_BAR defined in Kconfig Signed-off-by: Simon Glass --- drivers/mtd/spi/spi-nor-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 2c3116ee530..d410ae58953 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -3894,7 +3894,7 @@ void spi_nor_set_fixups(struct spi_nor *nor) } } - if (CONFIG_IS_ENABLED(SPI_FLASH_BAR) && + if (IS_ENABLED(CONFIG_SPI_FLASH_BAR) && !strcmp(nor->info->name, "s25fl256l")) nor->fixups = &s25fl256l_fixups; #endif From patchwork Mon Jan 30 15:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734239 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=LmPyhRFq; 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 4P5C6Q3LKFz23hS for ; Tue, 31 Jan 2023 02:39:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD33285AA7; Mon, 30 Jan 2023 16:27:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="LmPyhRFq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6DD98599F; Mon, 30 Jan 2023 16:25:35 +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,DKIMWL_WL_HIGH, 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-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 8F0DA859B3 for ; Mon, 30 Jan 2023 16:19:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id h18so2450651ilj.6 for ; Mon, 30 Jan 2023 07:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LkvtjAvt6y0q/nLOsozJriQAUa75KhKRTpzm5UefKxU=; b=LmPyhRFqb3vMGZdtuxkKAk7dhC3f0nowRnMRVu7ViI36zPqnV7Plipmf+G2Hfnbk27 gIeOPCUIpEJhV1B1+yYIOw4P2CZTJzD02BNYxtGKC/huoDCOB6ezUs4Xt7TTBUyM0Pqo GjObNLsYkE17ZqhOfqigNDM6CKiEc7m8KemEc= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LkvtjAvt6y0q/nLOsozJriQAUa75KhKRTpzm5UefKxU=; b=CLQ9GZaDdpHYHsyvpiWcn11HLFL3/Ip7sMJrnppMdZEQF0FtfjZHGI5CgNGCjaaJPz a7sYeTcDRRDKB2C9TiAiNFCwZOa9rMNnLLKm4ldbIr148kmo5nxuzDOzreT/Bzcd/AuS nkbAiqo+7UT/Ua6B1e7V06POVSM5oICRRBqL5C5Q7n5/DhqZyOh6nd7hX+RkEf6ECLRO M24/vC4y1YbTlFi9lMMA/O6hbnepGDrjAzmdRLlopXWpt+u8kCoYPIiD34aUsL2sEYDP 0FCzLVvjLBOZIcQLOdZrjwWB2tHhGtG7XTfrE8EnH6/bUQY4nyhcjciBA87KklajqdLD 1m5A== X-Gm-Message-State: AO0yUKUP9oDwfOA/mEbqzU0WSQKBu3EnsRHrKoUlkPCT1sf40cDTyEr5 pQkqs8WPeqeUGMxjtVNVE4XNAljGGDsM//EY X-Google-Smtp-Source: AK7set9tVV6IQr+HbB6T1uGJAqX6xfeof3t1PqIQlamuDbpgkuJoLCHaoLTVZqlkt/wJibJZnHWu3w== X-Received: by 2002:a05:6e02:1a0f:b0:310:c22e:d44f with SMTP id s15-20020a056e021a0f00b00310c22ed44fmr11433967ild.10.1675091876097; Mon, 30 Jan 2023 07:17:56 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki , Vignesh R Subject: [PATCH 144/171] Correct SPL uses of SPI_FLASH_MACRONIX Date: Mon, 30 Jan 2023 08:15:45 -0700 Message-Id: <20230130151612.212732-145-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_SPI_FLASH_MACRONIX defined in Kconfig Signed-off-by: Simon Glass --- drivers/mtd/spi/spi-nor-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index d410ae58953..3f97acdb18c 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -3645,7 +3645,7 @@ static struct spi_nor_fixups mt35xu512aba_fixups = { }; #endif /* CONFIG_SPI_FLASH_MT35XU */ -#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX) +#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX) /** * spi_nor_macronix_octal_dtr_enable() - Enable octal DTR on Macronix flashes. * @nor: pointer to a 'struct spi_nor' @@ -3904,7 +3904,7 @@ void spi_nor_set_fixups(struct spi_nor *nor) nor->fixups = &mt35xu512aba_fixups; #endif -#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX) +#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX) nor->fixups = ¯onix_octal_fixups; #endif /* SPI_FLASH_MACRONIX */ } From patchwork Mon Jan 30 15:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734204 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=b3GTsHuu; 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 4P5Bwr0cKsz23hg for ; Tue, 31 Jan 2023 02:31:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8E83885957; Mon, 30 Jan 2023 16:25:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="b3GTsHuu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22169859BF; Mon, 30 Jan 2023 16:19:25 +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,DKIMWL_WL_HIGH, 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-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) (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 B824B859C7 for ; Mon, 30 Jan 2023 16:19:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12a.google.com with SMTP id l7so3350878ilf.0 for ; Mon, 30 Jan 2023 07:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+zfqMhr8TIiLykPuCw8wPW09c5milG0dgoaQOKvI9ZY=; b=b3GTsHuuXGhPMncyQeZ/vGi8rWTj2LUEyWTMMwisfRZtuilMcslqUoZ9tzfO8AtHNe IY3EIN1mOnOxJW4CgEf3gDVvGjW0OaCBnr5fg+oWGpZIkHxMDQsF9FUlxG22ejq4vTb7 nLHJoYBt/puST5U0Tdo8xjqVNechgrEuLRQiw= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+zfqMhr8TIiLykPuCw8wPW09c5milG0dgoaQOKvI9ZY=; b=JenBZ+h28Nu25U/G0TUP8WtH5oqMdE0L+xyF8kE4DRAwNGCk5H1a/QDGOqeTgme75Y 85/PuGGuOJSBrq5nSE7sAPlEX3MuHuN/Wjtz/VNbF3akP4BinVKgRCfoDXYMrancV+bM oNQivwzUZGuWTlntU9BiQ9RzDtjb96FtAuKVxPvPA2aHm+4HowzxHwigsPNy0JHj9UKa /TLadeA/xtmQM9lpIDR11tfi9lHDmLoHQ7tXmuYP+CKvsPLQ/vh1c/10vpa07mxamaKg kuqni0iSAdUsk6Du+mkvD+BRRqKLPb+qAf7IGbl5ksGDwFdFHOKakXu/+5ySuJx2ydbi Ub3g== X-Gm-Message-State: AO0yUKVssitEMAofFtrdaO/PyWY9DAKsrWOjE6FQcOQl1QS7hl38LR1W 8ge3lm8wbrX20MsEivTUyrIp9FmRZ/WtKyNG X-Google-Smtp-Source: AK7set8jnUyt7KkE+pf/I9i4L1513n3HrGxjDmaJd2neSWcTPImwQvS2LWaAqIdTnrIF13ac8tRerA== X-Received: by 2002:a05:6e02:1c42:b0:310:c643:bda2 with SMTP id d2-20020a056e021c4200b00310c643bda2mr11049891ilg.28.1675091876843; Mon, 30 Jan 2023 07:17:56 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:56 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Julien Masson Subject: [PATCH 145/171] Correct SPL use of SPLASH_SOURCE Date: Mon, 30 Jan 2023 08:15:46 -0700 Message-Id: <20230130151612.212732-146-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SPLASH_SOURCE defined in Kconfig Signed-off-by: Simon Glass --- common/splash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/splash.c b/common/splash.c index 2e466a8a0f5..245ff680ebd 100644 --- a/common/splash.c +++ b/common/splash.c @@ -89,7 +89,7 @@ static inline int splash_video_logo_load(void) { return -ENOSYS; } __weak int splash_screen_prepare(void) { - if (CONFIG_IS_ENABLED(SPLASH_SOURCE)) + if (IS_ENABLED(CONFIG_SPLASH_SOURCE)) return splash_source_load(default_splash_locations, ARRAY_SIZE(default_splash_locations)); From patchwork Mon Jan 30 15:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734207 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=c5mhqzZH; 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 4P5BxV4DDLz23hg for ; Tue, 31 Jan 2023 02:31:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E414F8599D; Mon, 30 Jan 2023 16:25:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="c5mhqzZH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A12D9857A3; Mon, 30 Jan 2023 16:19:27 +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,DKIMWL_WL_HIGH, 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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 01647859C8 for ; Mon, 30 Jan 2023 16:19:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id k12so193194ilv.10 for ; Mon, 30 Jan 2023 07:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gDoOh0Zs1aplwts5VnMq76uHdzkMThwMgUr9BKa/G7k=; b=c5mhqzZH5DnbUIgU/0/NdxS2coIZKGgefcze9I2Rbzgmq+mj3EJegrWw6p2KRtWvvR ZbHTFUc8vV8ivU2OkIL2eeeFz1aFHCpfyGdkxAbnRrJxrHNoXtU6Y5EUhy1j+io+6ku7 OV19UF+dsGcEM1dkoWZm4AHfsUpVVkYN+tVIU= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gDoOh0Zs1aplwts5VnMq76uHdzkMThwMgUr9BKa/G7k=; b=2HMAJI6UPk4Fpgx9/PBjc/MgOinM7IOyinbYSa6xoW4TTCaBFT6TPYCMgNH/7WIOo2 2JsTZtVCJLbCyyzG25gWaukrXvdhQ9iZ5Q4PvfJjPIqnK8MGpTsUX/fBHwdRRqxSMNPl sDhqkaY6gIX/M60+kUOdLqNPRgAWtinYAvq9jid4y6sashrrlJZxfd/Fg0uQJC96xWUK S5rQ4AcWuOfTRX71SS3djQsNqIPwNE7Op3H2NyocaX6ppr91ceLOUcfXdd4e8fDWjwah 8ArVZdZiuTasVB59v37XWs5KLSagB+r/p+Re3cpplMuqv0iINa+OhU4uipdB/4oe9sbh FGtw== X-Gm-Message-State: AFqh2koI7ubplF6Ae2K/2W70xWZ667RCCl9Ku3WGgzfpkuFHGE987Wni EuwPeW4NVVBhdbPVS9jd+KLZc+YaourYH6fB X-Google-Smtp-Source: AMrXdXszr10qYq5IjkeUYQAzy69IbTKC62Q/uSEV1EsEyRPK4OxruKXrbLjO8SYPaBtGi6tRDibJkA== X-Received: by 2002:a05:6e02:1a0b:b0:30f:526d:3e31 with SMTP id s11-20020a056e021a0b00b0030f526d3e31mr33877467ild.3.1675091877700; Mon, 30 Jan 2023 07:17:57 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Patrice Chotard , Patrick Delaunay , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH 146/171] Correct SPL use of STM32MP15X_STM32IMAGE Date: Mon, 30 Jan 2023 08:15:47 -0700 Message-Id: <20230130151612.212732-147-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_STM32MP15X_STM32IMAGE defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-stm32mp/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index 218d9ef282a..c21c5c42fe1 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -505,7 +505,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) * under CONFIG_STM32MP15X_STM32IMAGE only for compatibility * when FIP is not used by TF-A */ - if (CONFIG_IS_ENABLED(STM32MP15X_STM32IMAGE) && + if (IS_ENABLED(CONFIG_STM32MP15X_STM32IMAGE) && !tee_find_device(NULL, NULL, NULL, NULL)) stm32_fdt_disable_optee(blob); } From patchwork Mon Jan 30 15:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734208 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=S/vJd0va; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5Bxp5hflz23hg for ; Tue, 31 Jan 2023 02:32:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A071D8594B; Mon, 30 Jan 2023 16:25:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="S/vJd0va"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23039859DA; Mon, 30 Jan 2023 16:19:34 +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,DKIMWL_WL_HIGH, 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-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0: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 EC08785989 for ; Mon, 30 Jan 2023 16:19:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id z2so4649578ilq.2 for ; Mon, 30 Jan 2023 07:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=330+nHWs4j32vpFsMjBTe8WJb8t5gwEXmjq1EtzCCBE=; b=S/vJd0va7n/HDT3dzd/RIQXxr+W8lM8uBCpdkNYqKLqUDNa/O9yKoC9DPZZB5nBJr2 lKN4wXxFob/QAdJLmJ0mPfaSlHnaR2AGZclJltCq7dHvvUasne7njnK6oYgaJDSI5SNM nLPSb6XvXph2Gyu5Onn2iiTSC4qDcqJ1Sw2xs= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=330+nHWs4j32vpFsMjBTe8WJb8t5gwEXmjq1EtzCCBE=; b=P32fqYqNK+vJJYrZ9SE5vKSF67pZ3URoSjC+d0VtL2yKRaB2fV65kWXznRB4Gu+mfe f58V/Wqc0pCm76gUvGLCFLAuMTUOm78lErFhLntyC1hEAD+up4QiEkpioZEgIaL9X3Sd 4lbMx80gUIYW1nqElQMo0+mpYoreAFSNjOzhvtYnqa98UGdOYq8NQmBHI9/BHgFbXH09 k4afu5eJ8qwQ5hD6cE9ZrMKDaNSCUiFZC76qYxdw471d+kBdLKxsbWCs0r+HrVHE4S2X qdHMSD/cELL6boldQ5oyPZc6qlZRPvy3t+efLWweZy4TIEPl6rjtvW7nRb8XHE0wZ4vB +20A== X-Gm-Message-State: AO0yUKXP/aY3Rbkf7HPCX1qFrKpgKmJFI+imJ6AqxUFJbFDEmEeGY/kk DXVO/cWlVTRTXtmkX6S51QvtesgES/e3fCxn X-Google-Smtp-Source: AK7set+YwdLx8ftKNms7JIqKZTOtuLwf4hqmH6D/CS1xtrUulcqZeifwl3Hc9m7tgRa3la8hMPzbZw== X-Received: by 2002:a05:6e02:b25:b0:310:d217:f561 with SMTP id e5-20020a056e020b2500b00310d217f561mr9087558ilu.14.1675091878497; Mon, 30 Jan 2023 07:17:58 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:58 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Peng Fan Subject: [PATCH 147/171] Correct SPL use of SUPPORT_EMMC_RPMB Date: Mon, 30 Jan 2023 08:15:48 -0700 Message-Id: <20230130151612.212732-148-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SUPPORT_EMMC_RPMB defined in Kconfig Signed-off-by: Simon Glass --- drivers/mmc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 3a664c2ebbb..3dc757108d5 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -46,7 +46,7 @@ obj-$(CONFIG_MMC_MXS) += mxsmmc.o obj-$(CONFIG_MMC_OCTEONTX) += octeontx_hsmmc.o obj-$(CONFIG_MMC_OWL) += owl_mmc.o obj-$(CONFIG_MMC_PCI) += pci_mmc.o -obj-$(CONFIG_$(SPL_TPL_)SUPPORT_EMMC_RPMB) += rpmb.o +obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o From patchwork Mon Jan 30 15:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734218 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=XGkdPb9C; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5BzM1B25z23hg for ; Tue, 31 Jan 2023 02:33:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A40B85A4F; Mon, 30 Jan 2023 16:26:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="XGkdPb9C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ABF04859E0; Mon, 30 Jan 2023 16:19:43 +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,DKIMWL_WL_HIGH, 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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 87372859B5 for ; Mon, 30 Jan 2023 16:19:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id d10so5208323ilc.12 for ; Mon, 30 Jan 2023 07:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N6oNeHVKoCwURjDB8uU7cLxyEhKm+KMGmgQ6cBucxiw=; b=XGkdPb9C84rdFVAjvX82K55AGrA1O1cBoSLZ4L7vS78fa0R01RM9pC3dVr4NivLkn9 FgNi5cuJ6RIo9e3n7PVyOb2G7Ai1x3UPo8xLH/d4QgtZqbFmz66uuQT+qCyrRQaxodCA GzVR0hjQi/n1eJtobR5/eATntU4+HYQHW1dT0= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N6oNeHVKoCwURjDB8uU7cLxyEhKm+KMGmgQ6cBucxiw=; b=aHzZVJlz02hcvhWcCEIT7cEKVISdDHz+sSH4iyxt7chD5FhCcaNUA9CrlMNZ/ZLKGb pfOKdwR4M4fF/IEcAtVs1ge6xGU6KTKw2sLI231yDDUgkcPRIGGvLmdnAHvUv3ITTE+l 25uc/0BzuFCo18L223DAUiWQYE1W5MqczB4sksDjY71vaoHmdx3qKMXhwcpJHMpFKh2k k+pYpmtczhxGwJRHAAptSzPSIMgLON3gu+KwToI1+MepTfi+gzl/vUoojoTRnZoDZcg0 vHHkdPp/tIxYDMx5qr1cGLj3uTTtkII8b42r5CVbBCQptn3/nc5PfIRltI6U9LFJPGOI M6jg== X-Gm-Message-State: AO0yUKWw7Hmi5n3GXFNfR3uA/BkGicgRSn1o68nzLHE555Md/P2xLQdI PGZjAo0kBrQi/vQmICpbPN2qKgIANCZede4/ X-Google-Smtp-Source: AK7set9U0Ot1Sbg3mZWI1udDcylfYS5hOzOz/7Yae1sQOeQ+p8qJL69E4Qd+jFQaApOfKiNWS3KwIg== X-Received: by 2002:a05:6e02:1c0f:b0:310:e9f4:1e32 with SMTP id l15-20020a056e021c0f00b00310e9f41e32mr5319103ilh.19.1675091879386; Mon, 30 Jan 2023 07:17:59 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andre Przywara , Gaurav Jain , Michael Walle , Priyanka Jain , Sean Anderson , Ye Li Subject: [PATCH 148/171] Correct SPL use of SYS_FSL_ERRATUM_A010539 Date: Mon, 30 Jan 2023 08:15:49 -0700 Message-Id: <20230130151612.212732-149-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SYS_FSL_ERRATUM_A010539 defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index b0e86785337..12d31184ad9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -760,7 +760,7 @@ enum boot_src __get_boot_src(u32 porsr1) } #endif - if (CONFIG_IS_ENABLED(SYS_FSL_ERRATUM_A010539) && !rcw_src) + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010539) && !rcw_src) src = BOOT_SOURCE_QSPI_NOR; debug("%s: src 0x%x\n", __func__, src); From patchwork Mon Jan 30 15:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734221 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=FsNEUB9Y; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bzp34xnz23hg for ; Tue, 31 Jan 2023 02:33:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF24985980; Mon, 30 Jan 2023 16:26:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="FsNEUB9Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB906859DA; Mon, 30 Jan 2023 16:19:42 +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,DKIMWL_WL_HIGH, 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-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 A3B0B859B8 for ; Mon, 30 Jan 2023 16:19:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id m15so595753ilh.9 for ; Mon, 30 Jan 2023 07:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=znx33ofeSYiu+hwK5XQir8KYv2vXqmsGGtTlNhql1Wg=; b=FsNEUB9YBPs1cuasnlyl/HtP940lcDvjOse+QBsdKlC6ZuDvVGKHntQYiwHrzLvnZ4 ZEgfRdlZY227woxVfYnXBoa6jJ7viBweK2xC2Bskj3PRNlnmSdIEkObqHO8buIyUtc8c rT7d8+lKQ43M/NJaOBBvue1Xrxm66fK6/qacg= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=znx33ofeSYiu+hwK5XQir8KYv2vXqmsGGtTlNhql1Wg=; b=BURIxGn6ZpPQ42xv6021n7YK9rg8p/y2sLvKi4CZqODT0vuswfj2aDRFy2ckZ4IaxP AD1UmFFDjjUJOAzElX4C05IjY35/kSnDY5KkrGWUf2fNl663Y23TslX4ZXA0+P69qhyf drX4Eu1j3+3Sw9QmH931AA4Jc7XlD8/u18zUJs08CpnTSNiFF6WOgsLmYyywZYu8V4pg TO9cqnTOxVBLUuZGf1YH4cWub/g0d3HF7l7YDeTwncgbhOuVHESW1azjoy44bQ4JX8rG saHWlar/frllrsNJjzbeKnKl6r/5coUI6oXf7wYhUqKKHg8NFidA4VkzyChzu9tkL0/q bYAA== X-Gm-Message-State: AO0yUKWyy4QOiP8e3GUo/+pyqep2VO9MYhNnCVqGhf1WS5CAOQQ5dInM /p9Bg5qlmrS3v2Vtfka1gSKFgwyZiEQtdvot X-Google-Smtp-Source: AK7set9b8um093kErDtSW4jHgEsatVsAo1cUL66xUd7jIGdi19NazaN3MQ1H6p7D4CROCyh5fuHWiQ== X-Received: by 2002:a92:cd8d:0:b0:310:b063:fdb8 with SMTP id r13-20020a92cd8d000000b00310b063fdb8mr15694337ilb.23.1675091880191; Mon, 30 Jan 2023 07:18:00 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek , Ovidiu Panait , Sergei Antonov Subject: [PATCH 149/171] Correct SPL uses of SYS_LONGHELP Date: Mon, 30 Jan 2023 08:15:50 -0700 Message-Id: <20230130151612.212732-150-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 5 usages of this option to the non-SPL form, since there is no SPL_SYS_LONGHELP defined in Kconfig Signed-off-by: Simon Glass --- cmd/bootcount.c | 4 ++-- cmd/cpu.c | 2 +- cmd/dm.c | 2 +- cmd/ti/pd.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/bootcount.c b/cmd/bootcount.c index 654bbb805c1..3898d2543d2 100644 --- a/cmd/bootcount.c +++ b/cmd/bootcount.c @@ -46,7 +46,7 @@ static int do_bootcount(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char bootcount_help_text[] = "print - print current bootcounter\n" "reset - reset the bootcounter" @@ -55,7 +55,7 @@ static char bootcount_help_text[] = U_BOOT_CMD(bootcount, 2, 1, do_bootcount, "bootcount", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) bootcount_help_text #endif ); diff --git a/cmd/cpu.c b/cmd/cpu.c index a09736e1bb9..314852440f1 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -83,7 +83,7 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc, return 0; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char cpu_help_text[] = "list - list available CPUs\n" "cpu detail - show CPU detail" diff --git a/cmd/dm.c b/cmd/dm.c index 979cd36061e..3263547cbec 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -84,7 +84,7 @@ static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc, #define DM_MEM #endif -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char dm_help_text[] = "compat Dump list of drivers with compatibility strings\n" "dm devres Dump list of device resources for each device\n" diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c index 008668fd903..a9a182fc386 100644 --- a/cmd/ti/pd.c +++ b/cmd/ti/pd.c @@ -177,7 +177,7 @@ static int ti_do_pd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv U_BOOT_CMD(pd, 4, 1, ti_do_pd, "TI power domain control", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) "dump - show power domain status\n" "enable [psc] [lpsc] - enable power domain\n" "disable [psc] [lpsc] - disable power domain\n" From patchwork Mon Jan 30 15:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734234 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=V6vScpGQ; 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 4P5C4k16Xqz23hS for ; Tue, 31 Jan 2023 02:38:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A90D85A05; Mon, 30 Jan 2023 16:27:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="V6vScpGQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA50C857FE; Mon, 30 Jan 2023 16:25:28 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 74A3485679 for ; Mon, 30 Jan 2023 16:18:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id u7so3698703ilg.4 for ; Mon, 30 Jan 2023 07:18:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hRqU9fPfp5ZW2wSwwFtpIV5xYRlgsk/WUtvW2Y2HhZY=; b=V6vScpGQkVfKpVQVeev3pdXqU7OE9OscNZ3/CoHE2FUlQmDGh0ZoFksBD+i+s1fxLF mac3D6Y4bNuHV4jhdLOmwWH1yWyTSL9qXhoYrPDtpR2yNgbplciaWAWEdqk7RvBnLeB8 AxfalpxAJ1aEKnq96iPkk6TwfASbz4SeaN40c= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hRqU9fPfp5ZW2wSwwFtpIV5xYRlgsk/WUtvW2Y2HhZY=; b=20ihh+DvQox0uIKw6v3ZMa1swWEd6wz0w9mGeJAkAbJNFrGxXpwoIrZz2muJWbey+T 1goF0EUOTNfLIPuth36bETR5qkLuzYcBT00NuFrWx0uqf1lfkWNs6BBM+psF8JcGEB1Y Eb4MR3PkHrTZeXlKuLmr0N1oHBwA0RvcpL0wBLytNouqWDQxvguarCC9MKKiWBpJU/XS o2Xw/R3yLb+nF/UJeHyopfGc/lKa2RypzW2puhaMcLucUh3Y2oMrlzpxsO9E0v9keOlh G32BJEdEXYh/H3H3OPfQYvCt3Uk21tzPWhCVOtfMuXNz8dYPbvK4yNo2M4Txgi/afxue Y6YQ== X-Gm-Message-State: AO0yUKUEJdNarBQFOfcNjW+2aYmisTaitS0LdS+05er8+3GmmzHD9V5d YwfRQR8PZYwz6M9E6+8SGrHWtH6Ivg1qUta7 X-Google-Smtp-Source: AK7set8gT7soIw7hsHrdped4feH3TXB2gBrAQIIOb8+D5glbCuaQBFRiQLn3BZZyISx2hgP8uEruLQ== X-Received: by 2002:a92:c24f:0:b0:310:9eab:3d83 with SMTP id k15-20020a92c24f000000b003109eab3d83mr18157363ilo.11.1675091880923; Mon, 30 Jan 2023 07:18:00 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 150/171] Correct SPL use of SYS_MEM_RSVD_FOR_MMU Date: Mon, 30 Jan 2023 08:15:51 -0700 Message-Id: <20230130151612.212732-151-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_SYS_MEM_RSVD_FOR_MMU defined in Kconfig Signed-off-by: Simon Glass --- board/xilinx/versal-net/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 7ff2c620110..6724c7290f8 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -195,7 +195,7 @@ int dram_init(void) { int ret; - if (CONFIG_IS_ENABLED(SYS_MEM_RSVD_FOR_MMU)) + if (IS_ENABLED(CONFIG_SYS_MEM_RSVD_FOR_MMU)) ret = fdtdec_setup_mem_size_base(); else ret = fdtdec_setup_mem_size_base_lowest(); From patchwork Mon Jan 30 15:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734264 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=P+Gy0gAG; 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 4P5CVs6pjKz1yhq for ; Tue, 31 Jan 2023 02:57:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DF0285A06; Mon, 30 Jan 2023 16:56:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="P+Gy0gAG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 234A78594D; Mon, 30 Jan 2023 16:55:50 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 6FD9885636 for ; Mon, 30 Jan 2023 16:18:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id g16so5238072ilr.1 for ; Mon, 30 Jan 2023 07:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DN2m2HsAuA44m/qKXP3JZenrvCd2KaWMVtcsi9XupOk=; b=P+Gy0gAGx1KB8m8RFqqK/NrZ6XI0/xTxun4XtF0zBDoWgfbpYs4I0ZC1xcWG0y0VNA 7xd/eEMyb4xXvWPWMOBSw6DZ5PJjYhLUH1v1029lPW2DEGi0v/mQH7bbisUUAOpmu4Yp 9xTofYK/7ZWAWvk7c8phNm+sgWj3CIWDWYZEA= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DN2m2HsAuA44m/qKXP3JZenrvCd2KaWMVtcsi9XupOk=; b=N7GKwVAYy0hIW1nHy6mKP2kmVWMk74zpVjYf1YO+QxXPmDk7T3icUWHRlLhTDKMs0Q fu/fqyEGLtuz/5XH99FHNRfxIrz2DRy4fRAMQNxU1+LqTxcrcXn4TTtS+o3Q1thTBH0y ig0Om9f0WQygB8bnr4woTf19ApckbmN55XT/VKCUrv0OoeTSPTPZDnEM2xSYn0BMNeEO hO4y17NwB1k7WaVuqjZQSMuqlUp6ocbBv3EIW8vvcgnuAwgIhjN3V4vnrN9ra/V55H13 XE5XwvX1kR9gUzlLM83dKncj/ZsMO2rSbM+30uvHYGEPKlGS99P5RJD5XvZC1NqFh5E3 h9BA== X-Gm-Message-State: AO0yUKX0L3SB550AG5esKUKocnKXnP6KDtighFxu/nj1Sv2zM2NJUHIq EQpo/PW1HpepMHnwkjkMw3oGpOi+HHm4Qw0K X-Google-Smtp-Source: AK7set/FtQs/8df1yBWCTh4JLJg0FqZzKvgeY8wSM/0HEMJev82y0OXM56mwxKM9byHTK5xNh+TkIQ== X-Received: by 2002:a05:6e02:1b0f:b0:310:a9dd:52d9 with SMTP id i15-20020a056e021b0f00b00310a9dd52d9mr7041257ilv.6.1675091881845; Mon, 30 Jan 2023 07:18:01 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Meenakshi Aggarwal , Priyanka Jain , Wasim Khan Subject: [PATCH 151/171] Correct SPL uses of TARGET_LX2160ARDB Date: Mon, 30 Jan 2023 08:15:52 -0700 Message-Id: <20230130151612.212732-152-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_TARGET_LX2160ARDB defined in Kconfig Signed-off-by: Simon Glass --- board/freescale/lx2160a/lx2160a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index cf5b1ee46e0..d8a86cdf618 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -676,7 +676,7 @@ void board_quiesce_devices(void) } #endif -#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) +#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB) int fdt_fixup_add_thermal(void *blob, int mux_node, int channel, int reg) { int err; @@ -798,7 +798,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) u64 mc_memory_size = 0; u16 total_memory_banks; int err; -#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) +#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB) u8 board_rev; #endif @@ -862,7 +862,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #endif fdt_fixup_icid(blob); -#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) +#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB) board_rev = (QIXIS_READ(arch) & 0xf) - 1 + 'A'; if (board_rev == 'C') fdt_fixup_i2c_thermal_node(blob); From patchwork Mon Jan 30 15:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734238 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ic8j51Sq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C605NZyz23hS for ; Tue, 31 Jan 2023 02:39:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1093D85AA4; Mon, 30 Jan 2023 16:27:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="ic8j51Sq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6FB668599D; Mon, 30 Jan 2023 16:25:35 +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,DKIMWL_WL_HIGH, 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-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 7971285980 for ; Mon, 30 Jan 2023 16:18:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id h18so2450778ilj.6 for ; Mon, 30 Jan 2023 07:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C/JrvvAs/jYFxjd4w+UizqGqnsPDDSjLNIRBfuSANxI=; b=ic8j51SqeBEDMyyfSAR/v7yeIm5C3eGjpM6CT3+5LYlA1gKz1JgdoediejxTp+x/9E HYbbXtKzGI350N9kdo93bu3crsmzNoUes+O6sT9zOtqnec/oWqIHw4NfmgmZ4a7RXpFc xJjGs3lPwlgh1orqGlEyi5E+jeJyegDvCsKhU= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C/JrvvAs/jYFxjd4w+UizqGqnsPDDSjLNIRBfuSANxI=; b=Pty+oD0O/+jUdjjaHRqcDoe6owzt4PBiM3Iet+UN1REC/BkjcWLX39saXcsqGVbnjP Rzy+alYnvZJ8qiLDNLL3AuC+P04PYwqosGcL1Xt3E2kMY+H+ZSihAECJlFK8xRZSOq4O r4VcSobQsbYbReroAa9fxchQB8tTuKuj5ee2Y3dMU4ChDQgN79adqklcMspxkD4oDOgh 9Cu1bTrfRQVETLkRVPV3+XmhwolD+R6N8KPGbhKy6WyCkF5+16eqh1Zfbnm7SjVR8PW5 o1Wn1ascNj76F2erpDOP0KmrLAp2ZFG1+SCQM+fELbH3a0PTIpSNttSlPn2FxSVzQAdB /f2Q== X-Gm-Message-State: AO0yUKX+eTZOUA+5pUc8nlLDAllTDDn+cCp1XbELcSo/vXPkrdRHJVmE OXYDi4K655ICcPR/CxLUE1Lrnu+rkR+ZVvpp X-Google-Smtp-Source: AK7set9bQtXUUSvigShrCCunJHubQ98tYt09srnn0Bnab9HuX4DmS0tXF41LDBYPgPdSwrFhsXtfMA== X-Received: by 2002:a92:3014:0:b0:310:e6a5:d7b1 with SMTP id x20-20020a923014000000b00310e6a5d7b1mr3881338ile.15.1675091882580; Mon, 30 Jan 2023 07:18:02 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:02 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Peng Fan Subject: [PATCH 152/171] Correct SPL use of TARGET_MX6UL_9X9_EVK Date: Mon, 30 Jan 2023 08:15:53 -0700 Message-Id: <20230130151612.212732-153-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_TARGET_MX6UL_9X9_EVK defined in Kconfig Signed-off-by: Simon Glass --- include/configs/mx6ul_14x14_evk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 635ae78abcb..98b743b9364 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -13,7 +13,7 @@ #include "mx6_common.h" #include -#define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) +#define is_mx6ul_9x9_evk() IS_ENABLED(CONFIG_TARGET_MX6UL_9X9_EVK) #define CFG_MXC_UART_BASE UART1_BASE From patchwork Mon Jan 30 15:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734223 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=k2PS+WDC; 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 4P5C0R26PNz23hg for ; Tue, 31 Jan 2023 02:34:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 101EB859FC; Mon, 30 Jan 2023 16:26:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="k2PS+WDC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 64D3C859EE; Mon, 30 Jan 2023 16:19:47 +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,DKIMWL_WL_HIGH, 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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 3AEE38592A for ; Mon, 30 Jan 2023 16:19:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id z2so4649710ilq.2 for ; Mon, 30 Jan 2023 07:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JUH0c9yAn4pmHEk5gLRT1gyYulVkQ9Rd2jV3mlnwO8g=; b=k2PS+WDC4ILPvccZrxL3N8dp4ibKOJfefNYExOntHee81bv91sXeZ2+DP+a6MqZ78p DJfQHDnjZ01/t7yPi7tXw4pvenV8klLyLgKD/49slnXmViE5R8LTuuPgDnxZ+JM2cR/S MHyR+4RKexMVUWisRSyGm/AYg870el5mju+V4= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JUH0c9yAn4pmHEk5gLRT1gyYulVkQ9Rd2jV3mlnwO8g=; b=IQlMVlVixsvJy0Fim6SAEVa1xcyazMQFitzVts7D4Utt1SPRK9AacqYnIPfRgSZlsV r8CSqKTkYqvCuBbZrwy1qYS7s/OhYiug9gs2p3z4RWx3YrDXLv5M4qyJq637vuUJufjw O1Wdqg3mXVNkt9Fd7cK8cHg8ciATuhbAGXLZeNVe5aCk6bBJk0okJ1du7e8NXNtSVm8Y cumLxNgYfHH7v99oUfyD/Kl8+1StvBu5qW2aljG3Q1hXGrzz8G1tys9HFosScEU6+cD3 CxzzriN4UCOO+FJQrxzlyiKU/AKX8PXPDfFFmLKizScigY1W0PHRUOTnUGGmXxuYmgoi Nwzg== X-Gm-Message-State: AO0yUKUHqmH3RArgLFBWKWTa57lpmms/f3cbQ3cW8g1LeqcSCCZGYeJa 8NXe5fWu1IVloVAg5LA50RtlPStG+vDzLoVP X-Google-Smtp-Source: AK7set/kQiVgY34yRwfMlvWYtzHoMRuBhyzG6TTGTAJ2mGo4qFxImbSk2e92kOX9BWeDkSdR7OPK1w== X-Received: by 2002:a05:6e02:1485:b0:310:ef5d:de8a with SMTP id n5-20020a056e02148500b00310ef5dde8amr5387516ilk.27.1675091883443; Mon, 30 Jan 2023 07:18:03 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aleksandar Gerasimovski , Rainer Boschung Subject: [PATCH 153/171] Correct SPL use of TARGET_PG_WCOM_EXPU1 Date: Mon, 30 Jan 2023 08:15:54 -0700 Message-Id: <20230130151612.212732-154-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_TARGET_PG_WCOM_EXPU1 defined in Kconfig Signed-off-by: Simon Glass Signed-off-by: Simon Glass Reviewed-by: Aleksandar Gerasimovski --- board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index e005ece469b..c65cd9cdc9b 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -79,7 +79,7 @@ int board_early_init_f(void) qrio_wdmask(KM_PAXK_RST, true); #endif -#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_EXPU1) +#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_EXPU1) qrio_prstcfg(WCOM_TMG_RST, PRSTCFG_POWUP_UNIT_RST); qrio_wdmask(WCOM_TMG_RST, true); From patchwork Mon Jan 30 15:15:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734220 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=cz1uSk1a; 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 4P5BzY5HxZz23hg for ; Tue, 31 Jan 2023 02:33:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D5A8385A4E; Mon, 30 Jan 2023 16:26:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="cz1uSk1a"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 636F9859BD; Mon, 30 Jan 2023 16:19:42 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 B1D9E85984 for ; Mon, 30 Jan 2023 16:19:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id l15so1398367ilj.5 for ; Mon, 30 Jan 2023 07:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=viv77HyUUD5Ej8WoNh+qCl9YjC7fj7zmJ5YRp6nUUiI=; b=cz1uSk1aU7OkEu645ty/0/IoC1F7KWB6g87Hfdd60UjeBCXu2FPA0M7V+X3ggXQOBG q4SWBqgW8BSvwHAGDLk6WsTNjf1zx0qwjHM0v3MD09MrutHoOqh6PoQ5mVHwY0DoEmyj 4zZi2mX2k7wCTfp1fHj8fO++XXBvEDKX/hdI8= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=viv77HyUUD5Ej8WoNh+qCl9YjC7fj7zmJ5YRp6nUUiI=; b=kKJrf7o2RYVYW9xT2LL/f5eJx8+6ntd73yRHnDqZxxMTx6EMPIZxKehyYyJfFgSZ3R tx3Cb+I76Z5geIyBZkF9gbX0KrICudhTMwOoY5TVdoLITIioM5aCYDzH4WAdC5T5BAIy yHUjdfqRN5ca8MZp5Xf2/IDlHasfLL6381IE6ruPZ93NRmeyFHnyTxQyN5uKgUl82Goz F0DGFbzMGOnpVaYiZAV+rkEAJ3puwIsX3MDP3dXGzGwaPxdxjgAUouwmCDzQGI3evtHG crfzr54+FkV4RvD4aFxjZlPnQsZyhf6OoD7ucaZ9uQp1mntTSTCOjzoObYE1Dt+gHvmN WsFw== X-Gm-Message-State: AO0yUKU431b5pS38b+WgbIidXUlsOB7gSvxYURIn7/NRPmX40C4EpaE2 YrStW9CDm4AAhElLtdQ5fLJszd3UuUAw+Hq2 X-Google-Smtp-Source: AK7set+VAjH9basBAIUCwOsKXo/X4WVGm4deF8SQqwQ6iqJcLqU4cOaPzppiO2ADylzpRec8oL4AZA== X-Received: by 2002:a05:6e02:1a42:b0:310:aff3:4cf5 with SMTP id u2-20020a056e021a4200b00310aff34cf5mr13716284ilv.7.1675091884271; Mon, 30 Jan 2023 07:18:04 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aleksandar Gerasimovski , Rainer Boschung Subject: [PATCH 154/171] Correct SPL use of TARGET_PG_WCOM_SELI8 Date: Mon, 30 Jan 2023 08:15:55 -0700 Message-Id: <20230130151612.212732-155-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_TARGET_PG_WCOM_SELI8 defined in Kconfig Signed-off-by: Simon Glass Signed-off-by: Simon Glass Reviewed-by: Aleksandar Gerasimovski --- board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index c65cd9cdc9b..2f1731eea6a 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -71,7 +71,7 @@ int board_early_init_f(void) /* QRIO Configuration */ qrio_uprstreq(UPREQ_CORE_RST); -#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_SELI8) +#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8) qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST); qrio_wdmask(KM_LIU_RST, true); From patchwork Mon Jan 30 15:15:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734237 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=OqyMqDNx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C5T3s1Nz23hS for ; Tue, 31 Jan 2023 02:38:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A25E485A95; Mon, 30 Jan 2023 16:27:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="OqyMqDNx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B8F0C8579E; Mon, 30 Jan 2023 16:25:33 +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,DKIMWL_WL_HIGH, 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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 7D23885981 for ; Mon, 30 Jan 2023 16:18:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id l7so3351052ilf.0 for ; Mon, 30 Jan 2023 07:18:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KydtR426dNcyJLMTGhXLGnzxdku/Xld+b9QVU4RdPkI=; b=OqyMqDNxKKhHNNY/0CF95N8VChbGAyyZC0n5gmXEbmvJnsfkBEYYgTD9gITHR2QqQn Lc7KU7c8aB5yeE1A6rvqgLhvjsR7D7GF9PmJ8MYF3bXgM1vkRd2VeQKjXuXcxJLxeSNK kkf3v91jLlGMDmTbJA/FEWIfUo/ETnfLsI/BE= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KydtR426dNcyJLMTGhXLGnzxdku/Xld+b9QVU4RdPkI=; b=Fa2zVrYTVAdnEa46oIWvOQeACbjdjK+76D1VfSndjSkGBxGyBd4K5U39CxEec4FUAy pucLrEDpevPADQYXIILaWu8v8+n1JTtZnIxgb6XSbqt8fdJH39kb4SWjxqWlUKsr9c23 ghhgJkMvGNYRubTpprUwnqr0LNykg7TmRaHNJic3fweW9TbDNYLMNS4o2akX5OIp3apZ f31DlKFnEfCHiZ1p5aJRA4l/LyTwBXRup1Ci/plXG0Q8eTjZV13VyN/DN5OT4MpBOVo4 eo7IrrKTHEVHbBCAu+/adfVdJ/wJFczpLFx8NwkZAO1w8XNwHKRzm2i+cRODWdgJwihl XGdA== X-Gm-Message-State: AO0yUKXN/NxVGc9DVMhvAGrddIevGhsWb06sp7zm++JMAbIohfAymgku BQiCIFPUvRnSyA9ByRHH+Vnr8b5uAV6MpCGf X-Google-Smtp-Source: AK7set9SjizQN1q/H6zlpjX4kjh/QtrSffffMzLJMsTWuQdHlU/iZWN+OkseKPKJq0oh8Jt27UIxQA== X-Received: by 2002:a05:6e02:1e08:b0:310:f849:83b9 with SMTP id g8-20020a056e021e0800b00310f84983b9mr3087707ila.9.1675091885098; Mon, 30 Jan 2023 07:18:05 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Ilias Apalodimas , Jens Wiklander Subject: [PATCH 155/171] Correct SPL use of TEE Date: Mon, 30 Jan 2023 08:15:56 -0700 Message-Id: <20230130151612.212732-156-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_TEE defined in Kconfig Signed-off-by: Simon Glass --- include/tee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tee.h b/include/tee.h index 13f6096b9a6..ab0c5832613 100644 --- a/include/tee.h +++ b/include/tee.h @@ -328,7 +328,7 @@ bool tee_shm_is_registered(struct tee_shm *shm, struct udevice *dev); * Returns a probed TEE device of the first TEE device matched by the * match() callback or NULL. */ -#if CONFIG_IS_ENABLED(TEE) +#if IS_ENABLED(CONFIG_TEE) struct udevice *tee_find_device(struct udevice *start, int (*match)(struct tee_version_data *vers, const void *data), From patchwork Mon Jan 30 15:15:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734222 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=mRnCaFyl; 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 4P5C022m8Mz23hg for ; Tue, 31 Jan 2023 02:34:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 246CA85A4A; Mon, 30 Jan 2023 16:26:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="mRnCaFyl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 90887858F0; Mon, 30 Jan 2023 16:19:49 +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,DKIMWL_WL_HIGH, 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-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 0C99D859D0 for ; Mon, 30 Jan 2023 16:19:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id m15so595870ilh.9 for ; Mon, 30 Jan 2023 07:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nkoqOeZENfTzDH+XmsITl9ELi/hpD/avjLD8hhCVFc4=; b=mRnCaFylr2+4g5x7kk9TNKCwTJiOlu17fnqqvvczAqVwkoHCL2sdkCcD8rJr753sio w2S6ohltu6F5fqyxtH2+gHaXWbIk5aLnLJnkxwKkCLJbVHruAuxDz4pNwyubKYM5FBwY oJx82T6hVY+DFHJNCoxJVz31FshA5U/WDT1eQ= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nkoqOeZENfTzDH+XmsITl9ELi/hpD/avjLD8hhCVFc4=; b=sCIN9LwUUayTJWG4JBcq/XcH7gWr5+jznmajuKaArLnzAb3AM37E3ULp09Fmvm8Fbz jgr+CaAaz6exN8OH5JjpTG9kyw6jiT9NzTtZ/Np8pLc6+bNNRoTSTk5wsTFDhcbob1VQ 51S7aj5Lp6vBp/LAH19rISgGG40jZSg6Xzae2CuhseBMDcn/vNmK/jlkP16oNGnzPm0F iW4jvxd1Xl35xBgqlCBqx6aR9KctyyA71P+Ef92ely3eptIIXf5LuqqV1aPIrC6S5Dix lTw8Z3Ttn3yA1VOs3NzqrWcXCKfi01P4yLowWn4tEWGw8GJwimxygzkQGI2Gcb5cw0kO APMA== X-Gm-Message-State: AO0yUKX/GlRhaDdQ3YqmVDKSUakrWaoFe8vSQ5kwbYhwB7UypXCAYpGi A6QYjRbcmOZtTXX5PMhmhvPu4/3Pp5e1ERni X-Google-Smtp-Source: AK7set/WChmBe3CxRHuPUivZsdMw9OlhsInpzG50NxoyvXmsJ6RTHucIwl76OpkCQGzfN2KUQUu1Xw== X-Received: by 2002:a05:6e02:2181:b0:310:f912:5a7c with SMTP id j1-20020a056e02218100b00310f9125a7cmr2544278ila.25.1675091885811; Mon, 30 Jan 2023 07:18:05 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:05 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mathew McBride Subject: [PATCH 156/171] Correct SPL uses of TEN64_CONTROLLER Date: Mon, 30 Jan 2023 08:15:57 -0700 Message-Id: <20230130151612.212732-157-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_TEN64_CONTROLLER defined in Kconfig Signed-off-by: Simon Glass --- board/traverse/ten64/ten64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 9e4c84ad2f4..5dfb7165c0e 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -97,7 +97,7 @@ int checkboard(void) printf("Unknown boot source %d\n", src); puts("Controller: "); - if (CONFIG_IS_ENABLED(TEN64_CONTROLLER)) { + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER)) { /* Driver not compatible with alpha/beta board MCU firmware */ if (board_rev <= TEN64_BOARD_REV_C) { if (ten64_read_board_info(&boardinfo)) { @@ -375,7 +375,7 @@ static void ten64_board_retimer_ds110df410_init(void) /* Retimer power cycle not implemented on early board * revisions/controller firmwares */ - if (CONFIG_IS_ENABLED(TEN64_CONTROLLER) && + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER) && board_rev >= TEN64_BOARD_REV_C) { ret = board_cycle_retimer(&retim_dev); if (ret) { From patchwork Mon Jan 30 15:15:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734272 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ZMLfnRpY; 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 4P5DLk3nJ5z23hS for ; Tue, 31 Jan 2023 03:35:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 338738593E; Mon, 30 Jan 2023 17:35:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="ZMLfnRpY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 300D0859A7; Mon, 30 Jan 2023 16:19:51 +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,DKIMWL_WL_HIGH, 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-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0: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 CAACA859B4 for ; Mon, 30 Jan 2023 16:19:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id d10so5208467ilc.12 for ; Mon, 30 Jan 2023 07:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4hGIIcL9WsgSyDSlPl/8BHjxPoB5ywTAV2pf4ZEQzXE=; b=ZMLfnRpYeBd7kpTt9Hqk3Ur3+QnPLuSYympsF21IgPTEUCe997CKkU7NRtcuYpknrN Lw0tqyyeeMdKTFMW/EtNmw4b4dFrtRLR+1cITEb9VWECBlGwLKKSJTri4Otu8fbUn8ai Gfues48m752V7fVkAmeNTkxyZUKWspM6ENlEw= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4hGIIcL9WsgSyDSlPl/8BHjxPoB5ywTAV2pf4ZEQzXE=; b=DVjtM7zzVrLZHbMhJRFcksZOfAbeM85VuRcqSL4mAxWrEpnKOUO6L8XG8vIV5ee3Fk Nc9Dm6MA1UeCEs0BK0naOFVboi+jCiqZCCXStl9KuNJ6y7iTex660I1M7CA4hPnPBtjN 6XCrsxT99huGgNlfrg1ycWI9TBuvw+0864RLm2ZLdQvvb/ArMxf4Nwdz85dV7Iwt/JJ5 fYvM/p0BuWjummfRm0MllNnH08+IPCPJ1bJxT2BvUxc7jlZ8rW50ztE/1cUs2cOKLS5Z DgiDY56MKGt69D9aj+0RWtvoKwhpBQnlCd4L1fCimYHtKZXmsXTMozz6zpzjUi201K79 cabw== X-Gm-Message-State: AO0yUKXpEmL7evl9kAdnIyszut6cjkmbfAdUnqoluVjQOge3PwFysK+m yuDu2R9swAX4RKSBWfASKVqPAAvq60V0IKhY X-Google-Smtp-Source: AK7set8qCxs/Zz93MQr24mck+YgVeNGZLM+NcGQFEt9eDXJG/Kq3LSL9dS2SqiJN5cqaoJBUYxmuGw== X-Received: by 2002:a05:6e02:1a42:b0:310:ac4e:cb7a with SMTP id u2-20020a056e021a4200b00310ac4ecb7amr14747471ilv.6.1675091886512; Mon, 30 Jan 2023 07:18:06 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Ilias Apalodimas Subject: [PATCH 157/171] Correct SPL use of TPM_RNG Date: Mon, 30 Jan 2023 08:15:58 -0700 Message-Id: <20230130151612.212732-158-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_TPM_RNG defined in Kconfig Signed-off-by: Simon Glass --- drivers/tpm/tpm-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c index 5ff0cd3958c..b2286f7e7ed 100644 --- a/drivers/tpm/tpm-uclass.c +++ b/drivers/tpm/tpm-uclass.c @@ -156,7 +156,7 @@ static int tpm_uclass_post_probe(struct udevice *dev) const char *drv = TPM_RNG_DRV_NAME; struct udevice *child; - if (CONFIG_IS_ENABLED(TPM_RNG)) { + if (IS_ENABLED(CONFIG_TPM_RNG)) { ret = device_find_first_child_by_uclass(dev, UCLASS_RNG, &child); From patchwork Mon Jan 30 15:15:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734249 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=P7UbIMPb; 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 4P5CBG5tghz1yhq for ; Tue, 31 Jan 2023 02:43:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5870859B2; Mon, 30 Jan 2023 16:37:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="P7UbIMPb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C7940859BE; Mon, 30 Jan 2023 16:30:20 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 83770859C7 for ; Mon, 30 Jan 2023 16:19:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id k12so193407ilv.10 for ; Mon, 30 Jan 2023 07:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hR3rjNYS/f4wU0YiRumKI18XaiFG1SnDWa+2TA1fE9U=; b=P7UbIMPb49QpBukOzkn154EicKIAAwnt9RSnlZYVAo/eUaOkyVM0C2pNliJ5izI/T7 Nw9RhvlNga9J/ngL5ZcmWAGO2RJcGufMSxMOM3zaVQ9W0FpM+1HcmRAfLttVnZUfquKc iWEXjG89XA3PleFiLLNcof83EayWMVowe4oSo= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hR3rjNYS/f4wU0YiRumKI18XaiFG1SnDWa+2TA1fE9U=; b=bWj1tx+e7ZoVpmRC5XMyQqwevXy2I5zBGzCx2mEmcwJYiqcU71vB1rFDmw/1ZVGMWU Q3ck4BSC4hevkUB30yExQ2rUbpalY56yaURwuEgP0yggiP2ZVcpRt74xtLuYxnU+6uid CLkF3Wdu8Cv6yaf2vP8AnyfCZyuCMTOpeCjrQllUVbb/9IjeAxW++pOo+/M5rRTAz+Uv TqjGHJhYir58z0owh382T9gIiwUqLQmA1SbH47uqydX+7ENZMZOtyVoXn7rTVawlyurb r2nZdBOh7YAMMOZczKVGLSYWb2CJyXvWSz1s8iJa3Jx2/YuidPuyFXqNLQMdu2O3oXc7 EQjg== X-Gm-Message-State: AO0yUKWRNnY8h0yQT5fg2VsYO9AU//zL7zZkitZRGLhfJDYajJyKcVGU 7brc0Ibouf/2hZPNFHvY1tVQjDEiOZckp1Iw X-Google-Smtp-Source: AK7set/40KepHpsXoT0W1EhD0m+BZA9wGzumDn4kLqi3FXmnlbLIFahAUfiNsMQwU3LK0XWdSVLuIQ== X-Received: by 2002:a92:c24f:0:b0:310:9eab:3d83 with SMTP id k15-20020a92c24f000000b003109eab3d83mr18157705ilo.11.1675091887340; Mon, 30 Jan 2023 07:18:07 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek , Patrick Delaunay , Sean Anderson , Stefan Roese Subject: [PATCH 158/171] Correct SPL use of UDP_FUNCTION_FASTBOOT Date: Mon, 30 Jan 2023 08:15:59 -0700 Message-Id: <20230130151612.212732-159-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_UDP_FUNCTION_FASTBOOT defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- cmd/fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fastboot.c b/cmd/fastboot.c index b94dbd54884..17c53bbe277 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -21,7 +21,7 @@ static int do_fastboot_udp(int argc, char *const argv[], { int err; - if (!CONFIG_IS_ENABLED(UDP_FUNCTION_FASTBOOT)) { + if (!IS_ENABLED(CONFIG_UDP_FUNCTION_FASTBOOT)) { pr_err("Fastboot UDP not enabled\n"); return CMD_RET_FAILURE; } From patchwork Mon Jan 30 15:16:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734274 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PRgTcuHY; 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 4P5DMz6gcCz23hS for ; Tue, 31 Jan 2023 03:36:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5D227855F5; Mon, 30 Jan 2023 17:36:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="PRgTcuHY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87F0B8583E; Mon, 30 Jan 2023 17:35:24 +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,DKIMWL_WL_HIGH, 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-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 B2434859BA for ; Mon, 30 Jan 2023 16:19:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id h18so2450920ilj.6 for ; Mon, 30 Jan 2023 07:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DzmNiKjhS88CLkhv3K+z0dsnzbzqRts2kPkUUGZmrkE=; b=PRgTcuHYFis3HGcMNkxz/wvVtTW7SsxO4N3syzJ3LdcArVmkrL87U1pHJj5KwVT0ve 54/mJEer58/4uF8Kj09/0+FdcOLAnt0DtokFHCBqL3pa0/v7i18ROwG7vR6RJr6lY3iF OTHpCqbGyCUxB4+Z427ijTjKyEYG3g6q0N5DY= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DzmNiKjhS88CLkhv3K+z0dsnzbzqRts2kPkUUGZmrkE=; b=bC9Lvir8LepZgwndGq0wloodShkIZK8/m/xPTXD2q6knzNN2uy4uiHCAfeacgjanyL 3D2vJmDjDtr2SmEVs56FEAD0NVt1MP17zja2gd4B/9oTjWu56lob5X6mCkVZ71d95B24 QvB0KmS4GdxntQCAT/ApW60WoZsyrtgdLZTSgvmUACSTfDxiGIUufKnTQh/tyHg8ZnRs cVDrk8Et2Pj3And7KIlBn3wc43f2pHk8x/KCywdhcVLCEDF5fCrMqRVyIBA4T78UmpP6 GHUNmaRtIy/gGkS2ZZ7C1FkkLqupur8htq+IfIq1dW9bUxB44O6k5yx70L98v/yNMXfi XdmQ== X-Gm-Message-State: AO0yUKWi64kGOQrZpIRVOAq97WgDVOsJA4r1F4AzlMgvLoLvX6zTWFtb MnBH4C7vZNIJUn6XBzrLfG0Fx2/zF8XUbQjX X-Google-Smtp-Source: AK7set86H714zwdLt+SVY7uKzJOCd0LyWXJkkglL3Kyo25gey4ohaTViNUlJpECB6VEB0Df7sZybjw== X-Received: by 2002:a05:6e02:1c4b:b0:310:c1b3:9906 with SMTP id d11-20020a056e021c4b00b00310c1b39906mr11071249ilg.25.1675091888098; Mon, 30 Jan 2023 07:18:08 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Neil Armstrong , u-boot-amlogic@groups.io Subject: [PATCH 159/171] Correct SPL use of USB_DWC3_MESON_G12A Date: Mon, 30 Jan 2023 08:16:00 -0700 Message-Id: <20230130151612.212732-160-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_USB_DWC3_MESON_G12A defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-meson/board-g12a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index 2e59eee8f79..d9f1acdef74 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -97,7 +97,7 @@ static struct mm_region g12a_mem_map[] = { struct mm_region *mem_map = g12a_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_g12a_dwc2_data; From patchwork Mon Jan 30 15:16:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734224 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ky77jxeF; 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 4P5C0p1qwhz23hg for ; Tue, 31 Jan 2023 02:34:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A46FA85A69; Mon, 30 Jan 2023 16:26:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="ky77jxeF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0EC4F85613; Mon, 30 Jan 2023 16:19:56 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 E3827859BF for ; Mon, 30 Jan 2023 16:19:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id h18so2450935ilj.6 for ; Mon, 30 Jan 2023 07:19:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d/wJoPKQzlR1FSKk0IDwixnvIvPOKi16kSfsSsRTEl8=; b=ky77jxeFoBdSFp+L5Q+oz2Ao2ENDpyxlpnNohEGbeP3olDlQwUFemb8Gro5IQ7Nse4 pYc801/CDCAVzg26HbLYBszB4IYPQXtGcjq6uO3Lxgv72/2iGCLD+M7zCc7DdiMUjqki KK0SK4NrzwTY0NAqaoguQFWDrqSpwpFc2u6eo= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d/wJoPKQzlR1FSKk0IDwixnvIvPOKi16kSfsSsRTEl8=; b=c5Yc/h2QdfprxypkVUdAt9k4ELvLj7Su+vF0QEmAO/PWKmjdlPfMwE2n8otwX6ZYeS tidZowWIvxfW7HCB9yNvk8lKG5lNFtLGKwQnsd+kGSEFbIzw62YEMIHt3+ENHpDOQmi5 pN25V6WaG/wX3lOyVEWWylRPwz6YvDWKPSmfaaKq+o247NkuIhWPAzergb5vNI7g4J09 piz5TLcFw7xByycnIQAeMJ5UKEkiYSjOh3oT+sNyl3p9s4JoRAsmKGDdVPhFwUh+8zNL YdylfKb5zblHR+qgiDym/WEoKHDUwPez2CzqEuwfH69H9UQ3ux7WPKZZexTJ6fewjS1b Fbqw== X-Gm-Message-State: AO0yUKVrvV+jPypQ7c38PF2k5Bg3XcTpzBznq5Ton7L7rqteW1qGXt9k g8WBzRZHWXGq0MipbC3o7/777hO+f84+PpXm X-Google-Smtp-Source: AK7set9VtNWL+ooUv0Hl8lDSKq3pK8yX/w/x6koPJFvTW3ga+lW3T0hoUr8bR64KJrAvec1qoA14pw== X-Received: by 2002:a92:c24f:0:b0:310:9eab:3d83 with SMTP id k15-20020a92c24f000000b003109eab3d83mr18157775ilo.11.1675091889007; Mon, 30 Jan 2023 07:18:09 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Neil Armstrong , u-boot-amlogic@groups.io Subject: [PATCH 160/171] Correct SPL uses of USB_DWC3_MESON_GXL Date: Mon, 30 Jan 2023 08:16:01 -0700 Message-Id: <20230130151612.212732-161-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_USB_DWC3_MESON_GXL defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 236ec815799..8bcb0b3a212 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -91,7 +91,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 01fafd81c48..41f767302ec 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -109,7 +109,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; From patchwork Mon Jan 30 15:16:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734235 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JUL4+B9w; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C511Z9Mz23hS for ; Tue, 31 Jan 2023 02:38:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B9E485A88; Mon, 30 Jan 2023 16:27:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="JUL4+B9w"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2D71D85994; Mon, 30 Jan 2023 16:25:27 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 7767885850 for ; Mon, 30 Jan 2023 16:18:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id w13so1142125ilv.3 for ; Mon, 30 Jan 2023 07:18:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5maG1M6c9y01dSOzCjewXKLkQ7dv+03IxRlVFR6JkyY=; b=JUL4+B9wDThwzXsWXH6ZUgsGH6x2Ub9iRjdij9LV9hB6PkVzBso8nYR+/OGuiCpyhe jPGbfE0mj8d2vWBeRA2veydr4EI8dkdYNCCo3eGJ42uExRJXU1eskmXH5If6GyC0bQoZ cLq/gjg4pSmoiw3dfQsq+Cvpn+GhVhjFoodyk= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5maG1M6c9y01dSOzCjewXKLkQ7dv+03IxRlVFR6JkyY=; b=K+S12sKMhtsalv5aQ19qbY174Qm4eouUvv0ok4gUm7HR/cQ1pjEEus6/sYJoAV3Quw Ht52pCbXejeX6gFFtNeM3M09A06UKVl65Oia1BxltvozE988TZ7aFbAU9A+5t8cALMGs z5a4XRR85F4xoZjwLdwFWv+/iumvw6jGp8Hrt5MmMXdR5L4qwus+vH6xOiN6ithyPLdE z9c22dLG3ik3hVTX1HMLpHCUKWtr8VndQoH5yvjRd9wcwzn6nUJgCeL9D0apH/RJEyrv 2IH/hX0v+NpRfF75TpenZKx8fU/0kwqlwKhwq6qlDUIMklawmbzRtq7jS1tJEo7Tuh3G NKrg== X-Gm-Message-State: AO0yUKVhXH67404cBFmOc+ffV1CdMF8oaQHrzJbYqhtBA8wgJkirYGC4 8P7bNf4NBOFIIMIyVHsUnQ11nwCP2IIlJG+S X-Google-Smtp-Source: AK7set8gZX0UNt8u1p0KYmIukYDdiVyJ0JiSwPKjCXyIvtDb27oOnVZlUMmRLHEKxqRVoxzC4hJDpA== X-Received: by 2002:a05:6e02:2148:b0:310:fb90:b62d with SMTP id d8-20020a056e02214800b00310fb90b62dmr2288875ilv.11.1675091889853; Mon, 30 Jan 2023 07:18:09 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek , Patrick Delaunay , Sean Anderson , Stefan Roese Subject: [PATCH 161/171] Correct SPL use of USB_FUNCTION_FASTBOOT Date: Mon, 30 Jan 2023 08:16:02 -0700 Message-Id: <20230130151612.212732-162-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_USB_FUNCTION_FASTBOOT defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- cmd/fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fastboot.c b/cmd/fastboot.c index 17c53bbe277..97dc02ce748 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -44,7 +44,7 @@ static int do_fastboot_usb(int argc, char *const argv[], char *endp; int ret; - if (!CONFIG_IS_ENABLED(USB_FUNCTION_FASTBOOT)) { + if (!IS_ENABLED(CONFIG_USB_FUNCTION_FASTBOOT)) { pr_err("Fastboot USB not enabled\n"); return CMD_RET_FAILURE; } From patchwork Mon Jan 30 15:16:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734225 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CLT3dCbT; 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 4P5C1F2Zzwz23hS for ; Tue, 31 Jan 2023 02:35:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C29485A57; Mon, 30 Jan 2023 16:26:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="CLT3dCbT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F2609858F0; Mon, 30 Jan 2023 16:19:57 +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,DKIMWL_WL_HIGH, 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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 0C0BA859C8 for ; Mon, 30 Jan 2023 16:19:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id u8so5210307ilq.13 for ; Mon, 30 Jan 2023 07:19:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DHQ2F73TlL07AujsfBGy2dS/hiL4yuLnnbwKYyyTWpc=; b=CLT3dCbTdbflXzWQPCbkqwBYg6bgMaj0lELtD+U7V/M8pvmRKSUu6X6F+LRnyKltYP Ot9Z3y89HFLmC/rXDSWUfo09UxzWBQDUjym2hkGHA+auCvE2/tNsw9+4JZOBNTZi8XeR JlPlJJqgCo1e4enukwT8dRmKV9gJmBvwfcs+M= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DHQ2F73TlL07AujsfBGy2dS/hiL4yuLnnbwKYyyTWpc=; b=MpcekuZN5J9dFDdj+dMBPVPjnRb9PzdTKGQLhujgFut2F4W0LZvrqNrMsQYqfgcu3z T1UZyC1P71F3OgVbI8htuRLrI7kNn8/nV+o3jl+bO2sAuC7VizC1alIMqsPJqN6bqfVi F/wdPDvwssyqtD+FLEEeN70rsRl4RqPX/cW3JG8hFWGJFUiIk+fYw+ibarot1FUVrMmf 1uUhaZy2IDZWrak3vYGBjgI0iMBUi5YfeNDA4Vv1RwdBkqvGQAzNrLuIzuqQMXRcBkwX D0rgedrIUcGJlFhDR/w/5c/eufOIKlALLeXuktSiBxk+rwRCbIP3HPyJupPjv6GFGSZE tt5Q== X-Gm-Message-State: AO0yUKVROo7Jfetf2Jm7YFw48/qDhwEqo5qvSr4W8cdEHUz+pSB5Qf8h wUJ+Ab7QYrnzqG+1gaRs9/KGKiTMghkEeu2v X-Google-Smtp-Source: AK7set+FeXTHLnOMCRrbxch7wLS4KGja3IU7wlB+XSMIaLIN5G85d7OxcngewsOY86oA20oUnpO+hQ== X-Received: by 2002:a92:ac05:0:b0:310:efbd:5796 with SMTP id r5-20020a92ac05000000b00310efbd5796mr2560205ilh.12.1675091890664; Mon, 30 Jan 2023 07:18:10 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Neil Armstrong , u-boot-amlogic@groups.io Subject: [PATCH 162/171] Correct SPL uses of USB_GADGET_DWC2_OTG Date: Mon, 30 Jan 2023 08:16:03 -0700 Message-Id: <20230130151612.212732-163-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 3 usages of this option to the non-SPL form, since there is no SPL_USB_GADGET_DWC2_OTG defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-g12a.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 8bcb0b3a212..4baf045d416 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -92,7 +92,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map; #if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; int board_usb_init(int index, enum usb_init_type init) diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d9f1acdef74..46507c6a0f9 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -98,7 +98,7 @@ static struct mm_region g12a_mem_map[] = { struct mm_region *mem_map = g12a_mem_map; #if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_g12a_dwc2_data; int board_usb_init(int index, enum usb_init_type init) diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 41f767302ec..b850460c26c 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -110,7 +110,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map; #if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; int board_usb_init(int index, enum usb_init_type init) From patchwork Mon Jan 30 15:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734226 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=UbpA9vzB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C1X6fGbz23hS for ; Tue, 31 Jan 2023 02:35:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6C8A785810; Mon, 30 Jan 2023 16:26:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="UbpA9vzB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 49DCE859EE; Mon, 30 Jan 2023 16:20:18 +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,DKIMWL_WL_HIGH, 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-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 76C03859D8 for ; Mon, 30 Jan 2023 16:19:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id w13so1142167ilv.3 for ; Mon, 30 Jan 2023 07:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c6B6BpeRwxYhAPe8xcd77xk6JauUqjqEUhwPmmBTXXw=; b=UbpA9vzBYqdRpfOeHb6JYUpIaHhmOGAPOwnahHrOcc1gKR/MyfhBXQqB7vA9oNLtZX wI8pVfY8JUd2rd1MokCI6N4Ttk2qr/PL+U6ufsOSOd/S4xo/2YeOOSKsaN4i62eA9/Re +gMEXghD6VvCm6jndc3oYLdUBiEnuosfNuzC8= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c6B6BpeRwxYhAPe8xcd77xk6JauUqjqEUhwPmmBTXXw=; b=PkgSiLIg3g8kG/xn8Htrqod6flWLFFQIYuz9iqUb3lKFnrTUV1CvSMlenVrI6iS3Dq 0/0JaRDCaZuiHtFXcqLm50GRpOGmNeeM/N5AWsYugZkVvDbrl5oC7eGZJxXnP4/oPGVR 8JWkkQaBnzr+WxSXsE1m8IIKjV7pQ/OSDF59qZV09Qlg/dpswyMes0WK3UuL0yPpu0hj Ifea+443xyrHyL5ddW7CwZjhhKkE1/g7EIl4yFS+tV2Dq4DP8TAEU8jrFypLaAmSH64z QfjnQfnv5u1P3dTNO1Q9wiRn0wVgrITBsgXtsfwVjk7cmq6T0pHvX7nLISPeMVXWpDeg +bIg== X-Gm-Message-State: AO0yUKVFmKbwg4TkCnfMJ3aq3ZxPnzoFNSbZ9fRAjnzNdQva/NeRW9cZ hRv/dGSZMhL2l8q1H9xKEJ3sdlZVBLXEg4av X-Google-Smtp-Source: AK7set+WZlsZvoR7AjvxDb57JO6DqIah4lZb7JN2ci4HcCIsuB5zwviBKUQk9qrMux40CACKhvM9Ow== X-Received: by 2002:a05:6e02:190d:b0:310:c833:b325 with SMTP id w13-20020a056e02190d00b00310c833b325mr11435492ilu.6.1675091891594; Mon, 30 Jan 2023 07:18:11 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Bin Meng , =?utf-8?q?Pali_Roh=C3=A1r?= Subject: [PATCH 163/171] Correct SPL uses of USB_KEYBOARD Date: Mon, 30 Jan 2023 08:16:04 -0700 Message-Id: <20230130151612.212732-164-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_USB_KEYBOARD defined in Kconfig Signed-off-by: Simon Glass --- arch/x86/cpu/coreboot/coreboot.c | 2 +- arch/x86/cpu/efi/payload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index aaa5ae112e4..d7eedbd7436 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -77,7 +77,7 @@ static void board_final_init(void) int last_stage_init(void) { /* start usb so that usb keyboard can be used as input device */ - if (CONFIG_IS_ENABLED(USB_KEYBOARD)) + if (IS_ENABLED(CONFIG_USB_KEYBOARD)) usb_init(); board_final_init(); diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 1c28a43778e..19a25dd6408 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -171,7 +171,7 @@ int reserve_arch(void) int last_stage_init(void) { /* start usb so that usb keyboard can be used as input device */ - if (CONFIG_IS_ENABLED(USB_KEYBOARD)) + if (IS_ENABLED(CONFIG_USB_KEYBOARD)) usb_init(); return 0; From patchwork Mon Jan 30 15:16:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734227 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Ti3UBlfQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C1p2wfYz23hS for ; Tue, 31 Jan 2023 02:35:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAE6785A63; Mon, 30 Jan 2023 16:26:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Ti3UBlfQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B08F980F5A; Mon, 30 Jan 2023 16:20:24 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 A31A4859D9 for ; Mon, 30 Jan 2023 16:19:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i6so1362148ilq.8 for ; Mon, 30 Jan 2023 07:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PCcx73nWhyh81ffF0zXYxvWScx7mYjwBGtcVnKO8eTs=; b=Ti3UBlfQBeNNvbYBlclrIWF5zkMMohmZuscPeAugVV/tbQ2Qd8XpLIWpMs2PJflD8u Kg2kixkpRObUYo+iIopI4q2gditibExrmDHE3O/PWsso1QPSUIoqiqKbuw59sKbE0JNr GkEoz3Sbvhb6AYuf2z2SSa37hVkm62dmY00a8= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PCcx73nWhyh81ffF0zXYxvWScx7mYjwBGtcVnKO8eTs=; b=Vhxg5yFg1sOSeweKtMYpkK39nY30pp3HmskHPkzMMgukiVP9B6SrHUyvdk7eQqzder Muyausxo+4c5GrSXhrlUb29w4OmiIesH76QEPsXJd7OFBQOl6ho6SR4aAGfQi47ZmLUx W+cP8NHTfCXskdC8xoLFd4dPNQmDx80cUVE/fu1kjSPxK2iBX5D9cbZ5z0Ol7U5NXJBP KDnxKSq1jOjUhy83hxFJ3gxpkKZgydtziLzmd/k0KDZmTu0BrPK28mB1nrQT0gz5NroY 4PLo8Gs5qB3K3MbvWCvLSYexKBoWY8QXKjl3jxBqITDvKsDnbKRFdZTDh5NvLl+oCIhh spDg== X-Gm-Message-State: AO0yUKVx3zIayyb0e/n+6J4vyNE4A5ErCAW/UoQxjngiyt7tLgdtrUUz nRFrXdKItCz2E/OyAXgHygxgnTpiGZZ3Tjej X-Google-Smtp-Source: AK7set9Z69A7y6IIqFD1Gt9KHLpdMJ72ee5OS4kwzJvYNVnKVjHG6EUq6DCkpLZwNjWMEpd6r4EP9A== X-Received: by 2002:a05:6e02:178e:b0:310:e24b:a5a6 with SMTP id y14-20020a056e02178e00b00310e24ba5a6mr6085476ilu.9.1675091893448; Mon, 30 Jan 2023 07:18:13 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andreas Kemnade , Linus Walleij , Marek Vasut , Stephan Gerhold Subject: [PATCH 164/171] Correct SPL uses of USB_MUSB_HOST Date: Mon, 30 Jan 2023 08:16:05 -0700 Message-Id: <20230130151612.212732-165-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_USB_MUSB_HOST defined in Kconfig Signed-off-by: Simon Glass --- drivers/phy/phy-ab8500-usb.c | 2 +- drivers/usb/musb-new/omap2430.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/phy-ab8500-usb.c b/drivers/phy/phy-ab8500-usb.c index 0e04595717b..3d3d48c9733 100644 --- a/drivers/phy/phy-ab8500-usb.c +++ b/drivers/phy/phy-ab8500-usb.c @@ -19,7 +19,7 @@ static int ab8500_usb_phy_power_on(struct phy *phy) struct udevice *dev = phy->dev; uint set = AB8500_BIT_PHY_CTRL_DEVICE_EN; - if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) set = AB8500_BIT_PHY_CTRL_HOST_EN; return pmic_clrsetbits(dev->parent, AB8500_USB_PHY_CTRL_REG, diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 42e7abddbc2..482dfdc6be6 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -231,7 +231,7 @@ static int omap2430_musb_probe(struct udevice *dev) otg_board_data = &plat->otg_board_data; - if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) { + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) { struct musb_host_data *host = dev_get_priv(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); From patchwork Mon Jan 30 15:16:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734228 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=jcUSfnRK; 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 4P5C263LGyz23hS for ; Tue, 31 Jan 2023 02:35:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F97085A70; Mon, 30 Jan 2023 16:26:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="jcUSfnRK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6530480F5A; Mon, 30 Jan 2023 16:20:29 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 D6B1F859C9 for ; Mon, 30 Jan 2023 16:19:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id w13so1142245ilv.3 for ; Mon, 30 Jan 2023 07:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k4T6Tmo1OrzgGXLAmHdkyopdTPRaBA2L3gbEXRRET2c=; b=jcUSfnRKoJJEhfiTVBhckMqQ/GfiJ45S+q0B639sLIDCjV3j64CSX+zt+I9MtFsJTT G9lfrr+H3gV+UWnkMxKouewwnmvACNgitlaijcnMZdOZtipMf31deiL3XeNuutFCZW6L ++g3U2+7ulz1DW9M6vNAKtfCxe8vLcd/nhdB4= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k4T6Tmo1OrzgGXLAmHdkyopdTPRaBA2L3gbEXRRET2c=; b=UlZ+KELMgoTsAccsGPuiO1vFd2rvu9j1GVYLsr1s0+7FiNZ3NOC2zbVX/YVr64kzaL BfFn7oK/aeSIQ3KMCRw3dzT6AvDU3RcDWC5UoZUkjYQHS5hSHGuxzIMf/yWq//MBPGf2 V0ZrTzupuHOmhXGyymGOsOxk2xZ8A8AUGbBZScEO5bnA49I7Yca6KkoIGhuLViocNGl3 ohRaO78U8ZfvCv9DgUAJUzlQGUuWnhlk0VtpLS4JwM4zfdXmoLdvMQbTWpwaVHoZjZgs VP38r4KicQbzNWr8F/M806VvJflHko0gx/o+ZfbVMAy9s10JMsFlbFLjHLNu3wNY4hKY qpbA== X-Gm-Message-State: AFqh2krETFb2hXacuXaU6vQQ2E5+TyXDH0jEtbLNNFK++Of9wkl6BDZt VFCyKVTiwaMbf2KZeTnKs/YfR6OpXF9xxZ57 X-Google-Smtp-Source: AMrXdXsdfgG33gAAfH33MZqcDFHtZ8Kvwj0qY+7FLLoBP/Ls1ESys0nSa6tLoXjjLHDafQzb1rui8A== X-Received: by 2002:a05:6e02:be5:b0:30f:1cc:d14b with SMTP id d5-20020a056e020be500b0030f01ccd14bmr31751374ilu.0.1675091894302; Mon, 30 Jan 2023 07:18:14 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt Subject: [PATCH 165/171] Correct SPL uses of VIDEO Date: Mon, 30 Jan 2023 08:16:06 -0700 Message-Id: <20230130151612.212732-166-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_VIDEO defined in Kconfig Signed-off-by: Simon Glass --- cmd/cls.c | 2 +- common/fdt_simplefb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cls.c b/cmd/cls.c index 18643ec0243..787c7edbee3 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, /* Send clear screen and home */ printf(CSI "2J" CSI "1;1H"); - if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { + if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c index 71d4c8fde90..282c34fe0b9 100644 --- a/common/fdt_simplefb.c +++ b/common/fdt_simplefb.c @@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob) return fdt_simplefb_configure_node(blob, off); } -#if CONFIG_IS_ENABLED(VIDEO) +#if IS_ENABLED(CONFIG_VIDEO) int fdt_simplefb_enable_and_mem_rsv(void *blob) { struct fdt_memory mem; From patchwork Mon Jan 30 15:16:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734229 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=MiPtcp+l; 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 4P5C2n1V5Mz23hS for ; Tue, 31 Jan 2023 02:36:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F9AE85A7E; Mon, 30 Jan 2023 16:26:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="MiPtcp+l"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31F40859C9; Mon, 30 Jan 2023 16:20: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,DKIMWL_WL_HIGH, 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-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 B6D948575F for ; Mon, 30 Jan 2023 16:19:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id i6so1362186ilq.8 for ; Mon, 30 Jan 2023 07:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gxf7GJk8BNHgofz9fK2Jop0a/oHJIHAajPGfJ7R8POc=; b=MiPtcp+lgjCo0XLVqQT6bjjVSp4tODhkVibYfCl0HQ2QC6M5UeGtm5dGees6c+pVLL CaIa5+payrB6qhoc8Kwj27BfaxOy1cnXa8vRCJAlfC11no/lUGZfTYZRWbYAUE/ofLc9 Nxr+dHzPUvfibVc1iN+Rfk7r0UYjZ+0cfgriM= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gxf7GJk8BNHgofz9fK2Jop0a/oHJIHAajPGfJ7R8POc=; b=ndYEk/3jtiPNTUo6jRf+B41s1vQh5RKrAbjUC6buyz005NFLAbtQZ3FDhEi0rYMXvq 2lhxR6Uj+bjt69BB6JcZtE1b6xe7krCv1nZSVcji6mLCYss1aDaDGdlVYrx9XKk+a3Wk jICg5+M3ZA6uIK+W6edQGK2TBH05g3/jdvxNBlLFhfYojECH7vR8AANBEH1xHhEZx79D CJKSaYxcXh+fmoZmG0uSQevr+O/VBgFWtSN0usvQMiaqzsooatIM6QH2NYm2OJj/gYvz PksHoxDPyOe9Hbj9afCinMWQLCpsbjsXuZy40y6hfejr9aw9UbtgOc6WPp5iHibHcvuF 8B2Q== X-Gm-Message-State: AO0yUKV0aK+H62S1aEjwf9wYJ33B31ryAXjqlKXAIx7Vu1UclqUccx9V uJPIbNYK/p8SeR2bZfbEJQJAC7P4BrHq8iYV X-Google-Smtp-Source: AK7set/MerG/BUdzo6KsaPRSboZFW9pYqnQuhpntbJifgAD3HIvxGW+VYXwNQ5Tz8mrU5UZneFursg== X-Received: by 2002:a92:8e4d:0:b0:310:b003:14b6 with SMTP id k13-20020a928e4d000000b00310b00314b6mr5504223ilh.1.1675091895143; Mon, 30 Jan 2023 07:18:15 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt Subject: [PATCH 166/171] Correct SPL use of VIDEO_ANSI Date: Mon, 30 Jan 2023 08:16:07 -0700 Message-Id: <20230130151612.212732-167-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_VIDEO_ANSI defined in Kconfig Signed-off-by: Simon Glass --- cmd/cls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cls.c b/cmd/cls.c index 787c7edbee3..40a32eeab63 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, /* Send clear screen and home */ printf(CSI "2J" CSI "1;1H"); - if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { + if (IS_ENABLED(CONFIG_VIDEO) && !IS_ENABLED(CONFIG_VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) From patchwork Mon Jan 30 15:16:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734230 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=RkYIKEH+; 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 4P5C2y4vTdz23hS for ; Tue, 31 Jan 2023 02:36:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F73685A03; Mon, 30 Jan 2023 16:26:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="RkYIKEH+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48574859B5; Mon, 30 Jan 2023 16:20:33 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 2217B859D5 for ; Mon, 30 Jan 2023 16:19:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id k12so193607ilv.10 for ; Mon, 30 Jan 2023 07:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hUlkXJHZI8t4H1BiGMvPNtn4+dDDjkI+/ZF8Lzg3y2s=; b=RkYIKEH+heb6I3hvnTpipZ5VaXBODsLaAmG3UHrT/jqmNdwOp2IGqFKV//XOfv0s56 CaYaFCAm4IooPT0+1VwEP9iGrBfdNBtFlVyYbFTwR3Yto9FHxYBHPrFv2UF1wVle/6iv 1M2pSPySzkM220id0HGHPmrWJ0oHA0turGDmw= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hUlkXJHZI8t4H1BiGMvPNtn4+dDDjkI+/ZF8Lzg3y2s=; b=qKiGrARPIgdI1wTlx+YcVr/dG/1a/tdnHbXr1jMCsYVZmOr2efs8hs7E4cqnxvu1+3 6nYmR/NdDpdKlo2qMlKE6U75u36gGWNEQVTzVjEQHPPnovirjZG9sGEVzQlYJkQ4QbQ9 /L1YNh6UC8/jUjXoX+2r8tQ5biYO7eUwmRYS1vTz88DeYl5fHcwjA0vKABnOyvGZwOW6 yjZJq4zuufWO2SYAiraq7oQWOGgC50eS7FV14HaiURLm6faDPzSa378JXAEY7Eqzbtqd aJYzJuhLi527pzHlx+lLtZ1ajA6pLrp278BUN6JLsLZfL6H/Yq1TRJFAanPKIFN47HvK tHsw== X-Gm-Message-State: AO0yUKXq3ZC4no4IRJ0vz1/ahgkMsjoFZHdy9ZBDMoN1KQJEdM+ULE0w iWd+DHU2F0oswpAD7/FdXfES/HbLgAHzWfsB X-Google-Smtp-Source: AK7set9UtZgN1VNmVg4xgke7uXhJuGYEnYoY1/r6WWxFa5H746bnjV4cxtxZ+cM52uLIUE5TMqU5jA== X-Received: by 2002:a05:6e02:1bcc:b0:310:e816:8c8c with SMTP id x12-20020a056e021bcc00b00310e8168c8cmr5193738ilv.3.1675091895829; Mon, 30 Jan 2023 07:18:15 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Anatolij Gustschin Subject: [PATCH 167/171] Correct SPL use of VIDEO_BPP16 Date: Mon, 30 Jan 2023 08:16:08 -0700 Message-Id: <20230130151612.212732-168-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_VIDEO_BPP16 defined in Kconfig Signed-off-by: Simon Glass --- drivers/video/video-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 0ce376ca3f1..f36970e0420 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -196,7 +196,7 @@ u32 video_index_to_colour(struct video_priv *priv, unsigned int idx) { switch (priv->bpix) { case VIDEO_BPP16: - if (CONFIG_IS_ENABLED(VIDEO_BPP16)) { + if (IS_ENABLED(CONFIG_VIDEO_BPP16)) { return ((colours[idx].r >> 3) << 11) | ((colours[idx].g >> 2) << 5) | ((colours[idx].b >> 3) << 0); From patchwork Mon Jan 30 15:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734254 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ncNuaTJl; 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 4P5CHp06c5z23hg for ; Tue, 31 Jan 2023 02:47:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8267185613; Mon, 30 Jan 2023 16:47:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="ncNuaTJl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2706859B3; Mon, 30 Jan 2023 16:25:37 +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,DKIMWL_WL_HIGH, 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-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 76820856CA for ; Mon, 30 Jan 2023 16:18:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id i17so5068739ils.11 for ; Mon, 30 Jan 2023 07:18:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j5TWGtSLvEg7w3bvol1c2CNm3fSXjq1ElVwTU3BR9d0=; b=ncNuaTJlpStL5edmox+8+EQwQ/FGLToDovmaUqL8OyIZbIX46U7zUXxr6DNVAug4BH sXV+dw5H+s9oefRkrRYVlmTKyBibbUPdphzHj26WaEViyznkZNHAKmLzKjMFxKLZFORY c64hJNS/3ssOfPorY95+oa4ZrXdp1cuZ4jil0= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j5TWGtSLvEg7w3bvol1c2CNm3fSXjq1ElVwTU3BR9d0=; b=JAgtX46X3mmGeCmHtxgMwXPUHAcOJc56yizNd32/9ixYx7GdCZiF0aGMEShHh8Jrvx Kqn38pt7iv8M0WED/R/sadOz+G+LsDtpy4fY3SFhO5p3r9fsd6QW4JheqlCbvakynyid wudkXBY/MzxIkCCYTSerDS9s5951pnEdh+9Q6cTu3kxm7xpRvo+HdWOr6XBj9blpjKfy ON3RYyrniYwCaDlcaz0JePVLvb8OW2hxxwqz4/SZiFNXlHsykcHhvOLIqIeZp+fsXPzI NT8k42fN7SFbcczT7f/q76yG8lyjRT4FwSfXnuTOZxnHjIMfpAlXLvOFRaTbLz6qZz5L i7bg== X-Gm-Message-State: AO0yUKWXsK9kQS7cGiTbAqpSYW/YztzpqpNNwFFnihBAiislTSXckB0e i8NlmXGiuL1j5qmT3qFp26sxy7uPOP3VEfCd X-Google-Smtp-Source: AK7set/k+t9N/5XMDLfmcrF2KL3PsoZDJFwBEYUXFrzfDt2Dypl1pQjhTy4whvy6JOyySMMlmxhIgw== X-Received: by 2002:a05:6e02:2163:b0:30e:efe0:8b10 with SMTP id s3-20020a056e02216300b0030eefe08b10mr7074862ilv.11.1675091896559; Mon, 30 Jan 2023 07:18:16 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Anatolij Gustschin Subject: [PATCH 168/171] Correct SPL use of VIDEO_BPP32 Date: Mon, 30 Jan 2023 08:16:09 -0700 Message-Id: <20230130151612.212732-169-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_VIDEO_BPP32 defined in Kconfig Signed-off-by: Simon Glass --- drivers/video/video-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f36970e0420..6aaacff10df 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -203,7 +203,7 @@ u32 video_index_to_colour(struct video_priv *priv, unsigned int idx) } break; case VIDEO_BPP32: - if (CONFIG_IS_ENABLED(VIDEO_BPP32)) { + if (IS_ENABLED(CONFIG_VIDEO_BPP32)) { if (priv->format == VIDEO_X2R10G10B10) return (colours[idx].r << 22) | (colours[idx].g << 12) | From patchwork Mon Jan 30 15:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734232 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=mUljk6GT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5C403vwQz23hS for ; Tue, 31 Jan 2023 02:37:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDA8585A8B; Mon, 30 Jan 2023 16:26:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="mUljk6GT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7223859BF; Mon, 30 Jan 2023 16:20:32 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 42254859D7 for ; Mon, 30 Jan 2023 16:19:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id u8so5210464ilq.13 for ; Mon, 30 Jan 2023 07:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GiMMmKZYNOUMTAlNWHmcxw6SG0wl5GjtE7kOZQfa1uY=; b=mUljk6GT4X8mltB6qK1P0MDx4o83xlMTzmUdrZCn3WpbQkf8b+8SKXYYekpLO9Uxvy cbgr/fPK7gJCzAkrdKSZttKQPpwQF+8+QIg1sqQvqiKrqracLm2SEusxNvNji72+uhjZ 7OITyNHlS0jYcVC06Hysk9TaJKYUQSwuR1O9I= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GiMMmKZYNOUMTAlNWHmcxw6SG0wl5GjtE7kOZQfa1uY=; b=2SuguPIMQlWWQPAklMrg1XX3IaA6oGab16Bjt8yVWXQD16HzV1lyUr5rlnrkLNwMZW H+2TJpeO+hIxWvM/H6uCv+2wUM593QUDPzfNTlropL/UDsUScBK68OsQDXr73JjlK7+6 TeSj+mzVRHK6jn6V/NjMR2ePr4rtMDnUMfOGAfLqjgJo6vWEURaRGVQo+o+/KSD2Lvpi BCtnoG43lmz0drBMeo39aH0RhBsC8TWWLZY8uQUhOirIO99JREcys7Gj4VJxg1zm2Jvj ZKMbglnlsS+Nn6aT+hup1go61r0Zxb0Ww0TRh9pgUH03vaa/GHjUjy4Wab5qVaydxQ3T N5pQ== X-Gm-Message-State: AO0yUKXoAMfbwm1ARp8yK2NTiSo76vCgcxLaw0/LCwJvXu5T1zrtLvaS kxL2EzUjhOF4dRQKg+K9vClFjzF1HxhWRpx1 X-Google-Smtp-Source: AK7set+6A9lPQhbn1DdliP1fJYgx1152b0mPdWLATPzSUSRvF+mS/MC90FlKB8ulyrhfN0wSwm/WGQ== X-Received: by 2002:a05:6e02:1564:b0:310:c255:45ed with SMTP id k4-20020a056e02156400b00310c25545edmr10892836ilu.24.1675091897312; Mon, 30 Jan 2023 07:18:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michael Walle Subject: [PATCH 169/171] Correct SPL use of WATCHDOG_AUTOSTART Date: Mon, 30 Jan 2023 08:16:10 -0700 Message-Id: <20230130151612.212732-170-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_WATCHDOG_AUTOSTART defined in Kconfig Signed-off-by: Simon Glass --- board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index e78a0d5dd3c..89948e087f1 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -157,7 +157,7 @@ int fsl_board_late_init(void) * If the watchdog isn't enabled at reset (which is a configuration * option) disabling it doesn't hurt either. */ - if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) + if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) stop_recovery_watchdog(); return 0; From patchwork Mon Jan 30 15:16:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734233 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=GKh5+z46; 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 4P5C4F2vyJz23hS for ; Tue, 31 Jan 2023 02:37:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 436D385A8E; Mon, 30 Jan 2023 16:26:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="GKh5+z46"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 656B2859DC; Mon, 30 Jan 2023 16:20:36 +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,DKIMWL_WL_HIGH, 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-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 56A3C859DB for ; Mon, 30 Jan 2023 16:19:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12d.google.com with SMTP id m8so5218772ili.7 for ; Mon, 30 Jan 2023 07:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8KrFzJqcIuQFe0BMRdtgPr0ZnTt51NlVZ4NayzryfwY=; b=GKh5+z46bGBssNtKBHFhipc+LzU0DVAzd+zbvkaglzinOcvTDk9k60peHZ8FjUCSSs 2/oI7jxe7p+F3XPTHgpnbMbTimuabsy5fyW1oEoXFvGHITF5Gz8F9twAwXusi2KyzCjm lSekRy9JZTdMJhmSuTJuj+bdc4lSt2cPXRjFs= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8KrFzJqcIuQFe0BMRdtgPr0ZnTt51NlVZ4NayzryfwY=; b=n8xMl1+4CtViLdBdA8fmKQ2c2mG19n5Ms04Mw3xBbzyxSFaW2tjLoiTh+j0B5bGDiU 4n0LzJHPpahZjXCyJ8ntfGn5uIS6LDhrXX+vePFIqOCVoB1hVt/6/YoBckJOAisweQhI lIUpXk5LGpwYKbEtaezjpDWzluZvI/tQhPzRaS5gab5CwdK7jNktzUd2Ck9q4/OnMkev uC5XCJmQeB+jdZYR+TLnYTu1IdeITFHO0OWhQKhrOisz0GyGRrz3P2xlPtZCmX6u6PDg b5yvUJw3ta41LArP7p6XJkdfq98nX/TOoJKIa5COcEbdRPs9VLdmuQTZR9jQlKCj0j1K ltOQ== X-Gm-Message-State: AO0yUKUSfrzKLkNR9All+Y1dKjGHJ8q7wHp/RIYZR8VxTfRtULFxd+4u oKQqexF0epJ/j1WhVrQLksqaPc4CWhQ/8Ecc X-Google-Smtp-Source: AK7set9Uf0AIPjrRYmnkjb5A/8fvmsCSsGipuPKIgS3JY3pkjCBj3FPm2cYar8bDC0/XrBpgnUzCdw== X-Received: by 2002:a05:6e02:12e3:b0:310:9c6f:4269 with SMTP id l3-20020a056e0212e300b003109c6f4269mr6635857iln.19.1675091898270; Mon, 30 Jan 2023 07:18:18 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Anastasiia Lukianenko , Oleksandr Andrushchenko Subject: [PATCH 170/171] Correct SPL uses of XEN_SERIAL Date: Mon, 30 Jan 2023 08:16:11 -0700 Message-Id: <20230130151612.212732-171-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 4 usages of this option to the non-SPL form, since there is no SPL_XEN_SERIAL defined in Kconfig Signed-off-by: Simon Glass --- drivers/xen/events.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 532216fece3..2ebe20dbf26 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -23,9 +23,9 @@ #include #include -#if CONFIG_IS_ENABLED(XEN_SERIAL) +#if IS_ENABLED(CONFIG_XEN_SERIAL) extern u32 console_evtchn; -#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ +#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */ #define NR_EVS 1024 @@ -53,10 +53,10 @@ void unbind_all_ports(void) struct vcpu_info *vcpu_info = &s->vcpu_info[cpu]; for (i = 0; i < NR_EVS; i++) { -#if CONFIG_IS_ENABLED(XEN_SERIAL) +#if IS_ENABLED(CONFIG_XEN_SERIAL) if (i == console_evtchn) continue; -#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ +#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */ if (test_and_clear_bit(i, bound_ports)) { printf("port %d still bound!\n", i); From patchwork Mon Jan 30 15:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734231 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=cAcmlXSQ; 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 4P5C3m4GKjz23hS for ; Tue, 31 Jan 2023 02:37:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5585A85A7F; Mon, 30 Jan 2023 16:26:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="cAcmlXSQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A7F9859D9; Mon, 30 Jan 2023 16:20:34 +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,DKIMWL_WL_HIGH, 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-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 B1AE9859DC for ; Mon, 30 Jan 2023 16:19:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id l7so3351363ilf.0 for ; Mon, 30 Jan 2023 07:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=57J5IQ4rerhCqGJHOeI0wUIzJIvJUM5nGsM35W7hOJc=; b=cAcmlXSQXqvwveBQZ5l8ixZjbLMTn8HIF6+tLNZECbZay2GGDFxTb4Jmlo8RBrO9Kv dTTrsUaFCe0FkmILNWeLiT63g4kSNDEQz73lAeRBILa8tm4dB7jNzs5wwTukChQpBpC3 4CTB4hBf5YyCg2kN2eEX93vU8OCY9MPGkVqIs= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=57J5IQ4rerhCqGJHOeI0wUIzJIvJUM5nGsM35W7hOJc=; b=nn5rF0VZHZHBSMV7FuC157KaXKXnQQ8OMkpGmboNOsRdFRWmgZlP7PsqSSIhtlRuWR yLI94iUyIGb63LuT5m4OnIyqZ6tHftd/H3oO3FeKGq8CyZAAKOVNw2vu6NlerzlJ/zyE umuvvUs0a0UlvflJg5lR49DSNYj/dYxlPy3oeis8H7NiIayFisR38vwdRoSmcb2403P9 QQJefw7/fF4APcA2zhcDPU6b3TvmANFUbYa/SdLCVDpkg0ZDVfpBZDOwaVZmWSXZkMrD yNCnMR94FDx1r1gjlTroorjZ6WSF0uWy9R0/uCBYJmT2YMmjDlqcAcsxW6F/dgrhL/xe vYJw== X-Gm-Message-State: AO0yUKX00qlnJpfrJCdMP74xkQFjSMV2TESGZEniGx6Q4plv9NkR1vSP Fs+YQw3YMkBNK/ifoGv3KSWVCBMWsFF+iZRj X-Google-Smtp-Source: AK7set8fIV0xaXdt0PTuAkez00tjUbXBdJaYuQTdDSbmjmjPFRcGbBAuPoxGrUz3OCqpMXD3jskRxw== X-Received: by 2002:a05:6e02:1c0f:b0:310:e9f4:1e32 with SMTP id l15-20020a056e021c0f00b00310e9f41e32mr5319906ilh.19.1675091899053; Mon, 30 Jan 2023 07:18:19 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:18 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki , Michal Simek Subject: [PATCH 171/171] Correct SPL uses of ZYNQMP_FIRMWARE Date: Mon, 30 Jan 2023 08:16:12 -0700 Message-Id: <20230130151612.212732-172-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 2 usages of this option to the non-SPL form, since there is no SPL_ZYNQMP_FIRMWARE defined in Kconfig Signed-off-by: Simon Glass --- drivers/spi/cadence_ospi_versal.c | 2 +- drivers/spi/cadence_qspi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c index e0d5e6b9e69..434c6038f3b 100644 --- a/drivers/spi/cadence_ospi_versal.c +++ b/drivers/spi/cadence_ospi_versal.c @@ -216,7 +216,7 @@ int cadence_qspi_versal_flash_reset(struct udevice *dev) void cadence_qspi_apb_enable_linear_mode(bool enable) { - if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) { + if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { if (enable) /* ahb read mode */ xilinx_pm_request(PM_IOCTL, PM_DEV_OSPI, diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 3ce5f8fb8d8..c7f10c50132 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -215,7 +215,7 @@ static int cadence_spi_probe(struct udevice *bus) priv->tchsh_ns = plat->tchsh_ns; priv->tslch_ns = plat->tslch_ns; - if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) + if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) xilinx_pm_request(PM_REQUEST_NODE, PM_DEV_OSPI, ZYNQMP_PM_CAPABILITY_ACCESS, ZYNQMP_PM_MAX_QOS, ZYNQMP_PM_REQUEST_ACK_NO, NULL);