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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ABA4C48BC2 for ; Sun, 27 Jun 2021 23:53:50 +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 B6768619C4 for ; Sun, 27 Jun 2021 23:53:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B6768619C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8122582DB5; Mon, 28 Jun 2021 01:52:12 +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="MnG3Ko35"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9157C82D50; Mon, 28 Jun 2021 01:51:38 +0200 (CEST) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 6EBCA82D7E for ; Mon, 28 Jun 2021 01:51:33 +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-x329.google.com with SMTP id g19-20020a9d12930000b0290457fde18ad0so16750809otg.1 for ; Sun, 27 Jun 2021 16:51:33 -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=lEfJpZV1+rKvXZ0XCvlkPbwIii8AF1cLie3uvFYrs4w=; b=MnG3Ko35ye40ly4oc9HrGwo3BLU9pxY72PRjD98MMgoCtrkgLUcJ/LDUtCIBHJSklF +dp7n7abmZfo0eFm82t4wBq3lXtRSmgaxq2VDovt+Z8SWFGZQ3get8wXkFj5sshMmwHY 3iHq0zV0ICkrlY87JDZRfL+WV657D0v0Wg3to= 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=lEfJpZV1+rKvXZ0XCvlkPbwIii8AF1cLie3uvFYrs4w=; b=a5zBR42Owk++mdN5sHYnjU5ze6slPXCRjhkxZofnC8r5g2+hYE8kKYxFVP2apCUFor 8iHR79CC/mnckKQ6bENrmCr64gEaGMiR1s15+kuQ5qk0skdpC06S5cK7/QZy9qRF4pTo d9s158x43nUHgeTtMMszCoZfh0Tf9hbzC4OZMZMQXMgi0UZpxXIpoeGkkQE83ZeW1JZ5 qq/7vBPm4BZQ8e4A3v80CBuY1tfmGLI6DPSwZiSS0uWGmr/UOHVYsvcMhwPdy4YpC3L2 Cm3UGHA4pDbJGET8uDKjlYKK3/kZTduTrHkdUFW55X4gwt9hCJ1AohRuatXxnvNhMjAh uatA== X-Gm-Message-State: AOAM532dwLGZDRh1hzySbr37lNJELfwl01SnoINI1CPBrT7yKWcgUuLg 5PH2r/mMjvGzPA6jjwFDbp+dqQ3XhrhK8Sj7 X-Google-Smtp-Source: ABdhPJwLP78nR/0us4A9LPMsLljHb+BH1N660Jpmmr8oascdvakGNVZ+etQOcgVFekfsE1679u6rzQ== X-Received: by 2002:a05:6830:270b:: with SMTP id j11mr18477672otu.161.1624837892000; Sun, 27 Jun 2021 16:51:32 -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 bb34sm1297928oob.39.2021.06.27.16.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jun 2021 16:51:31 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Jaehoon Chung Subject: [PATCH v3 14/16] x86: cros: Check ROM exists before building vboot Date: Sun, 27 Jun 2021 17:51:09 -0600 Message-Id: <20210627175102.v3.14.Ic5602c03301b09f3ae3fc1b3fb5809ee130866e8@changeid> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210627235111.485507-1-sjg@chromium.org> References: <20210627235111.485507-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 All the x86 devicetree files are built at once, whichever board is actually being built. If coreboot is the target build, CONFIG_ROM_SIZE is not defined and samus cannot build Chromium OS verified boot. Add this condition to avoid errors about CONFIG_ROM_SIZE being missing. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Reviewed-by: Jaehoon Chung --- (no changes since v2) Changes in v2: - Add 'cros' tag since this not a generic x86 change arch/x86/dts/chromebook_coral.dts | 2 +- arch/x86/dts/chromebook_samus.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts index c8cb4e21c6d..66c31efb6cd 100644 --- a/arch/x86/dts/chromebook_coral.dts +++ b/arch/x86/dts/chromebook_coral.dts @@ -10,7 +10,7 @@ /include/ "rtc.dtsi" /include/ "tsc_timer.dtsi" -#ifdef CONFIG_CHROMEOS_VBOOT +#if defined(CONFIG_CHROMEOS_VBOOT) && defined(CONFIG_ROM_SIZE) #include "chromeos-x86.dtsi" #include "flashmap-x86-ro.dtsi" #include "flashmap-16mb-rw.dtsi" diff --git a/arch/x86/dts/chromebook_samus.dts b/arch/x86/dts/chromebook_samus.dts index adaeb1ea355..ad35ab2e3fd 100644 --- a/arch/x86/dts/chromebook_samus.dts +++ b/arch/x86/dts/chromebook_samus.dts @@ -11,7 +11,7 @@ #include "smbios.dtsi" -#ifdef CONFIG_CHROMEOS_VBOOT +#if defined(CONFIG_CHROMEOS_VBOOT) && defined(CONFIG_ROM_SIZE) #include "chromeos-x86.dtsi" #include "flashmap-x86-ro.dtsi" #include "flashmap-8mb-rw.dtsi" -- 2.32.0.93.g670b81a890-goog