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>

diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig
index 0e9d16815db6592a23a1887abd25fd4aa822ad8e..2ce2aba3a1696bc96479a596ddeaa72473a61353 100644 (file)
--- a/configs/ls1043ardb_sdcard_defconfig
+++ b/configs/ls1043ardb_sdcard_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_LS1043ARDB=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_FSL_LS_PPA=y
+CONFIG_SPL_FSL_LS_PPA=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 1f9efffa5627ee877f5373d683b024fa6a5853ed..a29713499b5bfa82951bed22a7a272addad3af81 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -73,10 +73,10 @@
 #define CONFIG_SPL_STACK               0x1001e000
 #define CONFIG_SPL_PAD_TO              0x1d000
 
-#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE + \
-                                       CONFIG_SYS_MONITOR_LEN)
+#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SPL_BSS_START_ADDR + \
+                                       CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
-#define CONFIG_SPL_BSS_START_ADDR      0x80100000
+#define CONFIG_SPL_BSS_START_ADDR      0x8f000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000
 
 #ifdef CONFIG_SECURE_BOOT
@@ -280,6 +280,7 @@
        "load_addr=0xa0000000\0"                \
        "kernel_size=0x2800000\0"               \
        "console=ttyS0,115200\0"                \
+       "boot_os=y\0"                           \
        "mtdparts=" MTDPARTS_DEFAULT "\0"       \
        BOOTENV                                 \
        "boot_scripts=ls1043ardb_boot.scr\0"    \

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index da87497d0a1dfea38af479a68f1013d03a275f62..f9843f5ebae9f21be046feeee87ed3028a67e868 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -46,6 +46,11 @@
 
 #ifdef CONFIG_SD_BOOT
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg
+#define CONFIG_CMD_SPL
+#define CONFIG_SYS_SPL_ARGS_ADDR       0x90000000
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x10000
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x500
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 30
 #endif
 
 /*