Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit dec303063861ee8d990da162ad4402e70a570d67

Authored by Tom Rini
1 parent 995eab8b5b
Exists in smarc_8mq_lf_v2020.04 and in 22 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

mx6saberesd_spl: Correct falcon mode addition 

When falcon mode support was added, it was right around when SPL_OS_BOOT
was migrated to Kconfig.  So first we must move the enablement to the
defconfig file.  Next, it turned off EXT support rather than add the
information to allow for falcon mode from EXT.  Add this information so
that the board compiles after 5d28b930f237.

Fixes: d96796ca23b2 ("mx6sabresd: Add Falcon mode support")
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

configs/mx6sabresd_spl_defconfig
Diff comments   View file @ dec3030
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
18 18 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
19 19 CONFIG_SPL=y
  20 +CONFIG_SPL_OS_BOOT=y
20 21 CONFIG_HUSH_PARSER=y
21 22 CONFIG_CMD_BOOTZ=y
22 23 # CONFIG_CMD_IMLS is not set
include/configs/mx6sabresd.h
Diff comments   View file @ dec3030
... ... @@ -11,7 +11,6 @@
11 11  
12 12 #ifdef CONFIG_SPL
13 13 #include "imx6_spl.h"
14   -#undef CONFIG_SPL_EXT_SUPPORT
15 14 #endif
16 15  
17 16 #define CONFIG_MACH_TYPE 3980
18 17  
... ... @@ -24,8 +23,9 @@
24 23 #include "mx6sabre_common.h"
25 24  
26 25 /* Falcon Mode */
  26 +#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
  27 +#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
27 28 #define CONFIG_CMD_SPL
28   -#define CONFIG_SPL_OS_BOOT
29 29 #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
30 30 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
31 31