diff mbox series

include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile

Message ID 20210429164339.37001-1-elly.siew.chin.lim@intel.com
State New
Delegated to: Simon Goldschmidt
Headers show
Series include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile | expand

Commit Message

Siew Chin Lim April 29, 2021, 4:43 p.m. UTC
Legacy boot flow (SPL->U-Boot Proper->OS) boot to OS via Kernel Image and
dtb files using booti command.

ATF boot flow (SPL->ATF->U-Boot Proper->OS) boot to OS via kernel.itb file
using bootm command.

Change to use CONFIG_SPL_ATF to differentiate the bootfile of default
environment variable. We shouldn't use CONFIG_FIT because it is enabled
by default for U-Boot Proper.

Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com>
---
 include/configs/socfpga_soc64_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ley Foon Tan June 10, 2021, 5:49 a.m. UTC | #1
On Fri, Apr 30, 2021 at 12:44 AM Siew Chin Lim
<elly.siew.chin.lim@intel.com> wrote:
>
> Legacy boot flow (SPL->U-Boot Proper->OS) boot to OS via Kernel Image and
> dtb files using booti command.
>
> ATF boot flow (SPL->ATF->U-Boot Proper->OS) boot to OS via kernel.itb file
> using bootm command.
>
> Change to use CONFIG_SPL_ATF to differentiate the bootfile of default
> environment variable. We shouldn't use CONFIG_FIT because it is enabled
> by default for U-Boot Proper.
>
> Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com>
> ---
>  include/configs/socfpga_soc64_common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
> index f0b7884ebc..347620e1b5 100644
> --- a/include/configs/socfpga_soc64_common.h
> +++ b/include/configs/socfpga_soc64_common.h
> @@ -82,7 +82,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
>   * Environment variable
>   */
>
> -#ifdef CONFIG_FIT
> +#if IS_ENABLED(CONFIG_SPL_ATF)
>  #define CONFIG_BOOTFILE "kernel.itb"
>  #else
>  #define CONFIG_BOOTFILE "Image"
> --
> 2.19.0
>

Reviewed-by: Ley Foon Tan <lftan.linux@gmail.com>
diff mbox series

Patch

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index f0b7884ebc..347620e1b5 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -82,7 +82,7 @@  unsigned int cm_get_qspi_controller_clk_hz(void);
  * Environment variable
  */
 
-#ifdef CONFIG_FIT
+#if IS_ENABLED(CONFIG_SPL_ATF)
 #define CONFIG_BOOTFILE "kernel.itb"
 #else
 #define CONFIG_BOOTFILE "Image"