All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH v2 14/16] x86: cros: Check ROM exists before building vboot
Date: Sat, 24 Apr 2021 16:56:24 +1200	[thread overview]
Message-ID: <20210424165534.v2.14.Ic5602c03301b09f3ae3fc1b3fb5809ee130866e8@changeid> (raw)
In-Reply-To: <20210424045627.313802-1-sjg@chromium.org>

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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
---

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.31.1.498.g6c1eba8ee3d-goog

  parent reply	other threads:[~2021-04-24  4:56 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-24  4:56 [PATCH v2 00/16] misc: Some more misc patches Simon Glass
2021-04-24  4:56 ` [PATCH v2 01/16] pci: Use const for pci_find_device_id() etc Simon Glass
2021-04-24  4:56 ` [PATCH v2 02/16] x86: pci: Allow binding of some devices before relocation Simon Glass
2021-05-10  6:27   ` Bin Meng
2021-04-24  4:56 ` [PATCH v2 03/16] x86: Allow coreboot serial driver to guess the UART Simon Glass
2021-04-24  4:56 ` [PATCH v2 04/16] spi: ich: Don't require the PCH Simon Glass
2021-04-24  4:56 ` [PATCH v2 05/16] tpm: cr50: Drop unnecessary coral headers Simon Glass
2021-04-24  4:56 ` [PATCH v2 06/16] x86: Don't set up MTRRs if previously done Simon Glass
2021-04-24  4:56 ` [PATCH v2 07/16] x86: Update the MP constants to avoid conflicts Simon Glass
2021-04-24  4:56 ` [PATCH v2 08/16] x86: Do cache set-up by default when booting from coreboot Simon Glass
2021-04-24  4:56 ` [PATCH v2 09/16] x86: coreboot: Show the BIOS date Simon Glass
2021-05-10  3:09   ` Bin Meng
2021-04-24  4:56 ` [PATCH v2 10/16] x86: coral: Allow booting from coreboot Simon Glass
2021-04-24  4:56 ` [PATCH v2 11/16] x86: Add function comments to cb_sysinfo.h Simon Glass
2021-04-24  4:56 ` [PATCH v2 12/16] x86: coreboot: Use vendor in the Kconfig Simon Glass
2021-05-10  5:48   ` Bin Meng
2021-04-24  4:56 ` [PATCH v2 13/16] x86: coreboot: Document the memory map Simon Glass
2021-05-10  5:49   ` Bin Meng
2021-04-24  4:56 ` Simon Glass [this message]
2021-04-24  4:56 ` [PATCH v2 15/16] dtoc: Check that a parent is not missing Simon Glass
2021-05-10  5:52   ` Bin Meng
2021-04-24  4:56 ` [PATCH v2 16/16] doc: Update documentation for cros-2021.04 release Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210424165534.v2.14.Ic5602c03301b09f3ae3fc1b3fb5809ee130866e8@changeid \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.