All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 11/38] spl: Add a function to determine the U-Boot phase
Date: Wed, 25 Sep 2019 08:11:20 -0600	[thread overview]
Message-ID: <20190925141147.191166-12-sjg@chromium.org> (raw)
In-Reply-To: <20190925141147.191166-1-sjg@chromium.org>

U-Boot is built in three phases: TPL, SPL and U-Boot proper. Sometimes
it is necessary to use different init code depending on the phase. For
example, TPL might do very basic CPU init, SPL might do a little more
and U-Boot proper might bring the CPU up to full speed and enable all
cores.

Add a function which allows easy determination of the current phase being
built.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 include/spl.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/include/spl.h b/include/spl.h
index 4bc35cb0e77..2869c9dc702 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -49,6 +49,66 @@ static inline bool u_boot_first_phase(void)
 	return false;
 }
 
+enum u_boot_phase {
+	PHASE_TPL,
+	PHASE_SPL,
+	PHASE_U_BOOT,
+};
+
+/**
+ * spl_phase() - Find out the phase of U-Boot
+ *
+ * This can be used to avoid #ifdef logic and use if() instead.
+ *
+ * For example, to include code only in TPL, you might do:
+ *
+ *    #ifdef CONFIG_TPL_BUILD
+ *    ...
+ *    #endif
+ *
+ * but with this you can use:
+ *
+ *    if (spl_phase() == PHASE_TPL) {
+ *       ...
+ *    }
+ *
+ * To include code only in SPL, you might do:
+ *
+ *    #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD)
+ *    ...
+ *    #endif
+ *
+ * but with this you can use:
+ *
+ *    if (spl_phase() == PHASE_SPL) {
+ *       ...
+ *    }
+ *
+ * To include code only in U-Boot proper, you might do:
+ *
+ *    #ifndef CONFIG_SPL_BUILD
+ *    ...
+ *    #endif
+ *
+ * but with this you can use:
+ *
+ *    if (spl_phase() == PHASE_U_BOOT) {
+ *       ...
+ *    }
+ *
+ * @return U-Boot phase
+ */
+static inline enum u_boot_phase spl_phase(void)
+{
+#ifdef CONFIG_TPL_BUILD
+	return PHASE_TPL;
+#elif CONFIG_SPL_BUILD
+	return PHASE_SPL;
+#else
+	return PHASE_U_BOOT;
+#endif
+}
+
 /* A string name for SPL or TPL */
 #ifdef CONFIG_SPL_BUILD
 # ifdef CONFIG_TPL_BUILD
-- 
2.23.0.444.g18eeb5a265-goog

  parent reply	other threads:[~2019-09-25 14:11 UTC|newest]

Thread overview: 132+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-25 14:11 [U-Boot] [PATCH v2 00/38] x86: Various modifications to prepare for FSP2 Simon Glass
2019-09-25 14:11 ` [U-Boot] [PATCH v2 01/38] binman: Pass the toolpath to binman from the main Makefile Simon Glass
2019-10-02 13:55   ` Bin Meng
2019-10-03  2:02     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 02/38] binman: Allow selection of logging verbosity Simon Glass
2019-10-02 13:56   ` Bin Meng
2019-10-03  2:02     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 03/38] dm: gpio: Allow control of GPIO uclass in SPL Simon Glass
2019-10-02 13:56   ` Bin Meng
2019-10-03  2:02     ` Bin Meng
2019-10-04  2:58       ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 04/38] mtd: spi: Add 'struct spi_flash {' to the code Simon Glass
2019-10-02 13:56   ` Bin Meng
2019-10-03  2:02     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 05/38] serial: ns16550: Allow serial to enabled/disabled in SPL Simon Glass
2019-10-02 13:56   ` Bin Meng
2019-10-03  2:02     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 06/38] spl: Correct priority selection for image loaders Simon Glass
2019-09-26 12:32   ` Simon Goldschmidt
2019-09-25 14:11 ` [U-Boot] [PATCH v2 07/38] spl: Avoid checking for Ctrl-C in SPL with print_buffer() Simon Glass
2019-10-02 13:58   ` Bin Meng
2019-10-03  7:38     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 08/38] spl: handoff: Correct Kconfig condition for SPL and TPL Simon Glass
2019-10-02 13:58   ` Bin Meng
2019-10-03  7:38     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 09/38] spl: Add an arch-specific hook for writing to SPL handoff Simon Glass
2019-10-02 13:58   ` Bin Meng
2019-10-03  7:38     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 10/38] spl: Set up the bloblist in board_init_r() Simon Glass
2019-10-02 13:58   ` Bin Meng
2019-10-03  7:38     ` Bin Meng
2019-09-25 14:11 ` Simon Glass [this message]
2019-10-02 13:58   ` [U-Boot] [PATCH v2 11/38] spl: Add a function to determine the U-Boot phase Bin Meng
2019-10-03  7:50     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 12/38] x86: spi: Add a driver for the Intel Fast SPI interface Simon Glass
2019-10-09 13:10   ` Bin Meng
2019-10-19  2:43     ` Simon Glass
2019-10-21  2:34       ` Bin Meng
2019-10-21  3:16         ` Simon Glass
2019-09-25 14:11 ` [U-Boot] [PATCH v2 13/38] spi: sandbox: Add a test driver for sandbox SPI flash Simon Glass
2019-10-09 13:50   ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 14/38] spi: Add support for memory-mapped flash Simon Glass
2019-10-09 13:55   ` Bin Meng
2019-10-12  3:08     ` Simon Glass
2019-10-12  4:33       ` Bin Meng
2019-10-16 10:29         ` Vignesh Raghavendra
2019-10-16 16:40           ` Simon Glass
2019-10-18  8:51             ` Vignesh Raghavendra
2019-10-18 14:13               ` Simon Glass
2019-10-17 14:28           ` Simon Glass
2019-10-18  2:22             ` Simon Glass
2019-10-18  2:32               ` Bin Meng
2019-10-18 14:14                 ` Simon Glass
2019-10-18 15:38                   ` Bin Meng
2019-10-18 20:37                     ` Simon Glass
2019-10-21  2:29                       ` Bin Meng
2019-10-21  3:14                         ` Simon Glass
2019-10-18  9:48               ` Vignesh Raghavendra
2019-10-18 14:13                 ` Simon Glass
2019-09-25 14:11 ` [U-Boot] [PATCH v2 15/38] x86: sysreset: Allow reset driver to be included in SPL/TPL Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  7:50     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 16/38] x86: Rename some FSP functions to have an fsp_ prefix Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  7:57     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 17/38] x86: fsp: Create a common fsp_support.h header Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  8:32     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 18/38] x86: fsp: Use if() instead of #ifdef Simon Glass
2019-10-03  8:16   ` Bin Meng
2019-10-03  8:23     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 19/38] x86: fsp: Tidy up comment style a little Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  8:29     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 20/38] x86: fsp: Move common dram functions into a common file Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  8:35     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 21/38] x86: Move common fsp " Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  8:44     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 22/38] x86: fsp: Move common support " Simon Glass
2019-10-02 14:06   ` Bin Meng
2019-10-03  8:44     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 23/38] efi: Move inline functions to unconditional part of header Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:44     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 24/38] x86: fsp: Add a few more definitions for FSP2 Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:44     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 25/38] x86: fsp: Add access to variable MRC data Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:44     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 26/38] x86: Move common Intel CPU info code into a function Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:56     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 27/38] x86: Add binman symbols to the image Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:56     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 28/38] x86: pci: Add a function to clear and set PCI config regs Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:56     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 29/38] x86: spl: Use hang() instead of a while() loop Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:56     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 30/38] x86: spl: Reduce priority of the basic SPL image loader Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  8:57     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 31/38] x86: spl: Move broadwell-specific code out of generic x86 spl Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-03  9:09     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 32/38] x86: fsp: Save usable RAM and hob_list in the handoff area Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-04  3:06     ` Bin Meng
2019-10-04  3:28       ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 33/38] x86: fsp: Allow the HOBs to be used after relocation Simon Glass
2019-10-04  3:23   ` Bin Meng
2019-10-10 17:06     ` Simon Glass
2019-09-25 14:11 ` [U-Boot] [PATCH v2 34/38] x86: Change condition for using CAR Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-04  3:28     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 35/38] x86: Add more comments to the start-up code Simon Glass
2019-10-02 14:07   ` Bin Meng
2019-10-04  3:28     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 36/38] x86: Add support for booting from Fast SPI Simon Glass
2019-10-02 14:08   ` Bin Meng
2019-10-12  2:55     ` Simon Glass
2019-09-25 14:11 ` [U-Boot] [PATCH v2 37/38] x86: Add various MTRR indexes and values Simon Glass
2019-10-02 14:08   ` Bin Meng
2019-10-04  4:05     ` Bin Meng
2019-09-25 14:11 ` [U-Boot] [PATCH v2 38/38] x86: Rename turbo ratio MSR to MSR_TURBO_RATIO_LIMIT Simon Glass
2019-10-02 14:08   ` Bin Meng
2019-10-04  4:05     ` Bin Meng

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=20190925141147.191166-12-sjg@chromium.org \
    --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.