From patchwork Thu Jan 13 02:26:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1579441 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=PI/QKcf8; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JZ7c95Qfjz9s1l for ; Thu, 13 Jan 2022 13:27:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 25CE583301; Thu, 13 Jan 2022 03: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="PI/QKcf8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48C0683282; Thu, 13 Jan 2022 03:26: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.7 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 97260832CF for ; Thu, 13 Jan 2022 03:26: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-x12f.google.com with SMTP id u5so24859ilq.9 for ; Wed, 12 Jan 2022 18:26:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MObjNbDbmRXr9MrUwzyugYwKSjHNZqcVQNsAiQmTErU=; b=PI/QKcf8X1mqAZ82uxIMf1coeU4YS0sP7hS5ZdkE6T2EoSqNSSF5JsL6omEgA/1iHR DdWaUSYgnSL7g2I1c67MYjOUmYU1ycBjyxVMeXpy7M8hI403EkOXts494IB7c2HYX0LN yXE8TCYTpp8uHYREyyOEonUaaJ3jZN6UUlkpA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MObjNbDbmRXr9MrUwzyugYwKSjHNZqcVQNsAiQmTErU=; b=eVvOb8N5f6USZWH+s0ncxHdCC8ZyBLDCMN8lVVYm4O+sKNOUnRmOll5PLd3kyFmEG9 hiHIdVSLN52vFMKlpaxqQz6qohYv5FxbOBzv5W1lHhLkmYpiAEqi/NMS3WO7MTIljl+l 1xjGP7G4PEIR3bRvP4R0FPoERx6rJ1v5Fw3080/O6cTZG1KI4YexwkoPN4H+PoCT7MNA B0Z5tqVHiryKKHFrf2odtGhkD1/S2sOUFtvTBZypEsVl40BleXO7xkYkvYRTW/J5opv/ kqL4WtQ1oo6Q3xM0z28VfvZiOWQwc9yRklk9khOjL0BCqvesjlcBDG2r4GJ7+nHmhrs8 71uw== X-Gm-Message-State: AOAM530ODDyhSrwn+hGDpKOeTYQlmIekD15I4WPAMoIHEZeWb3Fwf9yS Rpwg4uEOo3H8bY/foznou6KJJzEyvo4RSA== X-Google-Smtp-Source: ABdhPJxcKcLKMYrUHFhRMHM4juVneRnMOoNzoih6NxTa3Hm4f6p8LGqVRNQII+MtO371XiklIu1vlw== X-Received: by 2002:a92:ca0d:: with SMTP id j13mr1284081ils.128.1642040810228; Wed, 12 Jan 2022 18:26:50 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id e17sm965634ili.37.2022.01.12.18.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:26:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jerry Van Baren Subject: [PATCH v2 02/12] fdt: Drop SPL_BUILD macro Date: Wed, 12 Jan 2022 19:26:15 -0700 Message-Id: <20220113022625.413990-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog In-Reply-To: <20220113022625.413990-1-sjg@chromium.org> References: <20220113022625.413990-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.2 at phobos.denx.de X-Virus-Status: Clean This old macro is not needed anymore since we can use IS_ENABLED() now. Drop it. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- (no changes since v1) drivers/serial/serial-uclass.c | 3 ++- include/fdtdec.h | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 30d44214d7d..96a1cb65ba2 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -104,7 +104,8 @@ static void serial_find_console_or_panic(void) } } } - if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !blob) { + if (!IS_ENABLED(CONFIG_SPL_BUILD) || !CONFIG_IS_ENABLED(OF_CONTROL) || + !blob) { /* * Try to use CONFIG_CONS_INDEX if available (it is numbered * from 1!). diff --git a/include/fdtdec.h b/include/fdtdec.h index 09525ce510a..15f2d2bbbaa 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -49,12 +49,6 @@ struct fdt_memory { struct bd_info; -#ifdef CONFIG_SPL_BUILD -#define SPL_BUILD 1 -#else -#define SPL_BUILD 0 -#endif - /** * enum fdt_source_t - indicates where the devicetree came from *