* [PATCH] include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile
@ 2022-11-21 15:22 Jit Loon Lim
0 siblings, 0 replies; 3+ messages in thread
From: Jit Loon Lim @ 2022-11-21 15:22 UTC (permalink / raw)
To: u-boot
Cc: Jagan Teki, Vignesh R, Marek, Simon, Tien Fong, Kok Kiang,
Siew Chin, Sin Hui, Raaj, Dinesh, Boon Khai, Alif, Teik Heng,
Hazim, Jit Loon Lim, Sieu Mun Tang
From: Siew Chin Lim <elly.siew.chin.lim@intel.com>
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>
Signed-off-by: Jit Loon Lim <jit.loon.lim@intel.com>
---
include/configs/socfpga_soc64_common.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 12da770077..7edffc3975 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -50,6 +50,13 @@
/*
* Environment variable
*/
+
+#if IS_ENABLED(CONFIG_SPL_ATF)
+#define CONFIG_BOOTFILE "kernel.itb"
+#else
+#define CONFIG_BOOTFILE "Image"
+#endif
+
#define CONFIG_EXTRA_ENV_SETTINGS \
"qspibootimageaddr=0x020E0000\0" \
"qspifdtaddr=0x020D0000\0" \
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile
@ 2021-04-29 16:43 Siew Chin Lim
2021-06-10 5:49 ` Ley Foon Tan
0 siblings, 1 reply; 3+ messages in thread
From: Siew Chin Lim @ 2021-04-29 16:43 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile
2021-04-29 16:43 Siew Chin Lim
@ 2021-06-10 5:49 ` Ley Foon Tan
0 siblings, 0 replies; 3+ messages in thread
From: Ley Foon Tan @ 2021-06-10 5:49 UTC (permalink / raw)
To: Siew Chin Lim
Cc: ZY - u-boot, Marek Vasut, Ley Foon Tan, Chin Liang See,
Simon Goldschmidt, Tien Fong Chee, Dalon Westergreen, Simon Glass,
Yau Wai Gan
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-21 15:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-21 15:22 [PATCH] include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile Jit Loon Lim
-- strict thread matches above, loose matches on Subject: below --
2021-04-29 16:43 Siew Chin Lim
2021-06-10 5:49 ` Ley Foon Tan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox