From patchwork Sun Feb 12 23:16: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: 1741262 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=G4WnseAT; 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 4PFPKN0cXMz23r9 for ; Mon, 13 Feb 2023 10:47:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52FD28559B; Mon, 13 Feb 2023 00: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="G4WnseAT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 51520854EA; Mon, 13 Feb 2023 00:47:31 +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-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (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 587C485839 for ; Mon, 13 Feb 2023 00:18: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=sjg@chromium.org Received: by mail-io1-xd35.google.com with SMTP id l128so3958378iof.2 for ; Sun, 12 Feb 2023 15:18:16 -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=CkJppTTgCVRJEpCS5VsjaItUtzVQ4Z0FNGzkvNpRlr0=; b=G4WnseATa9+5MjizCLdF4n1f+0/UTyzTk3tCrHBNK4oPkP3wZkQTOOklsTMDcF3bnb duIpv4vGNTUuPJ/169Uziyih4y/t9wLXqSzaNOJwJLoaOzNyvN066eSGcM3RXTfzY9Hz buw5I49WPIBFE9EZjYvjxuzleBl6qaFg3FS34= 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=CkJppTTgCVRJEpCS5VsjaItUtzVQ4Z0FNGzkvNpRlr0=; b=i521Vr7yRdo5YH+xSXMlgTzwm5jfozNLEq7AG7fWhIuHLOJiknbDWfbr7/Rce9sRtG vk7uz0pFLDGCNB6YUHrxekxjdp9UMGirLwYAj0QoSI5skGgMvVxFR0ixBbT52P+JH2tc bT3x9oub/TLqojc0qb3q0i2IapQKg/CGYbkU4dUjfiHho5RK2HCy/DB7amRKqkUVXY5M 5z5+gd5jmziQ3gZuliPZqzG+MgQMlETIZUJAtMYvElKuQttu4qAbKBnHkZ/LuXAVd/Jp i5REoGGioRQBR4BR6JV7V81Dzz5fxtxRtVqYRUg7V6X0y9MPSXykWx1jDcjKLR22UTRa F/tg== X-Gm-Message-State: AO0yUKUHZF/CqBdrwaiVGV1qCOc3/enITZODvdQpJDYR6H1jsr6BHrfh CsRX+fQ+3P/PWOAYDCapbQ3wqoUckJsiTrdE X-Google-Smtp-Source: AK7set8gDIXnIeip1BHsU2fmgPRxqfj57RhaNgZIj2lLIZWwirX9ZQfbK+okYOF2GDXcOhnOl/qv2Q== X-Received: by 2002:a05:6602:1584:b0:6e9:d035:45df with SMTP id e4-20020a056602158400b006e9d03545dfmr28886659iow.6.1676243895846; Sun, 12 Feb 2023 15:18:15 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id n16-20020a6b8b10000000b006dfbd35e995sm3627849iod.21.2023.02.12.15.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 15:18:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Lukasz Majewski Subject: [PATCH v3 79/95] power: wanderboard: Correct conditions for split config Date: Sun, 12 Feb 2023 16:16:22 -0700 Message-Id: <20230212231638.1134219-80-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230212231638.1134219-1-sjg@chromium.org> References: <20230212231638.1134219-1-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 currently causes a build error with wanderboard. Fix it by adding a missing CONFIG and correcting the build condition so that it does not change when building SPL. Signed-off-by: Simon Glass --- (no changes since v1) configs/wandboard_defconfig | 1 + include/power/pmic.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index a6baff1e24c..05383f6e47b 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -71,6 +71,7 @@ CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_PMIC=y +CONFIG_SPL_DM_PMIC=y CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y diff --git a/include/power/pmic.h b/include/power/pmic.h index 70f2709bd0b..f3045f82ad7 100644 --- a/include/power/pmic.h +++ b/include/power/pmic.h @@ -85,8 +85,7 @@ struct pmic { }; #endif /* CONFIG_IS_ENABLED(POWER_LEGACY) */ -/* TODO: Change to CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */ -#ifdef CONFIG_DM_PMIC +#ifdef CONFIG_PPL_DM_PMIC /** * U-Boot PMIC Framework * =====================