Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 23af484b0156baaafd578222d73513418df78f09

Authored by York Sun
1 parent b7234531db
Exists in smarc_8mq_lf_v2020.04 and in 17 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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

armv8: ls1043ardb_sdcard: prepare falcon boot 

Due to a conflict with recent Primary Protected Application (PPA),
PPA cannot be loaded for SPL stage, falcon boot is not enabled by
default. With compatible PPA image, to enable falcon boot, activate
these Kconfig options in defconfig
CONFIG_SPL_FIT=y
CONFIG_SPL_FSL_LS_PPA=y
CONFIG_SPL_GZIP=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_OF_LIBFDT=y

Because environment variables are not avaiable during SPL stage for
SD boot, set "boot_os=y" as default.

Signed-off-by: York Sun <york.sun@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

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

configs/ls1043ardb_sdcard_defconfig
Diff comments   View file @ 23af484
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
5 5 CONFIG_FSL_LS_PPA=y
  6 +CONFIG_SPL_FSL_LS_PPA=y
6 7 CONFIG_SPL_MMC_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
8 9 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
include/configs/ls1043a_common.h
Diff comments   View file @ 23af484
... ... @@ -73,10 +73,10 @@
73 73 #define CONFIG_SPL_STACK 0x1001e000
74 74 #define CONFIG_SPL_PAD_TO 0x1d000
75 75  
76   -#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE + \
77   - CONFIG_SYS_MONITOR_LEN)
  76 +#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \
  77 + CONFIG_SPL_BSS_MAX_SIZE)
78 78 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
79   -#define CONFIG_SPL_BSS_START_ADDR 0x80100000
  79 +#define CONFIG_SPL_BSS_START_ADDR 0x8f000000
80 80 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000
81 81  
82 82 #ifdef CONFIG_SECURE_BOOT
... ... @@ -280,6 +280,7 @@
280 280 "load_addr=0xa0000000\0" \
281 281 "kernel_size=0x2800000\0" \
282 282 "console=ttyS0,115200\0" \
  283 + "boot_os=y\0" \
283 284 "mtdparts=" MTDPARTS_DEFAULT "\0" \
284 285 BOOTENV \
285 286 "boot_scripts=ls1043ardb_boot.scr\0" \
include/configs/ls1043ardb.h
Diff comments   View file @ 23af484
... ... @@ -46,6 +46,11 @@
46 46  
47 47 #ifdef CONFIG_SD_BOOT
48 48 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg
  49 +#define CONFIG_CMD_SPL
  50 +#define CONFIG_SYS_SPL_ARGS_ADDR 0x90000000
  51 +#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x10000
  52 +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x500
  53 +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 30
49 54 #endif
50 55  
51 56 /*