From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC43AC433F5 for ; Sun, 26 Sep 2021 01:46:36 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 237DE61090 for ; Sun, 26 Sep 2021 01:46:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 237DE61090 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E3E3383562; Sun, 26 Sep 2021 03:45:31 +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="KVrr7Q6B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11F6E83276; Sun, 26 Sep 2021 03:44:38 +0200 (CEST) Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) (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 A91A2835D2 for ; Sun, 26 Sep 2021 03:44:03 +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-x32e.google.com with SMTP id j11-20020a9d190b000000b00546fac94456so18938241ota.6 for ; Sat, 25 Sep 2021 18:44:03 -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=BfYkYLFDiE186MQf7YKkRMLyRE1Ny9ujwLvNeeNCg44=; b=KVrr7Q6BOJigzWYFUhI08n/qir2UKfcjxTlsIquy0Yx+P4j7JWz/GE4fPgZYdiCXDa D6MwOLpWzgFgW/HrjfIaQ+/vnrraEByt8iWPfmeXuEyVQT2R60iNjID0cDi6PfqenHCm XcsvDFF24oFXawDZwEZJWwwCcQjCaerw9Mee8= 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=BfYkYLFDiE186MQf7YKkRMLyRE1Ny9ujwLvNeeNCg44=; b=grcZ9FNrqsAkEx+6EfUYVZbQmVHQA6D8sqr+6v/1ZslLrDx5pSIx0xtVYVaBqjREf4 vLYaGpEmwHJCn56iSv/mh0CfmWWJA/U7Onxv6C1a60bjdis3WmsBhfLv5W0+dJuQBM7x zvhivTud9zbBAtZKe5kOyTPsY7vmXb8h3wUDjtBg74L5lzUlDi29ToXlxJWV9uUVClVU r/qH8YDtfg3VIKkMYmgnPPIkjndS0fJ8Km24tAr1V+DUcbYcpv8T72RU3Gpiz+AkbgQj lLXDUO4TuK6zvzqib2LVrTjRnYjYQ+GzP4dRzygNc6qttzOv28mRZScvQQdx0pLuLIKe 06AA== X-Gm-Message-State: AOAM531EgreL1g7TAX7SVsbsoYJN7fDpis5+yTin054pcziRWkHADLPx dJgsy0j5NCBY2w1SZxhvpIR+TgYHLe6NZw== X-Google-Smtp-Source: ABdhPJzzhVKWILenE/pe9P8jGBUeGlbekKCBzqYWVJfG85n/Jo/6kjAy6k5wRbBdJI7hJ/jNv+xCmQ== X-Received: by 2002:a9d:6156:: with SMTP id c22mr10860045otk.383.1632620641795; Sat, 25 Sep 2021 18:44:01 -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 c18sm330378otr.72.2021.09.25.18.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 18:44:01 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alexandru Gagniuc , Andre Przywara , Rasmus Villemoes , Robert Marko , Masahiro Yamada , Tom Rini , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v5 12/29] image: Drop IMAGE_BOOT_GET_CMDLINE Date: Sat, 25 Sep 2021 19:43:25 -0600 Message-Id: <20210926014342.127913-6-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210926014342.127913-1-sjg@chromium.org> References: <20210926014342.127913-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.103.2 at phobos.denx.de X-Virus-Status: Clean This is not needed with Kconfig, since we can use IS_ENABLED() easily enough and the board code is now in a separate file. Update the only place where this is used and drop it. Signed-off-by: Simon Glass --- Changes in v5: - Update commit message to indicate that the code is in a separate file 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 a9a6011ce02..599d6779df5 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 dc872ef5b24..00a80999584 100644 --- a/include/image.h +++ b/include/image.h @@ -49,12 +49,6 @@ struct fdt_region; #include #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 -- 2.33.0.685.g46640cef36-goog