From patchwork Thu May 6 14:24:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1475044 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=aQWEKpQ5; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fbbjc1wJhz9sW7 for ; Fri, 7 May 2021 00:36:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E07B82E67; Thu, 6 May 2021 16:33:14 +0200 (CEST) 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="aQWEKpQ5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C427A82E56; Thu, 6 May 2021 16:32:40 +0200 (CEST) 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,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) (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 414A982D62 for ; Thu, 6 May 2021 16:25:36 +0200 (CEST) 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-ot1-x32a.google.com with SMTP id c8-20020a9d78480000b0290289e9d1b7bcso5014883otm.4 for ; Thu, 06 May 2021 07:25:36 -0700 (PDT) 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=ga2Hwz7JzcjZIAPUGeEuIr6PVlVIqDgyOQGBz5gHjQw=; b=aQWEKpQ5MYtnvvLLyJKoXuT9HxHlZgekzDkceRTfX/CGp1OIGKeKYci8i6lgCf/Zji xhY+QEPMU+FSDfHLzN+ioupoVc/QbcCezuPMeXwEVZCW9A8Yh/VppBHsZ6WG9Kd6NR5k k0GCoxUrY3xieSoTr4W5Cc9afYiukY7uEvA8A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ga2Hwz7JzcjZIAPUGeEuIr6PVlVIqDgyOQGBz5gHjQw=; b=N4b4GzwaZnn8+QG3rjkKkOx3e0fT1JZ4mz8vqNpIfiR5HemLBd+ZaGBQSIwWYenQqX JrAiFNzABWOLDphmXG/EET4/iSluaEv1gT41iee51YJjcVZ8MZUxDLbCacYZapvgw/7l 5rNTvwndbk9S3FJ6y2yw0H5MSGbo0Ui7dZ4+Nv2sX5v4P+1ACzv4FMinr4wJWLTyLzq7 jq/veW5zWcl4yTyriZQ9ya+hJDyBPY++Oyn0EQJc26j1yRMQ/VStklXuednl6hRaX1Dn LHrAn6myNqtwJLAXclY+JMmMXKDXF5KiGuB0oesgjX0TuqhkbxlHYAw9jxvBEOaWxmg7 B/OA== X-Gm-Message-State: AOAM533sdzLHqQT1nmW4KAC/ez7BXnRA9goR+ixnxSFBFHKBTxx9DT8I HN0q0HxM5AUOmyNyepRbSbN8QUzsigTgYxRa X-Google-Smtp-Source: ABdhPJxASzRTGtUb4naFRklanHNRgB6qePtJ/ISkHCWdGUEp+ZisZAzPtb5wWe5WHSA7bYdCXH5+Vg== X-Received: by 2002:a05:6830:15c9:: with SMTP id j9mr3730504otr.73.1620311134809; Thu, 06 May 2021 07:25:34 -0700 (PDT) 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 z204sm445490oia.2.2021.05.06.07.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 07:25:34 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Andre Przywara , Masahiro Yamada , Rasmus Villemoes , Robert Marko , Bin Meng , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v2 33/50] image: Drop IMAGE_BOOT_GET_CMDLINE Date: Thu, 6 May 2021 08:24:21 -0600 Message-Id: <20210506142438.1310977-6-sjg@chromium.org> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog In-Reply-To: <20210506142438.1310977-1-sjg@chromium.org> References: <20210506142438.1310977-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean This is not needed with Kconfig, since we can use IS_ENABLED() easily enough. Update the only place where this is used and drop it. Signed-off-by: Simon Glass --- (no changes since v1) common/image-board.c | 2 +- include/image.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/common/image-board.c b/common/image-board.c index 0b9809c3f6b..1a3b0bc7efc 100644 --- a/common/image-board.c +++ b/common/image-board.c @@ -898,7 +898,7 @@ int image_setup_linux(bootm_headers_t *images) if (CONFIG_IS_ENABLED(OF_LIBFDT)) boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); - if (IMAGE_BOOT_GET_CMDLINE) { + if (IS_ENABLED(CONFIG_SYS_BOOT_GET_CMDLINE)) { ret = boot_get_cmdline(lmb, &images->cmdline_start, &images->cmdline_end); if (ret) { diff --git a/include/image.h b/include/image.h index f4b8dd7dd0f..122fc25e1b4 100644 --- a/include/image.h +++ b/include/image.h @@ -49,12 +49,6 @@ struct fdt_region; #endif /* FIT */ -#ifdef CONFIG_SYS_BOOT_GET_CMDLINE -# define IMAGE_BOOT_GET_CMDLINE 1 -#else -# define IMAGE_BOOT_GET_CMDLINE 0 -#endif - #ifdef CONFIG_OF_BOARD_SETUP # define IMAGE_OF_BOARD_SETUP 1 #else